Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=534087
Backport console bundle metadata changes from osgir7 branch
Allow building/running against Oxygen or Photon by keeping the
require-bundle, but making it optional, so it may be fulfilled
by either the old-style felix-gogo bundle from Oxygen or any
bundle that supplies the felix.service.command package like the
new-style felix-gogo bundle from Photon.
Change-Id: I438c815319c2156c689b1ac90f211258e2bb9e5c
Signed-off-by: Mat Booth <mat.booth@redhat.com>
diff --git a/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF
index c13adc2..b648c55 100644
--- a/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF
@@ -4,11 +4,11 @@
Bundle-SymbolicName: org.eclipse.ecf.console
Automatic-Module-Name: org.eclipse.ecf.console
Bundle-Vendor: %plugin.provider
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
- J2SE-1.5
-Import-Package: org.eclipse.ecf.core;version="[3.0.0,4.0.0)",
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: org.apache.felix.service.command;version="[0.10.0,2.0.0)";resolution:=optional,
+ org.eclipse.ecf.core;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.identity;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.util;version="[3.0.0,4.0.0)",
org.osgi.framework;version="[1.3.0,2.0.0)",
@@ -16,6 +16,6 @@
org.osgi.util.tracker;version="[1.3.0,2.0.0)"
Bundle-Localization: plugin
Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)",
- org.apache.felix.gogo.runtime;bundle-version="0.10.0"
+ org.apache.felix.gogo.runtime;bundle-version="[0.10.0,2.0.0)";resolution:=optional
Service-Component: OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml
Export-Package: org.eclipse.ecf.console;version="1.0.0"
diff --git a/framework/bundles/org.eclipse.ecf.console/pom.xml b/framework/bundles/org.eclipse.ecf.console/pom.xml
index fba496e..73fc8a6 100644
--- a/framework/bundles/org.eclipse.ecf.console/pom.xml
+++ b/framework/bundles/org.eclipse.ecf.console/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.console</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF
index dc6185f..99b2c87 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF
@@ -2,18 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundle.name
Bundle-SymbolicName: org.eclipse.ecf.osgi.services.remoteserviceadmin.console
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: %bundle.provider
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Localization: bundle
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.ecf.console;version="[1.0.0,2.0.0)",
+Import-Package: org.apache.felix.service.command;version="[0.10.0,2.0.0)";resolution:=optional,
+ org.eclipse.ecf.console;version="[1.0.0,2.0.0)",
org.eclipse.ecf.osgi.services.remoteserviceadmin;version="[1.3.0,2.0.0)",
org.osgi.framework;version="1.8.0",
org.osgi.service.component.annotations;version="[1.0.0,2.0.0)";resolution:=optional,
org.osgi.service.remoteserviceadmin;version="[1.1.0,2.0.0)"
Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)",
- org.apache.felix.gogo.runtime;bundle-version="0.10.0",
+ org.apache.felix.gogo.runtime;bundle-version="[0.10.0,2.0.0)";resolution:=optional,
org.eclipse.ecf;bundle-version="[3.8.0,4.0.0)"
Service-Component: OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml
index b08648a..e6f442a 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.osgi.services.remoteserviceadmin.console</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-oxygen.target b/releng/org.eclipse.ecf.releng.target/ecf-oxygen.target
index 736068e..7ff022e 100644
--- a/releng/org.eclipse.ecf.releng.target/ecf-oxygen.target
+++ b/releng/org.eclipse.ecf.releng.target/ecf-oxygen.target
@@ -1,24 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Oxygen" sequenceNumber="20">
+<?pde version="3.8"?><target name="Oxygen" sequenceNumber="22">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
<repository location="http://download.eclipse.org/cbi/updates/license/1.0.1.v20140414-1359"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
-<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
<unit id="org.apache.hadoop.zookeeper" version="3.3.3.v201105210832"/>
<unit id="org.apache.hadoop.zookeeper.source" version="3.3.3.v201105210832"/>
-<unit id="org.apache.ws.commons.util" version="1.0.1.v20100518-1140"/>
-<unit id="org.apache.xmlrpc" version="3.0.0.v20100427-1100"/>
-<unit id="org.jdom" version="1.1.1.v201101151400"/>
-<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
-<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
-<unit id="org.xbill.dns.source" version="2.0.8.v201112050911"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
+<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
<unit id="org.apache.commons.codec" version="1.9.0.v20170208-1614"/>
<unit id="org.apache.commons.codec.source" version="1.9.0.v20170208-1614"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
@@ -28,7 +22,11 @@
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.json" version="1.0.0.v201011060100"/>
-<repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository"/>
+<unit id="org.jdom" version="1.1.1.v201101151400"/>
+<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
+<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
+<unit id="org.xbill.dns.source" version="2.0.8.v201112050911"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180330011457/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.13.0.v20170609-0928"/>
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-photon.target b/releng/org.eclipse.ecf.releng.target/ecf-photon.target
index 22c368a..78bf89f 100644
--- a/releng/org.eclipse.ecf.releng.target/ecf-photon.target
+++ b/releng/org.eclipse.ecf.releng.target/ecf-photon.target
@@ -1,22 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Photon" sequenceNumber="23">
+<?pde version="3.8"?><target name="Photon" sequenceNumber="25">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
<repository location="http://download.eclipse.org/cbi/updates/license/1.0.1.v20140414-1359"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
-<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
<unit id="org.apache.hadoop.zookeeper" version="3.3.3.v201105210832"/>
<unit id="org.apache.hadoop.zookeeper.source" version="3.3.3.v201105210832"/>
-<unit id="org.apache.ws.commons.util" version="1.0.1.v20100518-1140"/>
-<unit id="org.apache.xmlrpc" version="3.0.0.v20100427-1100"/>
-<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
-<unit id="org.xbill.dns.source" version="2.0.8.v201112050911"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
+<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
@@ -30,6 +26,8 @@
<unit id="org.jdom" version="1.1.1.v201101151400"/>
<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
<unit id="org.json" version="1.0.0.v201011060100"/>
+<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
+<unit id="org.xbill.dns.source" version="2.0.8.v201112050911"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
