Skip to content
Permalink
Browse files
Remove the OSGi configuration from each module. The approach of defin…
…ing OSGi configuration through common properties and serving them to the bundle plugin gets no longer used; instead, OSGi configuration gets defined in each module's dedicated bnd file.
  • Loading branch information
markus-gritsch authored and gaul committed Oct 26, 2020
1 parent 7a9cd34 commit 32f6c4d50f6e882292ddafcbaf382e64bf95d70e
Showing 87 changed files with 4 additions and 477 deletions.
@@ -29,17 +29,13 @@
<groupId>org.apache.jclouds.api</groupId>
<artifactId>atmos</artifactId>
<name>jclouds atmos components</name>
<packaging>bundle</packaging>

<properties>
<test.atmos.endpoint>https://accesspoint.atmosonline.com</test.atmos.endpoint>
<test.atmos.api-version>1.3.0</test.atmos.api-version>
<test.atmos.build-version />
<test.atmos.identity>FIXME_IDENTITY</test.atmos.identity>
<test.atmos.credential>FIXME_CREDENTIAL</test.atmos.credential>

<jclouds.osgi.export>org.jclouds.atmos*;version="${project.version}";-noimport:=true</jclouds.osgi.export>
<jclouds.osgi.import>*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -29,13 +29,10 @@
<groupId>org.apache.jclouds.api</groupId>
<artifactId>byon</artifactId>
<name>jclouds bring your own node provider</name>
<packaging>bundle</packaging>

<properties>
<test.byon.endpoint>file://c:/test.txt</test.byon.endpoint>
<test.byon.sudo-password />
<jclouds.osgi.export>org.jclouds.byon*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -27,7 +27,6 @@
</parent>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>chef</artifactId>
<packaging>bundle</packaging>
<name>jclouds Chef api</name>
<description>jclouds components to access Chef</description>

@@ -37,15 +36,6 @@
<test.chef.build-version />
<test.chef.identity>chef-webui</test.chef.identity>
<test.chef.credential>${user.home}/.chef/webui.pem</test.chef.credential>
<jclouds.osgi.export>
org.jclouds.chef*;version=${project.version};-noimport:=true,
org.jclouds.ohai*;version=${project.version};-noimport:=true,
</jclouds.osgi.export>
<jclouds.osgi.import>
org.jclouds.*;version="${project.version}",
org.jclouds;version="${project.version}",
*
</jclouds.osgi.import>
</properties>

<dependencies>
@@ -29,7 +29,6 @@
<artifactId>cloudstack</artifactId>
<name>jclouds cloudstack core</name>
<description>jclouds components to access cloudstack</description>
<packaging>bundle</packaging>

<properties>
<test.cloudstack.endpoint>http://localhost:8080/client/api</test.cloudstack.endpoint>
@@ -42,8 +41,6 @@
<test.cloudstack.globalAdminIdentity />
<test.cloudstack.globalAdminCredential />
<test.cloudstack.template>osFamily=CENTOS</test.cloudstack.template>
<jclouds.osgi.export>org.jclouds.cloudstack*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -29,17 +29,13 @@
<artifactId>cloudwatch</artifactId>
<name>jclouds cloudwatch api</name>
<description>jclouds components to access an implementation of CloudWatch</description>
<packaging>bundle</packaging>

<properties>
<test.cloudwatch.endpoint>https://monitoring.us-east-1.amazonaws.com</test.cloudwatch.endpoint>
<test.cloudwatch.api-version>2010-08-01</test.cloudwatch.api-version>
<test.cloudwatch.build-version />
<test.cloudwatch.identity>${test.aws.identity}</test.cloudwatch.identity>
<test.cloudwatch.credential>${test.aws.credential}</test.cloudwatch.credential>

<jclouds.osgi.export>org.jclouds.cloudwatch*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -31,7 +31,6 @@
<artifactId>docker</artifactId>
<name>jclouds docker API</name>
<description>ComputeService binding to the Docker API</description>
<packaging>bundle</packaging>

