[jbosstools-commits] JBoss Tools SVN: r34305 - in trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core: src/org/jboss/ide/eclipse/as/egit/core and 1 other directory.
Author: adietish
Date: 2011-08-25 05:20:29 -0400 (Thu, 25 Aug 2011)
New Revision: 34305
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java
Log:
[JBIDE-9585] corrected dependencies to EGit 1.0 (was: EGit 1.1): corrected code and
manifests
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF 2011-08-25
08:55:26 UTC (rev 34304)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF 2011-08-25
09:20:29 UTC (rev 34305)
@@ -5,10 +5,10 @@
Bundle-Version: 0.0.1.qualifier
Bundle-Activator: org.jboss.ide.eclipse.as.egit.core.internal.EGitCoreActivator
Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="2.3.0",
- org.eclipse.jgit;bundle-version="[1.1.0,2.1.0)",
- org.eclipse.egit;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.egit.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.egit.ui;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.jgit;bundle-version="[1.0.0,2.1.0)",
+ org.eclipse.egit;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.egit.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.egit.ui;bundle-version="[1.0.0,2.0.0)",
org.eclipse.team.core;bundle-version="[3.6.0,4.0.0)",
org.eclipse.wst.server.core;bundle-version="[1.1.302,2.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.100,4.0.0)",
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java 2011-08-25
08:55:26 UTC (rev 34304)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java 2011-08-25
09:20:29 UTC (rev 34305)
@@ -131,15 +131,19 @@
"Repository \"{0}\" has no remote repository with the name
\"{1}\"",
repository.toString(), remote));
}
- createPushOperation(remote, repository).run(monitor);
+ createPushOperation(remoteConfig, repository).run(monitor);
} catch (Exception e) {
throw new CoreException(createStatus(e, "Could not push repo {0}",
repository.toString()));
}
}
- private static PushOperation createPushOperation(String remoteName, Repository
repository) {
- return new PushOperation(repository, remoteName, false, PUSH_TIMEOUT);
- }
+ //
+ // only available in EGit 1.1
+ //
+ // private static PushOperation createPushOperation(String remoteName,
+ // Repository repository) { return new PushOperation(repository, remoteName,
+ // false, PUSH_TIMEOUT); }
+ //
private static PushOperation createPushOperation(RemoteConfig remoteConfig, Repository
repository)
throws CoreException {