Sync OSGi handling with Apache JClouds Project
This project, the openstack-lab version of Apache JClouds, share the exact build instructions as the primary Apache JClouds project with all its modules.
Apache JClouds is shifting its strategy in handling OSGi configuration. Instead of using the Maven Bundle Plugin, a wrapper of the BND plugin, the BND plugin gets used directly.
- Remove the OSGi configuration from each module. The configuration gets served to the BND through dedicated configuration / bnd files.
- Onboard bnd-configuration files, one per module.
diff --git a/openstack-glance/bnd.bnd b/openstack-glance/bnd.bnd
new file mode 100644
index 0000000..1b3e9b7
--- /dev/null
+++ b/openstack-glance/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.openstack.glance.*;version="${project.version}";-noimport:=true
\ No newline at end of file
diff --git a/openstack-glance/pom.xml b/openstack-glance/pom.xml
index f139c04..a508dff 100644
--- a/openstack-glance/pom.xml
+++ b/openstack-glance/pom.xml
@@ -32,7 +32,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>jclouds openstack-glance api</name>
<description>jclouds components to access an implementation of OpenStack Glance</description>
- <packaging>bundle</packaging>
<properties>
<!-- keystone endpoint -->
@@ -43,9 +42,6 @@
<test.openstack-glance.identity>FIXME_IDENTITY</test.openstack-glance.identity>
<test.openstack-glance.credential>FIXME_CREDENTIALS</test.openstack-glance.credential>
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
-
- <jclouds.osgi.export>org.jclouds.openstack.glance.*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<repositories>
diff --git a/openstack-heat/bnd.bnd b/openstack-heat/bnd.bnd
new file mode 100644
index 0000000..5cceeaf
--- /dev/null
+++ b/openstack-heat/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.openstack.heat.v1.*;version="${project.version}";-noimport:=true
\ No newline at end of file
diff --git a/openstack-heat/pom.xml b/openstack-heat/pom.xml
index 2a549c0..649d114 100644
--- a/openstack-heat/pom.xml
+++ b/openstack-heat/pom.xml
@@ -32,7 +32,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>Apache jclouds :: OpenStack :: Heat API</name>
<description>jclouds components to access an implementation of OpenStack Heat</description>
- <packaging>bundle</packaging>
<properties>
<!-- keystone endpoint -->
@@ -42,8 +41,6 @@
<test.openstack-heat.identity>FIXME_IDENTITY</test.openstack-heat.identity>
<test.openstack-heat.credential>FIXME_CREDENTIALS</test.openstack-heat.credential>
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
- <jclouds.osgi.export>org.jclouds.openstack.heat.v1*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<repositories>
diff --git a/openstack-marconi/bnd.bnd b/openstack-marconi/bnd.bnd
new file mode 100644
index 0000000..cc09e6d
--- /dev/null
+++ b/openstack-marconi/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.openstack.marconi.v1.*;version="${project.version}";-noimport:=true
\ No newline at end of file
diff --git a/openstack-marconi/pom.xml b/openstack-marconi/pom.xml
index 37c7165..60413e3 100644
--- a/openstack-marconi/pom.xml
+++ b/openstack-marconi/pom.xml
@@ -32,7 +32,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>jclouds openstack-marconi api</name>
<description>jclouds components to access an implementation of OpenStack Marconi</description>
- <packaging>bundle</packaging>
<properties>
<!-- keystone endpoint -->
@@ -42,8 +41,6 @@
<test.openstack-marconi.identity>FIXME_IDENTITY</test.openstack-marconi.identity>
<test.openstack-marconi.credential>FIXME_CREDENTIALS</test.openstack-marconi.credential>
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
- <jclouds.osgi.export>org.jclouds.openstack.marconi.v1*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<repositories>
diff --git a/openstack-poppy/bnd.bnd b/openstack-poppy/bnd.bnd
new file mode 100644
index 0000000..e0a9595
--- /dev/null
+++ b/openstack-poppy/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.openstack.poppy.v1.*;version="${project.version}";-noimport:=true
\ No newline at end of file
diff --git a/openstack-poppy/pom.xml b/openstack-poppy/pom.xml
index e015647..7073f94 100644
--- a/openstack-poppy/pom.xml
+++ b/openstack-poppy/pom.xml
@@ -32,7 +32,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>Apache jclouds :: OpenStack :: Poppy API</name>
<description>jclouds components to access an implementation of OpenStack Poppy</description>
- <packaging>bundle</packaging>
<properties>
<!-- keystone endpoint -->
@@ -42,8 +41,6 @@
<test.openstack-poppy.identity>FIXME_IDENTITY</test.openstack-poppy.identity>
<test.openstack-poppy.credential>FIXME_CREDENTIALS</test.openstack-poppy.credential>
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
- <jclouds.osgi.export>org.jclouds.openstack.poppy.v1*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
diff --git a/rackspace-autoscale-uk/bnd.bnd b/rackspace-autoscale-uk/bnd.bnd
new file mode 100644
index 0000000..0fb1097
--- /dev/null
+++ b/rackspace-autoscale-uk/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.rackspace.autoscale.uk.*;version="${project.version}";-noimport:=true
\ No newline at end of file
diff --git a/rackspace-autoscale-uk/pom.xml b/rackspace-autoscale-uk/pom.xml
index 3369b02..ec4ca41 100644
--- a/rackspace-autoscale-uk/pom.xml
+++ b/rackspace-autoscale-uk/pom.xml
@@ -33,7 +33,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>jclouds Rackspace Auto Scale UK Provider</name>
<description>jclouds components to access Rackspace Auto Scale UK</description>
- <packaging>bundle</packaging>
<properties>
<!-- keystone endpoint -->
@@ -44,8 +43,6 @@
<test.rackspace-autoscale.identity>FIXME_IDENTITY</test.rackspace-autoscale.identity>
<test.rackspace-autoscale.credential>FIXME_CREDENTIALS</test.rackspace-autoscale.credential>
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
- <jclouds.osgi.export>org.jclouds.rackspace.autoscale.uk*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<repositories>
diff --git a/rackspace-autoscale-us/bnd.bnd b/rackspace-autoscale-us/bnd.bnd
new file mode 100644
index 0000000..60d71d3
--- /dev/null
+++ b/rackspace-autoscale-us/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.rackspace.autoscale.us.*;version="${project.version}";-noimport:=true
\ No newline at end of file
diff --git a/rackspace-autoscale-us/pom.xml b/rackspace-autoscale-us/pom.xml
index 741f802..c0f4a8d 100644
--- a/rackspace-autoscale-us/pom.xml
+++ b/rackspace-autoscale-us/pom.xml
@@ -32,7 +32,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>jclouds Rackspace Auto Scale US Provider</name>
<description>jclouds components to access Rackspace Autoscale</description>
- <packaging>bundle</packaging>
<properties>
<!-- keystone endpoint -->
@@ -43,8 +42,6 @@
<test.rackspace-autoscale.identity>FIXME_IDENTITY</test.rackspace-autoscale.identity>
<test.rackspace-autoscale.credential>FIXME_CREDENTIALS</test.rackspace-autoscale.credential>
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
- <jclouds.osgi.export>org.jclouds.rackspace.autoscale.us*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<repositories>
diff --git a/rackspace-autoscale/bnd.bnd b/rackspace-autoscale/bnd.bnd
new file mode 100644
index 0000000..3ac0810
--- /dev/null
+++ b/rackspace-autoscale/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.rackspace.autoscale.v1.*;version="${project.version}";-noimport:=true
\ No newline at end of file
diff --git a/rackspace-autoscale/pom.xml b/rackspace-autoscale/pom.xml
index 2cfc52d..bec0504 100644
--- a/rackspace-autoscale/pom.xml
+++ b/rackspace-autoscale/pom.xml
@@ -32,7 +32,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>jclouds Rackspace Auto Scale API</name>
<description>jclouds components to access Rackspace Autoscale</description>
- <packaging>bundle</packaging>
<properties>
<!-- keystone endpoint -->
@@ -43,8 +42,6 @@
<test.rackspace-autoscale.identity>FIXME_IDENTITY</test.rackspace-autoscale.identity>
<test.rackspace-autoscale.credential>FIXME_CREDENTIALS</test.rackspace-autoscale.credential>
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
- <jclouds.osgi.export>org.jclouds.rackspace.autoscale.v1_0*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<repositories>
diff --git a/rackspace-cdn-uk/bnd.bnd b/rackspace-cdn-uk/bnd.bnd
new file mode 100644
index 0000000..8b23359
--- /dev/null
+++ b/rackspace-cdn-uk/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.rackspace.cdn.uk.*;version="${project.version}";-noimport:=true
diff --git a/rackspace-cdn-uk/pom.xml b/rackspace-cdn-uk/pom.xml
index ee531b9..dc9fcee 100644
--- a/rackspace-cdn-uk/pom.xml
+++ b/rackspace-cdn-uk/pom.xml
@@ -32,7 +32,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>jclouds Rackspace CDN UK provider</name>
<description>OpenStack Poppy implementation targeted to Rackspace CDN UK</description>
- <packaging>bundle</packaging>
<properties>
<!-- identity endpoint -->
@@ -41,8 +40,6 @@
<test.rackspace-cdn-uk.build-version />
<test.rackspace-cdn-uk.identity>${test.rackspace-uk.identity}</test.rackspace-cdn-uk.identity>
<test.rackspace-cdn-uk.credential>${test.rackspace-uk.credential}</test.rackspace-cdn-uk.credential>
- <jclouds.osgi.export>org.jclouds.rackspace.cdn.uk*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
diff --git a/rackspace-cdn-us/bnd.bnd b/rackspace-cdn-us/bnd.bnd
new file mode 100644
index 0000000..7954e42
--- /dev/null
+++ b/rackspace-cdn-us/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.rackspace.cdn.us.*;version="${project.version}";-noimport:=true
diff --git a/rackspace-cdn-us/pom.xml b/rackspace-cdn-us/pom.xml
index 270b6ce..4ac5103 100644
--- a/rackspace-cdn-us/pom.xml
+++ b/rackspace-cdn-us/pom.xml
@@ -32,7 +32,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>jclouds Rackspace CDN US provider</name>
<description>OpenStack Poppy implementation targeted to Rackspace CDN US</description>
- <packaging>bundle</packaging>
<properties>
<!-- identity endpoint -->
@@ -41,8 +40,6 @@
<test.rackspace-cdn-us.build-version />
<test.rackspace-cdn-us.identity>${test.rackspace-us.identity}</test.rackspace-cdn-us.identity>
<test.rackspace-cdn-us.credential>${test.rackspace-us.credential}</test.rackspace-cdn-us.credential>
- <jclouds.osgi.export>org.jclouds.rackspace.cdn.us*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
diff --git a/rackspace-cloudbigdata-us/bnd.bnd b/rackspace-cloudbigdata-us/bnd.bnd
new file mode 100644
index 0000000..f6f2273
--- /dev/null
+++ b/rackspace-cloudbigdata-us/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.rackspace.cloudbigdata.us.v1.*;version="${project.version}";-noimport:=true
diff --git a/rackspace-cloudbigdata-us/pom.xml b/rackspace-cloudbigdata-us/pom.xml
index 3b6b671..81a78a3 100644
--- a/rackspace-cloudbigdata-us/pom.xml
+++ b/rackspace-cloudbigdata-us/pom.xml
@@ -32,7 +32,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>jclouds rackspace-cloudbigdata api provider</name>
<description>jclouds components to access Rackspace Autoscale</description>
- <packaging>bundle</packaging>
<properties>
<!-- keystone endpoint -->
@@ -43,8 +42,6 @@
<test.rackspace-cloudbigdata.identity>FIXME_IDENTITY</test.rackspace-cloudbigdata.identity>
<test.rackspace-cloudbigdata.credential>FIXME_CREDENTIALS</test.rackspace-cloudbigdata.credential>
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
- <jclouds.osgi.export>org.jclouds.rackspace.cloudbigdata.v1_0*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<repositories>
diff --git a/rackspace-cloudbigdata/bnd.bnd b/rackspace-cloudbigdata/bnd.bnd
new file mode 100644
index 0000000..2b972d4
--- /dev/null
+++ b/rackspace-cloudbigdata/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.rackspace.cloudbigdata.v1.*;version="${project.version}";-noimport:=true
diff --git a/rackspace-cloudbigdata/pom.xml b/rackspace-cloudbigdata/pom.xml
index 0007afb..6162f5d 100644
--- a/rackspace-cloudbigdata/pom.xml
+++ b/rackspace-cloudbigdata/pom.xml
@@ -32,7 +32,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>jclouds rackspace-cloudbigdata api</name>
<description>jclouds components to access Rackspace Cloud Big Data</description>
- <packaging>bundle</packaging>
<properties>
<!-- keystone endpoint -->
@@ -43,8 +42,6 @@
<test.rackspace-cloudbigdata.identity>FIXME_IDENTITY</test.rackspace-cloudbigdata.identity>
<test.rackspace-cloudbigdata.credential>FIXME_CREDENTIALS</test.rackspace-cloudbigdata.credential>
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
- <jclouds.osgi.export>org.jclouds.rackspace.cloudbigdata.v1_0*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<repositories>
diff --git a/rackspace-cloudqueues-uk/bnd.bnd b/rackspace-cloudqueues-uk/bnd.bnd
new file mode 100644
index 0000000..2ed75f2
--- /dev/null
+++ b/rackspace-cloudqueues-uk/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.rackspace.cloudqueues.uk.*;version="${project.version}";-noimport:=true
diff --git a/rackspace-cloudqueues-uk/pom.xml b/rackspace-cloudqueues-uk/pom.xml
index 3b56674..6f4b084 100644
--- a/rackspace-cloudqueues-uk/pom.xml
+++ b/rackspace-cloudqueues-uk/pom.xml
@@ -33,7 +33,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>jclouds Rackspace Cloud Queues UK provider</name>
<description>OpenStack Marconi implementation targeted to Rackspace Cloud Queues UK</description>
- <packaging>bundle</packaging>
<properties>
<test.rackspace-cloudqueues-uk.endpoint>https://lon.identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudqueues-uk.endpoint>
@@ -42,8 +41,6 @@
<test.rackspace-cloudqueues-uk.identity>${test.rackspace-uk.identity}</test.rackspace-cloudqueues-uk.identity>
<test.rackspace-cloudqueues-uk.credential>${test.rackspace-uk.credential}</test.rackspace-cloudqueues-uk.credential>
<test.rackspace-cloudqueues-uk.template />
- <jclouds.osgi.export>org.jclouds.rackspace.cloudqueues.uk*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<repositories>
diff --git a/rackspace-cloudqueues-us/bnd.bnd b/rackspace-cloudqueues-us/bnd.bnd
new file mode 100644
index 0000000..e3a53e1
--- /dev/null
+++ b/rackspace-cloudqueues-us/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.rackspace.cloudqueues.us.*;version="${project.version}";-noimport:=true
diff --git a/rackspace-cloudqueues-us/pom.xml b/rackspace-cloudqueues-us/pom.xml
index 80eba53..1d4a065 100644
--- a/rackspace-cloudqueues-us/pom.xml
+++ b/rackspace-cloudqueues-us/pom.xml
@@ -33,7 +33,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>jclouds Rackspace Cloud Queues US provider</name>
<description>OpenStack Marconi implementation targeted to Rackspace Cloud Queues US</description>
- <packaging>bundle</packaging>
<properties>
<test.rackspace-cloudqueues-us.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudqueues-us.endpoint>
@@ -42,8 +41,6 @@
<test.rackspace-cloudqueues-us.identity>${test.rackspace-us.identity}</test.rackspace-cloudqueues-us.identity>
<test.rackspace-cloudqueues-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudqueues-us.credential>
<test.rackspace-cloudqueues-us.template />
- <jclouds.osgi.export>org.jclouds.rackspace.cloudqueues.us*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<repositories>
diff --git a/rackspace-orchestration-uk/bnd.bnd b/rackspace-orchestration-uk/bnd.bnd
new file mode 100644
index 0000000..a3681ef
--- /dev/null
+++ b/rackspace-orchestration-uk/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.rackspace.orchestration.uk.*;version="${project.version}";-noimport:=true
diff --git a/rackspace-orchestration-uk/pom.xml b/rackspace-orchestration-uk/pom.xml
index 0125e2f..eff47d0 100644
--- a/rackspace-orchestration-uk/pom.xml
+++ b/rackspace-orchestration-uk/pom.xml
@@ -32,7 +32,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>jclouds Rackspace Orchestration UK provider</name>
<description>OpenStack Heat implementation targeted to Rackspace Orchestration UK</description>
- <packaging>bundle</packaging>
<properties>
<!-- identity endpoint -->
@@ -41,8 +40,6 @@
<test.rackspace-orchestration-uk.build-version />
<test.rackspace-orchestration-uk.identity>${test.rackspace-uk.identity}</test.rackspace-orchestration-uk.identity>
<test.rackspace-orchestration-uk.credential>${test.rackspace-uk.credential}</test.rackspace-orchestration-uk.credential>
- <jclouds.osgi.export>org.jclouds.rackspace.orchestration.uk*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
diff --git a/rackspace-orchestration-us/bnd.bnd b/rackspace-orchestration-us/bnd.bnd
new file mode 100644
index 0000000..4b5df7e
--- /dev/null
+++ b/rackspace-orchestration-us/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.rackspace.orchestration.us.*;version="${project.version}";-noimport:=true
diff --git a/rackspace-orchestration-us/pom.xml b/rackspace-orchestration-us/pom.xml
index 66af451..e419aa4 100644
--- a/rackspace-orchestration-us/pom.xml
+++ b/rackspace-orchestration-us/pom.xml
@@ -32,7 +32,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>jclouds Rackspace Orchestration US provider</name>
<description>OpenStack Heat implementation targeted to Rackspace Orchestration US</description>
- <packaging>bundle</packaging>
<properties>
<!-- identity endpoint -->
@@ -41,8 +40,6 @@
<test.rackspace-orchestration-us.build-version />
<test.rackspace-orchestration-us.identity>${test.rackspace-us.identity}</test.rackspace-orchestration-us.identity>
<test.rackspace-orchestration-us.credential>${test.rackspace-us.credential}</test.rackspace-orchestration-us.credential>
- <jclouds.osgi.export>org.jclouds.rackspace.orchestration.us*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