<properties>
<test.docker.api-version>1.21</test.docker.api-version>
@@ -40,13 +39,6 @@
<test.docker.cacert.path>${env.DOCKER_CERT_PATH}/ca.pem</test.docker.cacert.path>
<test.docker.endpoint>${env.DOCKER_HOST}</test.docker.endpoint>
<test.jclouds.trust-all-certs>false</test.jclouds.trust-all-certs>
<jclouds.osgi.export>org.jclouds.docker*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>
org.jclouds.compute.internal;version="${project.version}",
org.jclouds.rest.internal;version="${project.version}",
org.jclouds*;version="${project.version}",
*
</jclouds.osgi.import>
</properties>

<dependencies>
@@ -29,7 +29,6 @@
<artifactId>ec2</artifactId>
<name>jclouds ec2 api</name>
<description>jclouds components to access an implementation of EC2</description>
<packaging>bundle</packaging>

<properties>
<test.ec2.endpoint>https://ec2.us-east-1.amazonaws.com</test.ec2.endpoint>
@@ -43,8 +42,6 @@
<test.ec2.ebs-template>hardwareId=m1.small,imageId=us-east-1/ami-53b1ff3a</test.ec2.ebs-template>
<!-- Windows_Server-2008-R2 with WinRM enabled (setup instructions at http://www.frontiertown.co.uk/2011/12/overthere-control-windows-from-java/) -->
<test.ec2.windows-template>hardwareId=m1.small,imageId=us-east-1/ami-0cb76d65</test.ec2.windows-template>
<jclouds.osgi.export>org.jclouds.ec2*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -29,17 +29,14 @@
<artifactId>elasticstack</artifactId>
<name>jclouds elasticstack core</name>
<description>jclouds components to access elasticstack</description>
<packaging>bundle</packaging>


<properties>
<test.elasticstack.endpoint>https://api-lon-p.elastichosts.com</test.elasticstack.endpoint>
<test.elasticstack.api-version>2.0</test.elasticstack.api-version>
<test.elasticstack.build-version />
<test.elasticstack.identity>FIXME_IDENTITY</test.elasticstack.identity>
<test.elasticstack.credential>FIXME_CREDENTIAL</test.elasticstack.credential>
<test.elasticstack.template>imageId=38df0986-4d85-4b76-b502-3878ffc80161,loginUser=toor</test.elasticstack.template>
<jclouds.osgi.export>org.jclouds.elasticstack*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -29,12 +29,6 @@
<artifactId>filesystem</artifactId>
<name>jclouds filesystem core</name>
<description>jclouds components to access filesystem</description>
<packaging>bundle</packaging>

<properties>
<jclouds.osgi.export>org.jclouds.filesystem*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
<dependency>
@@ -30,7 +30,6 @@
<artifactId>oauth</artifactId>
<name>jclouds OAuth core</name>
<description>jclouds components to access OAuth</description>
<packaging>bundle</packaging>

<properties>
<test.oauth.identity>FIX_ME</test.oauth.identity>
@@ -40,8 +39,6 @@
<test.jclouds.oauth.scope>FIX_ME</test.jclouds.oauth.scope>
<test.oauth.api-version>2</test.oauth.api-version>
<test.oauth.build-version />
<jclouds.osgi.export>org.jclouds.oauth*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -29,7 +29,6 @@
<artifactId>openstack-cinder</artifactId>
<name>jclouds openstack-cinder api</name>
<description>jclouds components to access an implementation of OpenStack Cinder</description>
<packaging>bundle</packaging>

<properties>
<!-- keystone endpoint -->
@@ -40,9 +39,6 @@
<test.openstack-cinder.identity>FIXME_IDENTITY</test.openstack-cinder.identity>
<test.openstack-cinder.credential>FIXME_CREDENTIALS</test.openstack-cinder.credential>
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>

<jclouds.osgi.export>org.jclouds.openstack.cinder.v1*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -29,7 +29,6 @@
<artifactId>openstack-keystone</artifactId>
<name>jclouds openstack-keystone api</name>
<description>jclouds components to access an implementation of OpenStack Keystone</description>
<packaging>bundle</packaging>

<properties>
<!-- keystone version 2 -->
@@ -45,9 +44,6 @@
<test.openstack-keystone-3.identity>FIXME_DOMAIN:FIXME_USER</test.openstack-keystone-3.identity>
<test.openstack-keystone-3.credential>FIXME_PASSWORD</test.openstack-keystone-3.credential>
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>

<jclouds.osgi.export>org.jclouds.openstack*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -29,7 +29,6 @@
<artifactId>openstack-neutron</artifactId>
<name>jclouds openstack-neutron api</name>
<description>jclouds components to access an implementation of OpenStack Neutron</description>
<packaging>bundle</packaging>

<properties>
<!-- keystone endpoint -->
@@ -40,8 +39,6 @@
<test.openstack-neutron.identity>FIXME_IDENTITY</test.openstack-neutron.identity>
<test.openstack-neutron.credential>FIXME_CREDENTIALS</test.openstack-neutron.credential>
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
<jclouds.osgi.export>org.jclouds.openstack.neutron.v2*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -29,7 +29,6 @@
<artifactId>openstack-nova-ec2</artifactId>
<name>jclouds openstack-nova-ec2 api</name>
<description>EC2 interface to OpenStack Nova</description>
<packaging>bundle</packaging>

<properties>
<test.openstack-nova-ec2.endpoint>http://localhost:8773/services/Cloud</test.openstack-nova-ec2.endpoint>
@@ -39,8 +38,6 @@
<test.openstack-nova-ec2.credential>FIXME_CREDENTIAL</test.openstack-nova-ec2.credential>
<test.openstack-nova-ec2.template />
<test.openstack-nova-ec2.ebs-template />
<jclouds.osgi.export>org.jclouds.openstack.nova.ec2*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -29,7 +29,6 @@
<artifactId>openstack-nova</artifactId>
<name>Apache jclouds :: OpenStack :: Nova API</name>
<description>jclouds components to access an implementation of OpenStack Nova</description>
<packaging>bundle</packaging>

<properties>
<!-- keystone endpoint -->
@@ -42,9 +41,6 @@
<test.openstack-nova.template />
<test.jclouds.openstack-nova.auto-allocate-floating-ips>false</test.jclouds.openstack-nova.auto-allocate-floating-ips>
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>

<jclouds.osgi.export>org.jclouds.openstack.nova.v2_0*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -30,7 +30,6 @@
<artifactId>openstack-swift</artifactId>
<name>jclouds openstack-swift api</name>
<description>jclouds components to access an implementation of OpenStack Swift</description>
<packaging>bundle</packaging>

<properties>
<!-- keystone endpoint -->
@@ -42,8 +41,6 @@
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
<jclouds.blobstore.httpstream.url>https://archive.apache.org/dist/commons/logging/binaries/commons-logging-1.1.1-bin.tar.gz</jclouds.blobstore.httpstream.url>
<jclouds.blobstore.httpstream.md5>e5de09672af9b386c30a311654d8541a</jclouds.blobstore.httpstream.md5>
<jclouds.osgi.export>org.jclouds.openstack.swift.v1*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
<test.blobstore.await-consistency-timeout-seconds>30</test.blobstore.await-consistency-timeout-seconds>
</properties>

@@ -29,7 +29,6 @@
<artifactId>openstack-trove</artifactId>
<name>jclouds openstack-trove api</name>
<description>jclouds components to access an implementation of OpenStack Trove</description>
<packaging>bundle</packaging>

<properties>
<test.openstack-trove.endpoint>http://localhost:5000/v2.0/</test.openstack-trove.endpoint>
@@ -38,9 +37,6 @@
<test.openstack-trove.identity>FIXME_IDENTITY</test.openstack-trove.identity>
<test.openstack-trove.credential>FIXME_CREDENTIALS</test.openstack-trove.credential>
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>

<jclouds.osgi.export>org.jclouds.openstack.trove.v1_0*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -29,17 +29,13 @@
<artifactId>rackspace-clouddns</artifactId>
<name>jclouds rackspace clouddns api</name>
<description>jclouds components for Rackspace Cloud DNS</description>
<packaging>bundle</packaging>

<properties>
<test.rackspace-clouddns.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-clouddns.endpoint>
<test.rackspace-clouddns.api-version>1.0</test.rackspace-clouddns.api-version>
<test.rackspace-clouddns.build-version />
<test.rackspace-clouddns.identity>${test.rackspace-us.identity}</test.rackspace-clouddns.identity>
<test.rackspace-clouddns.credential>${test.rackspace-us.credential}</test.rackspace-clouddns.credential>

<jclouds.osgi.export>org.jclouds.rackspace.clouddns.v1*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -31,7 +31,6 @@
<version>2.3.0-SNAPSHOT</version>
<name>jclouds rackspace-cloudfiles api</name>
<description>jclouds components to access Rackspace Cloud Files</description>
<packaging>bundle</packaging>

<properties>
<!-- identity endpoint -->
@@ -40,8 +39,6 @@
<test.rackspace-cloudfiles.build-version />
<test.rackspace-cloudfiles.identity>FIXME_IDENTITY</test.rackspace-cloudfiles.identity>
<test.rackspace-cloudfiles.credential>FIXME_CREDENTIALS</test.rackspace-cloudfiles.credential>
<jclouds.osgi.export>org.jclouds.rackspace.cloudfiles.v1*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -29,7 +29,6 @@
<artifactId>rackspace-cloudidentity</artifactId>
<name>jclouds rackspace cloudidentity api</name>
<description>jclouds components to access an implementation of Rackspace Cloud Identity</description>
<packaging>bundle</packaging>

<properties>
<!-- keystone endpoint -->
@@ -40,9 +39,6 @@
<test.rackspace-cloudidentity.identity>${test.rackspace-us.identity}</test.rackspace-cloudidentity.identity>
<test.rackspace-cloudidentity.credential>${test.rackspace-us.credential}</test.rackspace-cloudidentity.credential>
<test.jclouds.keystone.credential-type>RAX-KSKEY:apiKeyCredentials</test.jclouds.keystone.credential-type>

<jclouds.osgi.export>org.jclouds.rackspace.cloudidentity.v2_0*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>

<dependencies>
@@ -29,17 +29,13 @@
<artifactId>rackspace-cloudloadbalancers</artifactId>
<name>jclouds Rackspace Cloud Load Balancers API</name>
<description>Cloud Load Balancers API for Rackspace</description>
<packaging>bundle</packaging>


<properties>
<test.rackspace-cloudloadbalancers.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudloadbalancers.endpoint>
<test.rackspace-cloudloadbalancers.api-version>1</test.rackspace-cloudloadbalancers.api-version>
<test.rackspace-cloudloadbalancers.build-version />
<test.rackspace-cloudloadbalancers.identity>${test.rackspace-us.identity}</test.rackspace-cloudloadbalancers.identity>
<test.rackspace-cloudloadbalancers.credential>${test.rackspace-us.credential}</test.rackspace-cloudloadbalancers.credential>

<jclouds.osgi.export>org.jclouds.rackspace.cloudloadbalancers*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
<dependency>
@@ -29,17 +29,13 @@
<artifactId>route53</artifactId>
<name>jclouds route53 api</name>
<description>jclouds components to access an implementation of Route 53</description>
<packaging>bundle</packaging>

<properties>
<test.route53.endpoint>https://route53.amazonaws.com</test.route53.endpoint>
<test.route53.api-version>2012-02-29</test.route53.api-version>
<test.route53.build-version />
<test.route53.identity>${test.aws.identity}</test.route53.identity>
<test.route53.credential>${test.aws.credential}</test.route53.credential>

<jclouds.osgi.export>org.jclouds.route53*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>