Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/osgi
diff options
context:
space:
mode:
authorMat Booth2018-07-13 09:12:17 -0400
committerMat Booth2018-07-13 09:17:57 -0400
commitf2d081cc362fccde148fbd5bfc05b61728289e8b (patch)
treefaf49f789c01a6cf569c2852ceb5a61975be4ceb /osgi
parent2fa5b87e1f0764f9abb081904ecba5b340c25893 (diff)
downloadorg.eclipse.ecf-f2d081cc362fccde148fbd5bfc05b61728289e8b.tar.gz
org.eclipse.ecf-f2d081cc362fccde148fbd5bfc05b61728289e8b.tar.xz
org.eclipse.ecf-f2d081cc362fccde148fbd5bfc05b61728289e8b.zip
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>
Diffstat (limited to 'osgi')
-rw-r--r--osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF7
-rw-r--r--osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml2
2 files changed, 5 insertions, 4 deletions
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 dc6185f2f..99b2c87d2 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 @@ Manifest-Version: 1.0
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 b08648a1a..e6f442a7b 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>

Back to the top