[jbosstools-commits] JBoss Tools SVN: r35928 - in trunk/openshift: plugins/org.jboss.tools.openshift.egit.ui/META-INF and 4 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Oct 24 07:30:48 EDT 2011
Author: rob.stryker at jboss.com
Date: 2011-10-24 07:30:48 -0400 (Mon, 24 Oct 2011)
New Revision: 35928
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF
trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
trunk/openshift/tests/org.jboss.tools.openshift.express.client.test/META-INF/MANIFEST.MF
Log:
JBIDE-10013 - compile errors in workspace after transition
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF 2011-10-24 10:57:22 UTC (rev 35927)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF 2011-10-24 11:30:48 UTC (rev 35928)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Bundle-Name
Bundle-SymbolicName: org.jboss.tools.openshift.egit.core;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.jboss.tools.openshift.egit.core.internal.EGitCoreActivator
Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="2.3.0",
org.eclipse.jgit;bundle-version="[1.0.0,2.1.0)",
@@ -17,5 +17,5 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: Bundle-Vendor
Export-Package: org.jboss.tools.openshift.egit.core,
- org.jboss.tools.openshift.egit.core.internal;x-friends:="org.jboss.ide.eclipse.as.egit.test",
+ org.jboss.tools.openshift.egit.core.internal,
org.jboss.tools.openshift.egit.core.module
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF 2011-10-24 10:57:22 UTC (rev 35927)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF 2011-10-24 11:30:48 UTC (rev 35928)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: EGit integration UI
Bundle-SymbolicName: org.jboss.tools.openshift.egit.ui;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.jboss.tools.openshift.egit.ui.EGitUIActivator
Require-Bundle: org.eclipse.egit.core;bundle-version="1.0.0",
org.eclipse.jgit;bundle-version="1.0.0",
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2011-10-24 10:57:22 UTC (rev 35927)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2011-10-24 11:30:48 UTC (rev 35928)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: OpenShift Core Plugin
Bundle-SymbolicName: org.jboss.tools.openshift.express.client
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.jboss.tools.openshift.express.internal.client.OpenShiftCoreActivator
Bundle-Vendor: JBoss by Red Hat
Require-Bundle: org.eclipse.core.runtime,
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-24 10:57:22 UTC (rev 35927)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-24 11:30:48 UTC (rev 35928)
@@ -2,11 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: OpenShift UI
Bundle-SymbolicName: org.jboss.tools.openshift.express.ui;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator
-Require-Bundle: org.jboss.tools.openshift.express.client;bundle-version="2.3.0",
- org.jboss.tools.openshift.egit.core,
- org.eclipse.egit.ui;bundle-version="[1.0.0,2.0.0)",
+Require-Bundle: org.eclipse.egit.ui;bundle-version="[1.0.0,2.0.0)",
org.eclipse.egit.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.jgit;bundle-version="[1.1.0,2.1.0)",
com.jcraft.jsch;bundle-version="0.1.44",
@@ -25,7 +23,9 @@
org.eclipse.wst.server.ui;bundle-version="[1.1.3,2.0.0)",
org.eclipse.ui.ide;bundle-version="3.7.0",
org.eclipse.m2e.core.ui;bundle-version="1.0.100",
- org.eclipse.wst.common.modulecore;bundle-version="1.2.100"
+ org.eclipse.wst.common.modulecore;bundle-version="1.2.100",
+ org.jboss.tools.openshift.express.client,
+ org.jboss.tools.openshift.egit.core
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.jboss.tools.common.databinding,
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-10-24 10:57:22 UTC (rev 35927)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-10-24 11:30:48 UTC (rev 35928)
@@ -15,7 +15,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
-import org.jboss.ide.eclipse.as.egit.core.EGitUtils;
+import org.jboss.tools.openshift.egit.core.EGitUtils;
public class ExpressPublishMethod implements IJBossServerPublishMethod {
Modified: trunk/openshift/tests/org.jboss.tools.openshift.express.client.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.express.client.test/META-INF/MANIFEST.MF 2011-10-24 10:57:22 UTC (rev 35927)
+++ trunk/openshift/tests/org.jboss.tools.openshift.express.client.test/META-INF/MANIFEST.MF 2011-10-24 11:30:48 UTC (rev 35928)
@@ -5,7 +5,7 @@
Bundle-Version: 2.3.0.qualifier
Bundle-Activator: org.jboss.tools.openshift.express.internal.client.test.Activator
Bundle-Vendor: JBoss by Red Hat
-Require-Bundle: org.jboss.tools.openshift.express.client;bundle-version="2.3.0",
+Require-Bundle: org.jboss.tools.openshift.express.client,
org.junit;bundle-version="[4.8.0,5.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
More information about the jbosstools-commits
mailing list