This is an automated email from the ASF dual-hosted git repository. gaul pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit 32f6c4d50f6e882292ddafcbaf382e64bf95d70e Author: gurkerl83 <markus_grit...@gmx.de> AuthorDate: Sat Oct 17 16:01:26 2020 +0200 Remove the OSGi configuration from each module. The approach of defining 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. --- apis/atmos/pom.xml | 4 ---- apis/byon/pom.xml | 3 --- apis/chef/pom.xml | 10 ---------- apis/cloudstack/pom.xml | 3 --- apis/cloudwatch/pom.xml | 4 ---- apis/docker/pom.xml | 8 -------- apis/ec2/pom.xml | 3 --- apis/elasticstack/pom.xml | 5 +---- apis/filesystem/pom.xml | 6 ------ apis/oauth/pom.xml | 3 --- apis/openstack-cinder/pom.xml | 4 ---- apis/openstack-keystone/pom.xml | 4 ---- apis/openstack-neutron/pom.xml | 3 --- apis/openstack-nova-ec2/pom.xml | 3 --- apis/openstack-nova/pom.xml | 4 ---- apis/openstack-swift/pom.xml | 3 --- apis/openstack-trove/pom.xml | 4 ---- apis/rackspace-clouddns/pom.xml | 4 ---- apis/rackspace-cloudfiles/pom.xml | 3 --- apis/rackspace-cloudidentity/pom.xml | 4 ---- apis/rackspace-cloudloadbalancers/pom.xml | 6 +----- apis/route53/pom.xml | 4 ---- apis/s3/pom.xml | 4 ---- apis/sqs/pom.xml | 4 ---- apis/sts/pom.xml | 4 ---- common/googlecloud/pom.xml | 6 ------ common/openstack/pom.xml | 6 ------ drivers/apachehc/pom.xml | 6 ------ drivers/bouncycastle/pom.xml | 6 ------ drivers/enterprise/pom.xml | 6 ------ drivers/gae/pom.xml | 6 ------ drivers/joda/pom.xml | 6 ------ drivers/jsch/pom.xml | 4 ---- drivers/log4j/pom.xml | 6 ------ drivers/netty/pom.xml | 10 ---------- drivers/okhttp/pom.xml | 6 ------ drivers/slf4j/pom.xml | 10 ---------- drivers/sshj/pom.xml | 4 ---- providers/aws-cloudwatch/pom.xml | 4 ---- providers/aws-ec2/pom.xml | 10 ---------- providers/aws-route53/pom.xml | 4 ---- providers/aws-s3/pom.xml | 9 --------- providers/aws-sqs/pom.xml | 4 ---- providers/aws-sts/pom.xml | 4 ---- providers/azureblob/pom.xml | 4 ---- providers/azurecompute-arm/pom.xml | 3 --- providers/b2/pom.xml | 3 --- providers/digitalocean2/pom.xml | 8 -------- providers/dynect/pom.xml | 8 -------- providers/elastichosts-ams-e/pom.xml | 9 --------- providers/elastichosts-dal-a/pom.xml | 9 --------- providers/elastichosts-hkg-e/pom.xml | 9 --------- providers/elastichosts-lax-p/pom.xml | 9 --------- providers/elastichosts-lon-b/pom.xml | 9 --------- providers/elastichosts-lon-p/pom.xml | 9 --------- providers/elastichosts-mmi-a/pom.xml | 9 --------- providers/elastichosts-sat-p/pom.xml | 9 --------- providers/elastichosts-sjc-c/pom.xml | 9 --------- providers/elastichosts-syd-v/pom.xml | 9 --------- providers/elastichosts-tor-p/pom.xml | 9 --------- providers/glesys/pom.xml | 3 --- providers/go2cloud-jhb1/pom.xml | 9 --------- providers/gogrid/pom.xml | 9 --------- providers/google-cloud-storage/pom.xml | 3 --- providers/google-compute-engine/pom.xml | 8 -------- providers/openhosting-east1/pom.xml | 9 --------- providers/packet/pom.xml | 3 --- providers/profitbricks/pom.xml | 7 ------- providers/rackspace-cloudblockstorage-uk/pom.xml | 3 --- providers/rackspace-cloudblockstorage-us/pom.xml | 3 --- providers/rackspace-clouddatabases-uk/pom.xml | 3 --- providers/rackspace-clouddatabases-us/pom.xml | 3 --- providers/rackspace-clouddns-uk/pom.xml | 3 --- providers/rackspace-clouddns-us/pom.xml | 3 --- providers/rackspace-cloudfiles-uk/pom.xml | 3 --- providers/rackspace-cloudfiles-us/pom.xml | 3 --- providers/rackspace-cloudloadbalancers-uk/pom.xml | 6 +----- providers/rackspace-cloudloadbalancers-us/pom.xml | 6 +----- providers/rackspace-cloudnetworks-uk/pom.xml | 3 --- providers/rackspace-cloudnetworks-us/pom.xml | 3 --- providers/rackspace-cloudservers-uk/pom.xml | 3 --- providers/rackspace-cloudservers-us/pom.xml | 3 --- providers/serverlove-z1-man/pom.xml | 8 -------- providers/skalicloud-sdg-my/pom.xml | 9 --------- providers/softlayer/pom.xml | 8 -------- providers/ultradns-ws/pom.xml | 4 ---- skeletons/standalone-compute/pom.xml | 4 ---- 87 files changed, 4 insertions(+), 477 deletions(-) diff --git a/apis/atmos/pom.xml b/apis/atmos/pom.xml index 5b58660..07f63e2 100644 --- a/apis/atmos/pom.xml +++ b/apis/atmos/pom.xml @@ -29,7 +29,6 @@ <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> @@ -37,9 +36,6 @@ <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> diff --git a/apis/byon/pom.xml b/apis/byon/pom.xml index 75d6fae..c2fa901 100644 --- a/apis/byon/pom.xml +++ b/apis/byon/pom.xml @@ -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> diff --git a/apis/chef/pom.xml b/apis/chef/pom.xml index 825ad6e..1b909a7 100644 --- a/apis/chef/pom.xml +++ b/apis/chef/pom.xml @@ -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> diff --git a/apis/cloudstack/pom.xml b/apis/cloudstack/pom.xml index 4f66888..d48982c 100644 --- a/apis/cloudstack/pom.xml +++ b/apis/cloudstack/pom.xml @@ -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> diff --git a/apis/cloudwatch/pom.xml b/apis/cloudwatch/pom.xml index d5e3065..72b6e28 100644 --- a/apis/cloudwatch/pom.xml +++ b/apis/cloudwatch/pom.xml @@ -29,7 +29,6 @@ <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> @@ -37,9 +36,6 @@ <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> diff --git a/apis/docker/pom.xml b/apis/docker/pom.xml index dae96bc..e022586 100644 --- a/apis/docker/pom.xml +++ b/apis/docker/pom.xml @@ -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> diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml index f631a5c..bfd52ec 100644 --- a/apis/ec2/pom.xml +++ b/apis/ec2/pom.xml @@ -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> diff --git a/apis/elasticstack/pom.xml b/apis/elasticstack/pom.xml index cdc203e..86026dc 100644 --- a/apis/elasticstack/pom.xml +++ b/apis/elasticstack/pom.xml @@ -29,8 +29,7 @@ <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> @@ -38,8 +37,6 @@ <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> diff --git a/apis/filesystem/pom.xml b/apis/filesystem/pom.xml index d6688ff..d1cbf6b 100644 --- a/apis/filesystem/pom.xml +++ b/apis/filesystem/pom.xml @@ -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> diff --git a/apis/oauth/pom.xml b/apis/oauth/pom.xml index 8c86736..5b3d6d6 100644 --- a/apis/oauth/pom.xml +++ b/apis/oauth/pom.xml @@ -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> diff --git a/apis/openstack-cinder/pom.xml b/apis/openstack-cinder/pom.xml index cefe795..be5055f 100644 --- a/apis/openstack-cinder/pom.xml +++ b/apis/openstack-cinder/pom.xml @@ -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> diff --git a/apis/openstack-keystone/pom.xml b/apis/openstack-keystone/pom.xml index 47a8f22..556440a 100644 --- a/apis/openstack-keystone/pom.xml +++ b/apis/openstack-keystone/pom.xml @@ -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> diff --git a/apis/openstack-neutron/pom.xml b/apis/openstack-neutron/pom.xml index eba8005..36c6d88 100644 --- a/apis/openstack-neutron/pom.xml +++ b/apis/openstack-neutron/pom.xml @@ -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> diff --git a/apis/openstack-nova-ec2/pom.xml b/apis/openstack-nova-ec2/pom.xml index 390d299..82b3d64 100644 --- a/apis/openstack-nova-ec2/pom.xml +++ b/apis/openstack-nova-ec2/pom.xml @@ -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> diff --git a/apis/openstack-nova/pom.xml b/apis/openstack-nova/pom.xml index 9004634..1a8bfc6 100644 --- a/apis/openstack-nova/pom.xml +++ b/apis/openstack-nova/pom.xml @@ -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> diff --git a/apis/openstack-swift/pom.xml b/apis/openstack-swift/pom.xml index 87db653..a18c40f 100644 --- a/apis/openstack-swift/pom.xml +++ b/apis/openstack-swift/pom.xml @@ -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> diff --git a/apis/openstack-trove/pom.xml b/apis/openstack-trove/pom.xml index 2b932eb..59b8da0 100644 --- a/apis/openstack-trove/pom.xml +++ b/apis/openstack-trove/pom.xml @@ -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> diff --git a/apis/rackspace-clouddns/pom.xml b/apis/rackspace-clouddns/pom.xml index 135c383..3039a2f 100644 --- a/apis/rackspace-clouddns/pom.xml +++ b/apis/rackspace-clouddns/pom.xml @@ -29,7 +29,6 @@ <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> @@ -37,9 +36,6 @@ <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> diff --git a/apis/rackspace-cloudfiles/pom.xml b/apis/rackspace-cloudfiles/pom.xml index bfd58d7..a1bb4be 100644 --- a/apis/rackspace-cloudfiles/pom.xml +++ b/apis/rackspace-cloudfiles/pom.xml @@ -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> diff --git a/apis/rackspace-cloudidentity/pom.xml b/apis/rackspace-cloudidentity/pom.xml index 83a05c3..de1f3d3 100644 --- a/apis/rackspace-cloudidentity/pom.xml +++ b/apis/rackspace-cloudidentity/pom.xml @@ -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> diff --git a/apis/rackspace-cloudloadbalancers/pom.xml b/apis/rackspace-cloudloadbalancers/pom.xml index e2b2f3d..b395507 100644 --- a/apis/rackspace-cloudloadbalancers/pom.xml +++ b/apis/rackspace-cloudloadbalancers/pom.xml @@ -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> diff --git a/apis/route53/pom.xml b/apis/route53/pom.xml index c11f67c..e630f6e 100644 --- a/apis/route53/pom.xml +++ b/apis/route53/pom.xml @@ -29,7 +29,6 @@ <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> @@ -37,9 +36,6 @@ <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> <dependencies> diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml index 93fe73d..0dfe3e0 100644 --- a/apis/s3/pom.xml +++ b/apis/s3/pom.xml @@ -29,7 +29,6 @@ <artifactId>s3</artifactId> <name>jclouds s3 api</name> <description>jclouds components to access an implementation of S3</description> - <packaging>bundle</packaging> <properties> <test.s3.endpoint>https://s3.amazonaws.com</test.s3.endpoint> @@ -38,9 +37,6 @@ <test.s3.identity>${test.aws.identity}</test.s3.identity> <test.s3.credential>${test.aws.credential}</test.s3.credential> <test.s3.sessionToken>${test.aws.sessionToken}</test.s3.sessionToken> - - <jclouds.osgi.export>org.jclouds.s3*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/apis/sqs/pom.xml b/apis/sqs/pom.xml index 6409c2a..cec35ef 100644 --- a/apis/sqs/pom.xml +++ b/apis/sqs/pom.xml @@ -29,7 +29,6 @@ <artifactId>sqs</artifactId> <name>jclouds sqs api</name> <description>jclouds components to access an implementation of Simple Queue Service</description> - <packaging>bundle</packaging> <properties> <test.sqs.endpoint>https://sqs.us-east-1.amazonaws.com</test.sqs.endpoint> @@ -37,9 +36,6 @@ <test.sqs.build-version /> <test.sqs.identity>${test.aws.identity}</test.sqs.identity> <test.sqs.credential>${test.aws.credential}</test.sqs.credential> - - <jclouds.osgi.export>org.jclouds.sqs*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/apis/sts/pom.xml b/apis/sts/pom.xml index 02428b0..4a70e61 100644 --- a/apis/sts/pom.xml +++ b/apis/sts/pom.xml @@ -29,7 +29,6 @@ <artifactId>sts</artifactId> <name>jclouds sts api</name> <description>jclouds components to access an implementation of Security Token Service (STS)</description> - <packaging>bundle</packaging> <properties> <test.sts.endpoint>https://sts.amazonaws.com</test.sts.endpoint> @@ -37,9 +36,6 @@ <test.sts.build-version /> <test.sts.identity>${test.aws.identity}</test.sts.identity> <test.sts.credential>${test.aws.credential}</test.sts.credential> - - <jclouds.osgi.export>org.jclouds.aws*;version="${project.version}",org.jclouds.sts*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/common/googlecloud/pom.xml b/common/googlecloud/pom.xml index 1733443..570a315 100644 --- a/common/googlecloud/pom.xml +++ b/common/googlecloud/pom.xml @@ -31,12 +31,6 @@ <artifactId>googlecloud</artifactId> <name>jclouds Google Cloud Core</name> <description>jclouds components common to Google Cloud products</description> - <packaging>bundle</packaging> - - <properties> - <jclouds.osgi.export>org.jclouds.googlecloud*;version="${project.version}";-noimport:=true</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> - </properties> <dependencies> <dependency> diff --git a/common/openstack/pom.xml b/common/openstack/pom.xml index 311f61a..ebd58d8 100644 --- a/common/openstack/pom.xml +++ b/common/openstack/pom.xml @@ -30,12 +30,6 @@ <artifactId>openstack-common</artifactId> <name>jclouds OpenStack Components Core</name> <description>jclouds Core components to access OpenStack apis</description> - <packaging>bundle</packaging> - - <properties> - <jclouds.osgi.export>org.jclouds.openstack*;version="${project.version}";-noimport:=true</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> - </properties> <dependencies> <dependency> diff --git a/drivers/apachehc/pom.xml b/drivers/apachehc/pom.xml index 99daca5..01066b6 100644 --- a/drivers/apachehc/pom.xml +++ b/drivers/apachehc/pom.xml @@ -28,14 +28,8 @@ <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-apachehc</artifactId> <name>jclouds Apache Http Components Client</name> - <packaging>bundle</packaging> <description>Apache HttpComponents client</description> - <properties> - <jclouds.osgi.export>org.jclouds.http.apachehc*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> - </properties> - <dependencies> <dependency> <groupId>org.apache.jclouds</groupId> diff --git a/drivers/bouncycastle/pom.xml b/drivers/bouncycastle/pom.xml index 5ba226b..0c254e4 100644 --- a/drivers/bouncycastle/pom.xml +++ b/drivers/bouncycastle/pom.xml @@ -29,12 +29,6 @@ <artifactId>jclouds-bouncycastle</artifactId> <name>jclouds bouncycastle EncryptionService Module</name> <description>jclouds bouncycastle EncryptionService Module</description> - <packaging>bundle</packaging> - - <properties> - <jclouds.osgi.export>org.jclouds.encryption.bouncycastle*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> - </properties> <dependencies> <dependency> diff --git a/drivers/enterprise/pom.xml b/drivers/enterprise/pom.xml index 8dec673..7b81502 100644 --- a/drivers/enterprise/pom.xml +++ b/drivers/enterprise/pom.xml @@ -29,12 +29,6 @@ <artifactId>jclouds-enterprise</artifactId> <name>jclouds enterprise Module</name> <description>jclouds enterprise configuration</description> - <packaging>bundle</packaging> - - <properties> - <jclouds.osgi.export>org.jclouds.enterprise*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> - </properties> <dependencies> <dependency> diff --git a/drivers/gae/pom.xml b/drivers/gae/pom.xml index 1b231ae..a422870 100644 --- a/drivers/gae/pom.xml +++ b/drivers/gae/pom.xml @@ -29,12 +29,6 @@ <artifactId>jclouds-gae</artifactId> <name>jclouds Google App Engine Components</name> <description>Google App Engine Components</description> - <packaging>bundle</packaging> - - <properties> - <jclouds.osgi.export>org.jclouds.gae*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> - </properties> <dependencies> <dependency> diff --git a/drivers/joda/pom.xml b/drivers/joda/pom.xml index eae5ad6..9b351d2 100644 --- a/drivers/joda/pom.xml +++ b/drivers/joda/pom.xml @@ -29,12 +29,6 @@ <artifactId>jclouds-joda</artifactId> <name>jclouds joda DateService Module</name> <description>jclouds joda DateService Module</description> - <packaging>bundle</packaging> - - <properties> - <jclouds.osgi.export>org.jclouds.date.joda*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> - </properties> <dependencies> <dependency> diff --git a/drivers/jsch/pom.xml b/drivers/jsch/pom.xml index 9c781c4..9594388 100644 --- a/drivers/jsch/pom.xml +++ b/drivers/jsch/pom.xml @@ -29,7 +29,6 @@ <artifactId>jclouds-jsch</artifactId> <name>jclouds jsch ssh client</name> <description>jclouds jsch ssh client</description> - <packaging>bundle</packaging> <properties> <test.ssh.host>localhost</test.ssh.host> @@ -37,9 +36,6 @@ <test.ssh.username /> <test.ssh.password /> <test.ssh.keyfile /> - - <jclouds.osgi.export>org.jclouds.ssh.jsch*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/drivers/log4j/pom.xml b/drivers/log4j/pom.xml index c318a5f..73805fa 100644 --- a/drivers/log4j/pom.xml +++ b/drivers/log4j/pom.xml @@ -29,12 +29,6 @@ <artifactId>jclouds-log4j</artifactId> <name>jclouds Log4J Logging Module</name> <description>jclouds Log4J Logging Module</description> - <packaging>bundle</packaging> - - <properties> - <jclouds.osgi.export>org.jclouds.logging.log4j*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> - </properties> <dependencies> <dependency> diff --git a/drivers/netty/pom.xml b/drivers/netty/pom.xml index 459287f..5833b9b 100644 --- a/drivers/netty/pom.xml +++ b/drivers/netty/pom.xml @@ -29,16 +29,6 @@ <artifactId>jclouds-netty</artifactId> <name>jclouds netty payload module</name> <description>jclouds netty payload module</description> - <packaging>bundle</packaging> - - <properties> - <jclouds.osgi.export>org.jclouds.netty*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import> - org.jclouds*;version="${project.version}", - org.jboss.netty*;version="3.5.9.Final", - * - </jclouds.osgi.import> - </properties> <dependencies> <dependency> diff --git a/drivers/okhttp/pom.xml b/drivers/okhttp/pom.xml index 60cd6a3..3f43551 100644 --- a/drivers/okhttp/pom.xml +++ b/drivers/okhttp/pom.xml @@ -28,14 +28,8 @@ <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-okhttp</artifactId> <name>jclouds OkHttp Driver</name> - <packaging>bundle</packaging> <description>OkHttp Driver</description> - <properties> - <jclouds.osgi.export>org.jclouds.http.okhttp*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",${okio.osgi.import},*</jclouds.osgi.import> - </properties> - <dependencies> <dependency> <groupId>org.apache.jclouds</groupId> diff --git a/drivers/slf4j/pom.xml b/drivers/slf4j/pom.xml index 5c4cc6d..f4eb5d8 100644 --- a/drivers/slf4j/pom.xml +++ b/drivers/slf4j/pom.xml @@ -29,16 +29,6 @@ <artifactId>jclouds-slf4j</artifactId> <name>jclouds SLF4J Logging Module</name> <description>jclouds SLF4J Logging Module</description> - <packaging>bundle</packaging> - - <properties> - <jclouds.osgi.export>org.jclouds.logging.slf4j*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import> - org.jclouds*;version="${project.version}", - org.slf4j*;version="[1.5,2)", - * - </jclouds.osgi.import> - </properties> <dependencies> <dependency> diff --git a/drivers/sshj/pom.xml b/drivers/sshj/pom.xml index 825006a..ba3fba3 100644 --- a/drivers/sshj/pom.xml +++ b/drivers/sshj/pom.xml @@ -29,7 +29,6 @@ <artifactId>jclouds-sshj</artifactId> <name>jclouds sshj ssh client</name> <description>jclouds sshj ssh client</description> - <packaging>bundle</packaging> <properties> <test.ssh.host>localhost</test.ssh.host> @@ -37,9 +36,6 @@ <test.ssh.username /> <test.ssh.password /> <test.ssh.keyfile /> - - <jclouds.osgi.export>org.jclouds.sshj*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/aws-cloudwatch/pom.xml b/providers/aws-cloudwatch/pom.xml index 51b5eec..5ba4810 100644 --- a/providers/aws-cloudwatch/pom.xml +++ b/providers/aws-cloudwatch/pom.xml @@ -29,7 +29,6 @@ <artifactId>aws-cloudwatch</artifactId> <name>jclouds Amazon Elastic Load Balancer provider</name> <description>Elastic Load Balancer implementation targeted to Amazon Web Services</description> - <packaging>bundle</packaging> <properties> <test.aws.identity>FIXME_IDENTITY</test.aws.identity> @@ -39,9 +38,6 @@ <test.aws-cloudwatch.build-version /> <test.aws-cloudwatch.identity>${test.aws.identity}</test.aws-cloudwatch.identity> <test.aws-cloudwatch.credential>${test.aws.credential}</test.aws-cloudwatch.credential> - - <jclouds.osgi.export>org.jclouds.aws.cloudwatch*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml index 407e326..729b4ec 100644 --- a/providers/aws-ec2/pom.xml +++ b/providers/aws-ec2/pom.xml @@ -29,7 +29,6 @@ <artifactId>aws-ec2</artifactId> <name>jclouds Amazon EC2 provider</name> <description>EC2 implementation targeted to Amazon Web Services</description> - <packaging>bundle</packaging> <properties> <test.aws.identity>FIXME_IDENTITY</test.aws.identity> @@ -45,15 +44,6 @@ <test.aws-ec2.ebs-template>hardwareId=m1.small,imageId=us-east-1/ami-53b1ff3a</test.aws-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.aws-ec2.windows-template>hardwareId=m1.small,imageId=us-east-1/ami-0cb76d65</test.aws-ec2.windows-template> - <jclouds.osgi.export>org.jclouds.aws.ec2*;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.aws;version="${project.version}", - org.jclouds.aws*;version="${project.version}", - org.jclouds*;version="${project.version}", - * - </jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/aws-route53/pom.xml b/providers/aws-route53/pom.xml index 01a60b1..a61ac82 100644 --- a/providers/aws-route53/pom.xml +++ b/providers/aws-route53/pom.xml @@ -29,7 +29,6 @@ <artifactId>aws-route53</artifactId> <name>jclouds Amazon Route 53 provider</name> <description>Route 53 targeted to Amazon Web Services</description> - <packaging>bundle</packaging> <properties> <test.aws.identity>FIXME_IDENTITY</test.aws.identity> @@ -39,9 +38,6 @@ <test.aws-route53.build-version /> <test.aws-route53.identity>${test.aws.identity}</test.aws-route53.identity> <test.aws-route53.credential>${test.aws.credential}</test.aws-route53.credential> - - <jclouds.osgi.export>org.jclouds.aws.route53*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/aws-s3/pom.xml b/providers/aws-s3/pom.xml index 5c301ce..690edf9 100644 --- a/providers/aws-s3/pom.xml +++ b/providers/aws-s3/pom.xml @@ -29,7 +29,6 @@ <artifactId>aws-s3</artifactId> <name>jclouds Amazon Simple Storage Service (S3) provider</name> <description>Simple Storage Service (S3) implementation targeted to Amazon Web Services</description> - <packaging>bundle</packaging> <properties> <test.aws.identity>FIXME_IDENTITY</test.aws.identity> @@ -42,14 +41,6 @@ <test.aws-s3.credential>${test.aws.credential}</test.aws-s3.credential> <test.aws-s3.sessionToken>${test.aws.sessionToken}</test.aws-s3.sessionToken> <test.blobstore.container-count>25</test.blobstore.container-count> - - <jclouds.osgi.export>org.jclouds.aws.s3*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import> - org.jclouds*;version="${project.version}", - org.jclouds.io;version="${project.version}", - org.jclouds.http.options;version="${project.version}", - * - </jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/aws-sqs/pom.xml b/providers/aws-sqs/pom.xml index 6ef8b77..6a9ff57 100644 --- a/providers/aws-sqs/pom.xml +++ b/providers/aws-sqs/pom.xml @@ -29,7 +29,6 @@ <artifactId>aws-sqs</artifactId> <name>jclouds Amazon Simple Queue Service provider</name> <description>Simple Queue Service implementation targeted to Amazon Web Services</description> - <packaging>bundle</packaging> <properties> <test.aws.identity>FIXME_IDENTITY</test.aws.identity> @@ -39,9 +38,6 @@ <test.aws-sqs.build-version /> <test.aws-sqs.identity>${test.aws.identity}</test.aws-sqs.identity> <test.aws-sqs.credential>${test.aws.credential}</test.aws-sqs.credential> - - <jclouds.osgi.export>org.jclouds.aws.sqs*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/aws-sts/pom.xml b/providers/aws-sts/pom.xml index 36032d5..e9c8f48 100644 --- a/providers/aws-sts/pom.xml +++ b/providers/aws-sts/pom.xml @@ -29,7 +29,6 @@ <artifactId>aws-sts</artifactId> <name>jclouds Amazon Identity and Access Management (STS) provider</name> <description>Identity and Access Management (STS) to Amazon Web Services</description> - <packaging>bundle</packaging> <properties> <test.aws.identity>FIXME_IDENTITY</test.aws.identity> @@ -39,9 +38,6 @@ <test.aws-sts.build-version /> <test.aws-sts.identity>${test.aws.identity}</test.aws-sts.identity> <test.aws-sts.credential>${test.aws.credential}</test.aws-sts.credential> - - <jclouds.osgi.export>org.jclouds.aws.sts*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/azureblob/pom.xml b/providers/azureblob/pom.xml index d65a838..f27fd48 100644 --- a/providers/azureblob/pom.xml +++ b/providers/azureblob/pom.xml @@ -29,7 +29,6 @@ <artifactId>azureblob</artifactId> <name>jclouds Azure Storage provider</name> <description>jclouds components to access Azure Blob Service</description> - <packaging>bundle</packaging> <properties> <test.azureblob.endpoint>https://${jclouds.identity}.blob.core.windows.net</test.azureblob.endpoint> @@ -37,9 +36,6 @@ <test.azureblob.build-version /> <test.azureblob.identity>${test.azure.identity}</test.azureblob.identity> <test.azureblob.credential>${test.azure.credential}</test.azureblob.credential> - - <jclouds.osgi.export>org.jclouds.azureblob*;version="${project.version}",org.jclouds.azure.storage*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/azurecompute-arm/pom.xml b/providers/azurecompute-arm/pom.xml index 60fd2cb..df00c7c 100644 --- a/providers/azurecompute-arm/pom.xml +++ b/providers/azurecompute-arm/pom.xml @@ -31,7 +31,6 @@ <artifactId>azurecompute-arm</artifactId> <name>jclouds Azure Compute ARM API</name> <description>jclouds components to access an implementation of Azure's ARM Compute Service</description> - <packaging>bundle</packaging> <properties> <test.jclouds.oauth.resource>https://management.azure.com/</test.jclouds.oauth.resource> @@ -41,8 +40,6 @@ <test.azurecompute-arm.build-version /> <test.azurecompute-arm.identity>app id</test.azurecompute-arm.identity> <test.azurecompute-arm.credential>app password</test.azurecompute-arm.credential> - <jclouds.osgi.export>org.jclouds.azurecompute.arm*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/b2/pom.xml b/providers/b2/pom.xml index 1da69c7..314b422 100644 --- a/providers/b2/pom.xml +++ b/providers/b2/pom.xml @@ -31,14 +31,11 @@ <artifactId>b2</artifactId> <name>Apache jclouds B2 API</name> <description>BlobStore binding to the Backblaze B2 API</description> - <packaging>bundle</packaging> <properties> <test.b2.identity>FIXME_IDENTITY</test.b2.identity> <test.b2.credential>FIXME_CREDENTIAL</test.b2.credential> <test.b2.build-version /> - <jclouds.osgi.export>org.jclouds.b2*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/digitalocean2/pom.xml b/providers/digitalocean2/pom.xml index 2e68ca4..cb1446b 100644 --- a/providers/digitalocean2/pom.xml +++ b/providers/digitalocean2/pom.xml @@ -31,7 +31,6 @@ <artifactId>digitalocean2</artifactId> <name>jclouds DigitalOcean v2 API Provider</name> <description>jclouds provider for Digital Ocean v2 Compute API</description> - <packaging>bundle</packaging> <properties> <test.digitalocean2.endpoint>https://api.digitalocean.com/v2/</test.digitalocean2.endpoint> @@ -39,13 +38,6 @@ <test.digitalocean2.identity>FIXME</test.digitalocean2.identity> <test.digitalocean2.credential>FIXME</test.digitalocean2.credential> <test.digitalocean2.template>osFamily=UBUNTU,os64Bit=true,osVersionMatches=16.*</test.digitalocean2.template> - <jclouds.osgi.export>org.jclouds.digitalocean2*;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> diff --git a/providers/dynect/pom.xml b/providers/dynect/pom.xml index 64d18f6..9a5ebe4 100644 --- a/providers/dynect/pom.xml +++ b/providers/dynect/pom.xml @@ -29,7 +29,6 @@ <artifactId>dynect</artifactId> <name>jclouds dynect api</name> <description>jclouds components for DynECT Managed DNS</description> - <packaging>bundle</packaging> <properties> <test.dynect.endpoint>https://api2.dynect.net/REST</test.dynect.endpoint> @@ -37,13 +36,6 @@ <test.dynect.build-version /> <test.dynect.identity /> <test.dynect.credential /> - - <jclouds.osgi.export>org.jclouds.dynect.v3*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import> - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - </jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/elastichosts-ams-e/pom.xml b/providers/elastichosts-ams-e/pom.xml index 5670fb4..b940238 100644 --- a/providers/elastichosts-ams-e/pom.xml +++ b/providers/elastichosts-ams-e/pom.xml @@ -29,7 +29,6 @@ <artifactId>elastichosts-ams-e</artifactId> <name>jclouds ElasticHosts Amsterdam provider</name> <description>ElasticHosts implementation targeted to Amsterdam</description> - <packaging>bundle</packaging> <properties> <test.elastichosts-ams-e.endpoint>https://api-ams-e.elastichosts.com</test.elastichosts-ams-e.endpoint> @@ -38,14 +37,6 @@ <test.elastichosts-ams-e.identity>FIXME_IDENTITY</test.elastichosts-ams-e.identity> <test.elastichosts-ams-e.credential>FIXME_CREDENTIAL</test.elastichosts-ams-e.credential> <test.elastichosts-ams-e.template /> - - <jclouds.osgi.export>org.jclouds.elastichosts*;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> diff --git a/providers/elastichosts-dal-a/pom.xml b/providers/elastichosts-dal-a/pom.xml index a0192e7..f134174 100644 --- a/providers/elastichosts-dal-a/pom.xml +++ b/providers/elastichosts-dal-a/pom.xml @@ -29,7 +29,6 @@ <artifactId>elastichosts-dal-a</artifactId> <name>jclouds ElasticHosts Dallas provider</name> <description>ElasticHosts implementation targeted to Dallas</description> - <packaging>bundle</packaging> <properties> <test.elastichosts-dal-a.endpoint>https://api-dal-a.elastichosts.com</test.elastichosts-dal-a.endpoint> @@ -38,14 +37,6 @@ <test.elastichosts-dal-a.identity>FIXME_IDENTITY</test.elastichosts-dal-a.identity> <test.elastichosts-dal-a.credential>FIXME_CREDENTIAL</test.elastichosts-dal-a.credential> <test.elastichosts-dal-a.template /> - - <jclouds.osgi.export>org.jclouds.elastichosts*;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> diff --git a/providers/elastichosts-hkg-e/pom.xml b/providers/elastichosts-hkg-e/pom.xml index b5234ac..ebc0bf8 100644 --- a/providers/elastichosts-hkg-e/pom.xml +++ b/providers/elastichosts-hkg-e/pom.xml @@ -29,7 +29,6 @@ <artifactId>elastichosts-hkg-e</artifactId> <name>jclouds ElasticHosts Hong Kong provider</name> <description>ElasticHosts implementation targeted to Hong Kong</description> - <packaging>bundle</packaging> <properties> <test.elastichosts-hkg-e.endpoint>https://api-hkg-e.elastichosts.com</test.elastichosts-hkg-e.endpoint> @@ -38,14 +37,6 @@ <test.elastichosts-hkg-e.identity>FIXME_IDENTITY</test.elastichosts-hkg-e.identity> <test.elastichosts-hkg-e.credential>FIXME_CREDENTIAL</test.elastichosts-hkg-e.credential> <test.elastichosts-hkg-e.template /> - - <jclouds.osgi.export>org.jclouds.elastichosts*;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> diff --git a/providers/elastichosts-lax-p/pom.xml b/providers/elastichosts-lax-p/pom.xml index 1057f39..b83540d 100644 --- a/providers/elastichosts-lax-p/pom.xml +++ b/providers/elastichosts-lax-p/pom.xml @@ -29,7 +29,6 @@ <artifactId>elastichosts-lax-p</artifactId> <name>jclouds ElasticHosts Peer1 Los Angeles provider</name> <description>ElasticHosts implementation targeted to Peer1 Toronto</description> - <packaging>bundle</packaging> <properties> <test.elastichosts-lax-p.endpoint>https://api-lax-p.elastichosts.com</test.elastichosts-lax-p.endpoint> @@ -38,14 +37,6 @@ <test.elastichosts-lax-p.identity>FIXME_IDENTITY</test.elastichosts-lax-p.identity> <test.elastichosts-lax-p.credential>FIXME_CREDENTIAL</test.elastichosts-lax-p.credential> <test.elastichosts-lax-p.template /> - - <jclouds.osgi.export>org.jclouds.elastichosts*;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> diff --git a/providers/elastichosts-lon-b/pom.xml b/providers/elastichosts-lon-b/pom.xml index 6fe14fd..209efbf 100644 --- a/providers/elastichosts-lon-b/pom.xml +++ b/providers/elastichosts-lon-b/pom.xml @@ -29,7 +29,6 @@ <artifactId>elastichosts-lon-b</artifactId> <name>jclouds ElasticHosts BlueSquare London provider</name> <description>ElasticHosts implementation targeted to BlueSquare London</description> - <packaging>bundle</packaging> <properties> <test.elastichosts-lon-b.endpoint>https://api-lon-b.elastichosts.com</test.elastichosts-lon-b.endpoint> @@ -38,14 +37,6 @@ <test.elastichosts-lon-b.identity>FIXME_IDENTITY</test.elastichosts-lon-b.identity> <test.elastichosts-lon-b.credential>FIXME_CREDENTIAL</test.elastichosts-lon-b.credential> <test.elastichosts-lon-b.template /> - - <jclouds.osgi.export>org.jclouds.elastichosts*;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> diff --git a/providers/elastichosts-lon-p/pom.xml b/providers/elastichosts-lon-p/pom.xml index bdb3fe0..3b431a4 100644 --- a/providers/elastichosts-lon-p/pom.xml +++ b/providers/elastichosts-lon-p/pom.xml @@ -29,7 +29,6 @@ <artifactId>elastichosts-lon-p</artifactId> <name>jclouds ElasticHosts Peer1 London provider</name> <description>ElasticHosts implementation targeted to Peer1 London</description> - <packaging>bundle</packaging> <properties> <test.elastichosts-lon-p.endpoint>https://api-lon-p.elastichosts.com</test.elastichosts-lon-p.endpoint> @@ -38,14 +37,6 @@ <test.elastichosts-lon-p.identity>FIXME_IDENTITY</test.elastichosts-lon-p.identity> <test.elastichosts-lon-p.credential>FIXME_CREDENTIAL</test.elastichosts-lon-p.credential> <test.elastichosts-lon-p.template /> - - <jclouds.osgi.export>org.jclouds.elastichosts*;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> diff --git a/providers/elastichosts-mmi-a/pom.xml b/providers/elastichosts-mmi-a/pom.xml index a604a54..5d1f644 100644 --- a/providers/elastichosts-mmi-a/pom.xml +++ b/providers/elastichosts-mmi-a/pom.xml @@ -29,7 +29,6 @@ <artifactId>elastichosts-mmi-a</artifactId> <name>jclouds ElasticHosts Miami provider</name> <description>ElasticHosts implementation targeted to Miami</description> - <packaging>bundle</packaging> <properties> <test.elastichosts-mmi-a.endpoint>https://api-mmi-a.elastichosts.com</test.elastichosts-mmi-a.endpoint> @@ -38,14 +37,6 @@ <test.elastichosts-mmi-a.identity>FIXME_IDENTITY</test.elastichosts-mmi-a.identity> <test.elastichosts-mmi-a.credential>FIXME_CREDENTIAL</test.elastichosts-mmi-a.credential> <test.elastichosts-mmi-a.template /> - - <jclouds.osgi.export>org.jclouds.elastichosts*;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> diff --git a/providers/elastichosts-sat-p/pom.xml b/providers/elastichosts-sat-p/pom.xml index 7adaf51..f23af79 100644 --- a/providers/elastichosts-sat-p/pom.xml +++ b/providers/elastichosts-sat-p/pom.xml @@ -29,7 +29,6 @@ <artifactId>elastichosts-sat-p</artifactId> <name>jclouds ElasticHosts Peer1 San Antonio provider</name> <description>ElasticHosts implementation targeted to Peer1 San Antonio</description> - <packaging>bundle</packaging> <properties> <test.elastichosts-sat-p.endpoint>https://api-sat-p.elastichosts.com</test.elastichosts-sat-p.endpoint> @@ -38,14 +37,6 @@ <test.elastichosts-sat-p.identity>FIXME_IDENTITY</test.elastichosts-sat-p.identity> <test.elastichosts-sat-p.credential>FIXME_CREDENTIAL</test.elastichosts-sat-p.credential> <test.elastichosts-sat-p.template /> - - <jclouds.osgi.export>org.jclouds.elastichosts*;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> diff --git a/providers/elastichosts-sjc-c/pom.xml b/providers/elastichosts-sjc-c/pom.xml index 262acc6..64e1196 100644 --- a/providers/elastichosts-sjc-c/pom.xml +++ b/providers/elastichosts-sjc-c/pom.xml @@ -29,7 +29,6 @@ <artifactId>elastichosts-sjc-c</artifactId> <name>jclouds ElasticHosts San Jose provider</name> <description>ElasticHosts implementation targeted to San Jose</description> - <packaging>bundle</packaging> <properties> <test.elastichosts-sjc-c.endpoint>https://api-sjc-c.elastichosts.com</test.elastichosts-sjc-c.endpoint> @@ -38,14 +37,6 @@ <test.elastichosts-sjc-c.identity>FIXME_IDENTITY</test.elastichosts-sjc-c.identity> <test.elastichosts-sjc-c.credential>FIXME_CREDENTIAL</test.elastichosts-sjc-c.credential> <test.elastichosts-sjc-c.template /> - - <jclouds.osgi.export>org.jclouds.elastichosts*;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> diff --git a/providers/elastichosts-syd-v/pom.xml b/providers/elastichosts-syd-v/pom.xml index eb73641..bd31cac 100644 --- a/providers/elastichosts-syd-v/pom.xml +++ b/providers/elastichosts-syd-v/pom.xml @@ -29,7 +29,6 @@ <artifactId>elastichosts-syd-v</artifactId> <name>jclouds ElasticHosts Sydney provider</name> <description>ElasticHosts implementation targeted to Sydney</description> - <packaging>bundle</packaging> <properties> <test.elastichosts-syd-v.endpoint>https://api-syd-v.elastichosts.com</test.elastichosts-syd-v.endpoint> @@ -38,14 +37,6 @@ <test.elastichosts-syd-v.identity>FIXME_IDENTITY</test.elastichosts-syd-v.identity> <test.elastichosts-syd-v.credential>FIXME_CREDENTIAL</test.elastichosts-syd-v.credential> <test.elastichosts-syd-v.template /> - - <jclouds.osgi.export>org.jclouds.elastichosts*;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> diff --git a/providers/elastichosts-tor-p/pom.xml b/providers/elastichosts-tor-p/pom.xml index 8c898ed..3899142 100644 --- a/providers/elastichosts-tor-p/pom.xml +++ b/providers/elastichosts-tor-p/pom.xml @@ -29,7 +29,6 @@ <artifactId>elastichosts-tor-p</artifactId> <name>jclouds ElasticHosts Peer1 Toronto provider</name> <description>ElasticHosts implementation targeted to Peer1 Toronto</description> - <packaging>bundle</packaging> <properties> <test.elastichosts-tor-p.endpoint>https://api-tor-p.elastichosts.com</test.elastichosts-tor-p.endpoint> @@ -38,14 +37,6 @@ <test.elastichosts-tor-p.identity>FIXME_IDENTITY</test.elastichosts-tor-p.identity> <test.elastichosts-tor-p.credential>FIXME_CREDENTIAL</test.elastichosts-tor-p.credential> <test.elastichosts-tor-p.template /> - - <jclouds.osgi.export>org.jclouds.elastichosts*;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> diff --git a/providers/glesys/pom.xml b/providers/glesys/pom.xml index eea7952..df3af1f 100644 --- a/providers/glesys/pom.xml +++ b/providers/glesys/pom.xml @@ -29,7 +29,6 @@ <artifactId>glesys</artifactId> <name>jclouds GleSYS core</name> <description>jclouds components to access GleSYS</description> - <packaging>bundle</packaging> <properties> <test.glesys.endpoint>https://api.glesys.com</test.glesys.endpoint> @@ -38,8 +37,6 @@ <test.glesys.identity>FIXME_IDENTITY</test.glesys.identity> <test.glesys.credential>FIXME_CREDENTIAL</test.glesys.credential> <test.glesys.template>osFamily=UBUNTU,osVersionMatches=1[012].[01][04],os64Bit=true,minRam=768</test.glesys.template> - <jclouds.osgi.export>org.jclouds.glesys*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/go2cloud-jhb1/pom.xml b/providers/go2cloud-jhb1/pom.xml index 9126747..8a403dc 100644 --- a/providers/go2cloud-jhb1/pom.xml +++ b/providers/go2cloud-jhb1/pom.xml @@ -29,7 +29,6 @@ <artifactId>go2cloud-jhb1</artifactId> <name>jclouds Go2Cloud Johannesburg1 provider</name> <description>Go2Cloud implementation targeted to Johannesburg1</description> - <packaging>bundle</packaging> <properties> <test.go2cloud-jhb1.endpoint>http://api-jhb1.go2cloud.co.za</test.go2cloud-jhb1.endpoint> @@ -38,14 +37,6 @@ <test.go2cloud-jhb1.identity>FIXME_IDENTITY</test.go2cloud-jhb1.identity> <test.go2cloud-jhb1.credential>FIXME_CREDENTIAL</test.go2cloud-jhb1.credential> <test.go2cloud-jhb1.template /> - - <jclouds.osgi.export>org.jclouds.go2cloud*;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> diff --git a/providers/gogrid/pom.xml b/providers/gogrid/pom.xml index a3bbccf..e639a38 100644 --- a/providers/gogrid/pom.xml +++ b/providers/gogrid/pom.xml @@ -29,7 +29,6 @@ <artifactId>gogrid</artifactId> <name>jclouds GoGrid provider</name> <description>ComputeService implementation of GoGrid datacenters</description> - <packaging>bundle</packaging> <properties> <test.gogrid.endpoint>https://api.gogrid.com/api</test.gogrid.endpoint> @@ -38,14 +37,6 @@ <test.gogrid.identity>FIXME_IDENTITY</test.gogrid.identity> <test.gogrid.credential>FIXME_CREDENTIAL</test.gogrid.credential> <test.gogrid.template /> - - <jclouds.osgi.export>org.jclouds.gogrid*;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> <dependency> diff --git a/providers/google-cloud-storage/pom.xml b/providers/google-cloud-storage/pom.xml index 055a3a4..6be1ef8 100644 --- a/providers/google-cloud-storage/pom.xml +++ b/providers/google-cloud-storage/pom.xml @@ -31,7 +31,6 @@ <artifactId>google-cloud-storage</artifactId> <name>jclouds Google Cloud Storage provider</name> <description>jclouds components to access Google Cloud Storage</description> - <packaging>bundle</packaging> <properties> <test.google-cloud-storage.identity>client_email which usually looks like project...@developer.gserviceaccount.com</test.google-cloud-storage.identity> @@ -41,8 +40,6 @@ <test.jclouds.oauth.credential-type>p12PrivateKeyCredentials</test.jclouds.oauth.credential-type> <test.google-cloud-storage.api-version>v1</test.google-cloud-storage.api-version> <test.google-cloud-storage.build-version/> - <jclouds.osgi.export>org.jclouds.googlecloudstorage*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/google-compute-engine/pom.xml b/providers/google-compute-engine/pom.xml index 52fa28c..7780c31 100644 --- a/providers/google-compute-engine/pom.xml +++ b/providers/google-compute-engine/pom.xml @@ -31,7 +31,6 @@ <artifactId>google-compute-engine</artifactId> <name>jclouds Google Compute Engine provider</name> <description>jclouds components to access GoogleCompute</description> - <packaging>bundle</packaging> <properties> <test.google-compute-engine.identity>client_email which usually looks like project...@developer.gserviceaccount.com</test.google-compute-engine.identity> @@ -42,13 +41,6 @@ <test.google-compute-engine.api-version>v1</test.google-compute-engine.api-version> <test.google-compute-engine.build-version/> <test.google-compute-engine.template>imageNameMatches=debian-7-wheezy-v[0-9]*,locationId=us-central1-a,minRam=2048</test.google-compute-engine.template> - <jclouds.osgi.export>org.jclouds.googlecomputeengine*;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> diff --git a/providers/openhosting-east1/pom.xml b/providers/openhosting-east1/pom.xml index ac2e4e9..3e1dfd8 100644 --- a/providers/openhosting-east1/pom.xml +++ b/providers/openhosting-east1/pom.xml @@ -29,7 +29,6 @@ <artifactId>openhosting-east1</artifactId> <name>jclouds Open Hosting East1 provider</name> <description>Open Hosting implementation targeted to East1</description> - <packaging>bundle</packaging> <properties> <test.openhosting-east1.endpoint>https://api.east1.openhosting.com</test.openhosting-east1.endpoint> @@ -38,14 +37,6 @@ <test.openhosting-east1.identity>FIXME_IDENTITY</test.openhosting-east1.identity> <test.openhosting-east1.credential>FIXME_CREDENTIAL</test.openhosting-east1.credential> <test.openhosting-east1.template /> - - <jclouds.osgi.export>org.jclouds.openhosting*;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> diff --git a/providers/packet/pom.xml b/providers/packet/pom.xml index bfb25c2..c471bf2 100644 --- a/providers/packet/pom.xml +++ b/providers/packet/pom.xml @@ -30,14 +30,11 @@ <artifactId>packet</artifactId> <name>jclouds Packet compute API</name> <description>jclouds components to access an implementation of Packet's Compute Service</description> - <packaging>bundle</packaging> <properties> <test.packet.endpoint>https://api.packet.net/</test.packet.endpoint> <test.packet.identity>projectId</test.packet.identity> <test.packet.credential>api key</test.packet.credential> - <jclouds.osgi.export>org.jclouds.packet*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/profitbricks/pom.xml b/providers/profitbricks/pom.xml index 2fbc8e9..c01691b 100644 --- a/providers/profitbricks/pom.xml +++ b/providers/profitbricks/pom.xml @@ -30,19 +30,12 @@ <artifactId>profitbricks</artifactId> <name>jclouds ProfitBricks api</name> <description>jclouds components to access an implementation of ProfitBricks</description> - <packaging>bundle</packaging> <properties> <test.profitbricks.endpoint>https://api.profitbricks.com/1.3</test.profitbricks.endpoint> <test.profitbricks.identity>FIXME</test.profitbricks.identity> <test.profitbricks.credential>FIXME</test.profitbricks.credential> <test.profitbricks.api-version>1.3</test.profitbricks.api-version> - <jclouds.osgi.export>org.jclouds.profitbricks*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import> - org.jclouds.profitbricks*;version="${project.version}", - org.jclouds*;version="${project.version}", - * - </jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/rackspace-cloudblockstorage-uk/pom.xml b/providers/rackspace-cloudblockstorage-uk/pom.xml index 7a33b1a..eb1c09a 100644 --- a/providers/rackspace-cloudblockstorage-uk/pom.xml +++ b/providers/rackspace-cloudblockstorage-uk/pom.xml @@ -29,7 +29,6 @@ <artifactId>rackspace-cloudblockstorage-uk</artifactId> <name>jclouds Rackspace Next Generation Cloud Block Storage UK provider</name> <description>OpenStack Cinder implementation targeted to Rackspace Next Generation Cloud Block Storage UK</description> - <packaging>bundle</packaging> <properties> <test.rackspace-cloudblockstorage-uk.endpoint>https://lon.identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudblockstorage-uk.endpoint> @@ -38,8 +37,6 @@ <test.rackspace-cloudblockstorage-uk.identity>${test.rackspace-uk.identity}</test.rackspace-cloudblockstorage-uk.identity> <test.rackspace-cloudblockstorage-uk.credential>${test.rackspace-uk.credential}</test.rackspace-cloudblockstorage-uk.credential> <test.rackspace-cloudblockstorage-uk.template /> - <jclouds.osgi.export>org.jclouds.rackspace.cloudblockstorage.uk*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/rackspace-cloudblockstorage-us/pom.xml b/providers/rackspace-cloudblockstorage-us/pom.xml index c9d3ea7..4382181 100644 --- a/providers/rackspace-cloudblockstorage-us/pom.xml +++ b/providers/rackspace-cloudblockstorage-us/pom.xml @@ -29,7 +29,6 @@ <artifactId>rackspace-cloudblockstorage-us</artifactId> <name>jclouds Rackspace Next Generation Cloud Block Storage US provider</name> <description>OpenStack Cinder implementation targeted to Rackspace Next Generation Cloud Block Storage US</description> - <packaging>bundle</packaging> <properties> <test.rackspace-cloudblockstorage-us.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudblockstorage-us.endpoint> @@ -38,8 +37,6 @@ <test.rackspace-cloudblockstorage-us.identity>${test.rackspace-us.identity}</test.rackspace-cloudblockstorage-us.identity> <test.rackspace-cloudblockstorage-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudblockstorage-us.credential> <test.rackspace-cloudblockstorage-us.template /> - <jclouds.osgi.export>org.jclouds.rackspace.cloudblockstorage.us*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/rackspace-clouddatabases-uk/pom.xml b/providers/rackspace-clouddatabases-uk/pom.xml index 9bd69c5..b8eb3ad 100644 --- a/providers/rackspace-clouddatabases-uk/pom.xml +++ b/providers/rackspace-clouddatabases-uk/pom.xml @@ -29,7 +29,6 @@ <artifactId>rackspace-clouddatabases-uk</artifactId> <name>jclouds Rackspace Cloud Databases UK provider</name> <description>OpenStack Trove implementation targeted to Rackspace Cloud Databases UK</description> - <packaging>bundle</packaging> <properties> <test.rackspace-clouddatabases-uk.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-clouddatabases-uk.endpoint> @@ -38,8 +37,6 @@ <test.rackspace-clouddatabases-uk.identity>${test.rackspace-uk.identity}</test.rackspace-clouddatabases-uk.identity> <test.rackspace-clouddatabases-uk.credential>${test.rackspace-uk.credential}</test.rackspace-clouddatabases-uk.credential> <test.rackspace-clouddatabases-uk.template /> - <jclouds.osgi.export>org.jclouds.rackspace.clouddatabases.uk*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/rackspace-clouddatabases-us/pom.xml b/providers/rackspace-clouddatabases-us/pom.xml index a984c68..9fbdde3 100644 --- a/providers/rackspace-clouddatabases-us/pom.xml +++ b/providers/rackspace-clouddatabases-us/pom.xml @@ -29,7 +29,6 @@ <artifactId>rackspace-clouddatabases-us</artifactId> <name>jclouds Rackspace Cloud Databases US provider</name> <description>OpenStack Trove implementation targeted to Rackspace Cloud Databases US</description> - <packaging>bundle</packaging> <properties> <test.rackspace-clouddatabases-us.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-clouddatabases-us.endpoint> @@ -38,8 +37,6 @@ <test.rackspace-clouddatabases-us.identity>${test.rackspace-us.identity}</test.rackspace-clouddatabases-us.identity> <test.rackspace-clouddatabases-us.credential>${test.rackspace-us.credential}</test.rackspace-clouddatabases-us.credential> <test.rackspace-clouddatabases-us.template /> - <jclouds.osgi.export>org.jclouds.rackspace.clouddatabases.us*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/rackspace-clouddns-uk/pom.xml b/providers/rackspace-clouddns-uk/pom.xml index bf4627a..30eaf0e 100644 --- a/providers/rackspace-clouddns-uk/pom.xml +++ b/providers/rackspace-clouddns-uk/pom.xml @@ -29,7 +29,6 @@ <artifactId>rackspace-clouddns-uk</artifactId> <name>jclouds Rackspace Next Generation Cloud DNS UK provider</name> <description>Rackspace Next Generation Cloud DNS UK</description> - <packaging>bundle</packaging> <properties> <test.rackspace-clouddns-uk.endpoint>https://lon.identity.api.rackspacecloud.com/v2.0/</test.rackspace-clouddns-uk.endpoint> @@ -38,8 +37,6 @@ <test.rackspace-clouddns-uk.identity>${test.rackspace-uk.identity}</test.rackspace-clouddns-uk.identity> <test.rackspace-clouddns-uk.credential>${test.rackspace-uk.credential}</test.rackspace-clouddns-uk.credential> <test.rackspace-clouddns-uk.template /> - <jclouds.osgi.export>org.jclouds.rackspace.clouddns.us*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/rackspace-clouddns-us/pom.xml b/providers/rackspace-clouddns-us/pom.xml index 1e8aa61..6dbea08 100644 --- a/providers/rackspace-clouddns-us/pom.xml +++ b/providers/rackspace-clouddns-us/pom.xml @@ -29,7 +29,6 @@ <artifactId>rackspace-clouddns-us</artifactId> <name>jclouds Rackspace Next Generation Cloud DNS US provider</name> <description>Rackspace Next Generation Cloud DNS US</description> - <packaging>bundle</packaging> <properties> <test.rackspace-clouddns-us.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-clouddns-us.endpoint> @@ -38,8 +37,6 @@ <test.rackspace-clouddns-us.identity>${test.rackspace-us.identity}</test.rackspace-clouddns-us.identity> <test.rackspace-clouddns-us.credential>${test.rackspace-us.credential}</test.rackspace-clouddns-us.credential> <test.rackspace-clouddns-us.template /> - <jclouds.osgi.export>org.jclouds.rackspace.clouddns.us*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/rackspace-cloudfiles-uk/pom.xml b/providers/rackspace-cloudfiles-uk/pom.xml index 5f38c89..19f9a2c 100644 --- a/providers/rackspace-cloudfiles-uk/pom.xml +++ b/providers/rackspace-cloudfiles-uk/pom.xml @@ -31,7 +31,6 @@ <version>2.3.0-SNAPSHOT</version> <name>jclouds Rackspace Cloud Files UK provider</name> <description>OpenStack Object Storage implementation targeted to Rackspace Cloud Files UK</description> - <packaging>bundle</packaging> <properties> <!-- identity endpoint --> @@ -40,8 +39,6 @@ <test.rackspace-cloudfiles-uk.build-version /> <test.rackspace-cloudfiles-uk.identity>${test.rackspace-uk.identity}</test.rackspace-cloudfiles-uk.identity> <test.rackspace-cloudfiles-uk.credential>${test.rackspace-uk.credential}</test.rackspace-cloudfiles-uk.credential> - <jclouds.osgi.export>org.jclouds.rackspace.cloudfiles.uk*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/rackspace-cloudfiles-us/pom.xml b/providers/rackspace-cloudfiles-us/pom.xml index c0e10b2..e3e4187 100644 --- a/providers/rackspace-cloudfiles-us/pom.xml +++ b/providers/rackspace-cloudfiles-us/pom.xml @@ -31,7 +31,6 @@ <version>2.3.0-SNAPSHOT</version> <name>jclouds Rackspace Cloud Files US provider</name> <description>OpenStack Object Storage implementation targeted to Rackspace Cloud Files US</description> - <packaging>bundle</packaging> <properties> <!-- identity endpoint --> @@ -40,8 +39,6 @@ <test.rackspace-cloudfiles-us.build-version /> <test.rackspace-cloudfiles-us.identity>${test.rackspace-us.identity}</test.rackspace-cloudfiles-us.identity> <test.rackspace-cloudfiles-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudfiles-us.credential> - <jclouds.osgi.export>org.jclouds.rackspace.cloudfiles.us*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/rackspace-cloudloadbalancers-uk/pom.xml b/providers/rackspace-cloudloadbalancers-uk/pom.xml index ea2c345..b74a98e 100644 --- a/providers/rackspace-cloudloadbalancers-uk/pom.xml +++ b/providers/rackspace-cloudloadbalancers-uk/pom.xml @@ -29,17 +29,13 @@ <artifactId>rackspace-cloudloadbalancers-uk</artifactId> <name>jclouds Rackspace Cloud Load Balancers UK provider</name> <description>Cloud Load Balancers implementation targeted to Rackspace UK</description> - <packaging>bundle</packaging> - + <properties> <test.rackspace-cloudloadbalancers-uk.endpoint>https://lon.identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudloadbalancers-uk.endpoint> <test.rackspace-cloudloadbalancers-uk.api-version>1</test.rackspace-cloudloadbalancers-uk.api-version> <test.rackspace-cloudloadbalancers-uk.build-version /> <test.rackspace-cloudloadbalancers-uk.identity>${test.rackspace-uk.identity}</test.rackspace-cloudloadbalancers-uk.identity> <test.rackspace-cloudloadbalancers-uk.credential>${test.rackspace-uk.credential}</test.rackspace-cloudloadbalancers-uk.credential> - - <jclouds.osgi.export>org.jclouds.rackspace.cloudloadbalancers.uk*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/rackspace-cloudloadbalancers-us/pom.xml b/providers/rackspace-cloudloadbalancers-us/pom.xml index 8186053..5bfc285 100644 --- a/providers/rackspace-cloudloadbalancers-us/pom.xml +++ b/providers/rackspace-cloudloadbalancers-us/pom.xml @@ -29,17 +29,13 @@ <artifactId>rackspace-cloudloadbalancers-us</artifactId> <name>jclouds Rackspace Cloud Load Balancers US provider</name> <description>Cloud Load Balancers implementation targeted to Rackspace US</description> - <packaging>bundle</packaging> - + <properties> <test.rackspace-cloudloadbalancers-us.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudloadbalancers-us.endpoint> <test.rackspace-cloudloadbalancers-us.api-version>1</test.rackspace-cloudloadbalancers-us.api-version> <test.rackspace-cloudloadbalancers-us.build-version /> <test.rackspace-cloudloadbalancers-us.identity>${test.rackspace-us.identity}</test.rackspace-cloudloadbalancers-us.identity> <test.rackspace-cloudloadbalancers-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudloadbalancers-us.credential> - - <jclouds.osgi.export>org.jclouds.rackspace.cloudloadbalancers.us*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/rackspace-cloudnetworks-uk/pom.xml b/providers/rackspace-cloudnetworks-uk/pom.xml index 1b2c6fd..194d370 100644 --- a/providers/rackspace-cloudnetworks-uk/pom.xml +++ b/providers/rackspace-cloudnetworks-uk/pom.xml @@ -29,7 +29,6 @@ <artifactId>rackspace-cloudnetworks-uk</artifactId> <name>jclouds Rackspace Cloud Networks UK provider</name> <description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks UK</description> - <packaging>bundle</packaging> <properties> <!-- identity endpoint --> @@ -38,8 +37,6 @@ <test.rackspace-cloudnetworks-uk.build-version /> <test.rackspace-cloudnetworks-uk.identity>${test.rackspace-uk.identity}</test.rackspace-cloudnetworks-uk.identity> <test.rackspace-cloudnetworks-uk.credential>${test.rackspace-uk.credential}</test.rackspace-cloudnetworks-uk.credential> - <jclouds.osgi.export>org.jclouds.rackspace.cloudnetworks.uk*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/rackspace-cloudnetworks-us/pom.xml b/providers/rackspace-cloudnetworks-us/pom.xml index 741823e..b27b7f5 100644 --- a/providers/rackspace-cloudnetworks-us/pom.xml +++ b/providers/rackspace-cloudnetworks-us/pom.xml @@ -29,7 +29,6 @@ <artifactId>rackspace-cloudnetworks-us</artifactId> <name>jclouds Rackspace Cloud Networks US provider</name> <description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks US</description> - <packaging>bundle</packaging> <properties> <!-- identity endpoint --> @@ -38,8 +37,6 @@ <test.rackspace-cloudnetworks-us.build-version /> <test.rackspace-cloudnetworks-us.identity>${test.rackspace-us.identity}</test.rackspace-cloudnetworks-us.identity> <test.rackspace-cloudnetworks-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudnetworks-us.credential> - <jclouds.osgi.export>org.jclouds.rackspace.cloudnetworks.us*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/rackspace-cloudservers-uk/pom.xml b/providers/rackspace-cloudservers-uk/pom.xml index 7586e49..d7dbef4 100644 --- a/providers/rackspace-cloudservers-uk/pom.xml +++ b/providers/rackspace-cloudservers-uk/pom.xml @@ -29,7 +29,6 @@ <artifactId>rackspace-cloudservers-uk</artifactId> <name>jclouds Rackspace Next Generation Cloud Servers provider</name> <description>OpenStack Nova implementation targeted to Rackspace Next Generation Cloud Servers</description> - <packaging>bundle</packaging> <properties> <test.rackspace-cloudservers-uk.endpoint>https://lon.identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudservers-uk.endpoint> @@ -38,8 +37,6 @@ <test.rackspace-cloudservers-uk.identity>${test.rackspace-uk.identity}</test.rackspace-cloudservers-uk.identity> <test.rackspace-cloudservers-uk.credential>${test.rackspace-uk.credential}</test.rackspace-cloudservers-uk.credential> <test.rackspace-cloudservers-uk.template /> - <jclouds.osgi.export>org.jclouds.rackspace.cloudservers.us*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/rackspace-cloudservers-us/pom.xml b/providers/rackspace-cloudservers-us/pom.xml index 550191d..72f6196 100644 --- a/providers/rackspace-cloudservers-us/pom.xml +++ b/providers/rackspace-cloudservers-us/pom.xml @@ -29,7 +29,6 @@ <artifactId>rackspace-cloudservers-us</artifactId> <name>jclouds Rackspace Next Generation Cloud Servers US provider</name> <description>OpenStack Nova implementation targeted to Rackspace Next Generation Cloud Servers US</description> - <packaging>bundle</packaging> <properties> <test.rackspace-cloudservers-us.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudservers-us.endpoint> @@ -38,8 +37,6 @@ <test.rackspace-cloudservers-us.identity>${test.rackspace-us.identity}</test.rackspace-cloudservers-us.identity> <test.rackspace-cloudservers-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudservers-us.credential> <test.rackspace-cloudservers-us.template /> - <jclouds.osgi.export>org.jclouds.rackspace.cloudservers.us*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/providers/serverlove-z1-man/pom.xml b/providers/serverlove-z1-man/pom.xml index dc8dd98..c4e22ce 100644 --- a/providers/serverlove-z1-man/pom.xml +++ b/providers/serverlove-z1-man/pom.xml @@ -29,7 +29,6 @@ <artifactId>serverlove-z1-man</artifactId> <name>jclouds Serverlove Manchester provider</name> <description>Serverlove implementation targeted to Manchester</description> - <packaging>bundle</packaging> <properties> <test.serverlove-z1-man.endpoint>https://api.z1-man.serverlove.com</test.serverlove-z1-man.endpoint> @@ -38,13 +37,6 @@ <test.serverlove-z1-man.identity>FIXME_IDENTITY</test.serverlove-z1-man.identity> <test.serverlove-z1-man.credential>FIXME_CREDENTIAL</test.serverlove-z1-man.credential> <test.serverlove-z1-man.template /> - <jclouds.osgi.export>org.jclouds.serverlove*;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> diff --git a/providers/skalicloud-sdg-my/pom.xml b/providers/skalicloud-sdg-my/pom.xml index 700828a..3b037e6 100644 --- a/providers/skalicloud-sdg-my/pom.xml +++ b/providers/skalicloud-sdg-my/pom.xml @@ -29,7 +29,6 @@ <artifactId>skalicloud-sdg-my</artifactId> <name>jclouds SkaliCloud Malaysia provider</name> <description>SkaliCloud implementation targeted to Malaysia</description> - <packaging>bundle</packaging> <properties> <test.skalicloud-sdg-my.endpoint>https://api.sdg-my.skalicloud.com</test.skalicloud-sdg-my.endpoint> @@ -38,14 +37,6 @@ <test.skalicloud-sdg-my.identity>FIXME_IDENTITY</test.skalicloud-sdg-my.identity> <test.skalicloud-sdg-my.credential>FIXME_CREDENTIAL</test.skalicloud-sdg-my.credential> <test.skalicloud-sdg-my.template /> - - <jclouds.osgi.export>org.jclouds.skalicloud*;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> diff --git a/providers/softlayer/pom.xml b/providers/softlayer/pom.xml index 36af488..8f53617 100644 --- a/providers/softlayer/pom.xml +++ b/providers/softlayer/pom.xml @@ -29,7 +29,6 @@ <artifactId>softlayer</artifactId> <name>jclouds SoftLayer core</name> <description>jclouds components to access SoftLayer</description> - <packaging>bundle</packaging> <properties> <test.softlayer.endpoint>https://api.softlayer.com/rest</test.softlayer.endpoint> @@ -38,13 +37,6 @@ <test.softlayer.identity>FIXME_IDENTITY</test.softlayer.identity> <test.softlayer.credential>FIXME_CREDENTIAL</test.softlayer.credential> <test.softlayer.template /> - <jclouds.osgi.export>org.jclouds.softlayer*;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> <dependency> diff --git a/providers/ultradns-ws/pom.xml b/providers/ultradns-ws/pom.xml index b0b758d..9769c32 100644 --- a/providers/ultradns-ws/pom.xml +++ b/providers/ultradns-ws/pom.xml @@ -29,7 +29,6 @@ <artifactId>ultradns-ws</artifactId> <name>jclouds ultradns-ws provider</name> <description>jclouds components to access UltraDNS Web Services API</description> - <packaging>bundle</packaging> <properties> <test.ultradns-ws.endpoint>https://ultra-api.ultradns.com:8443/UltraDNS_WS/v01</test.ultradns-ws.endpoint> @@ -37,9 +36,6 @@ <test.ultradns-ws.build-version /> <test.ultradns-ws.identity /> <test.ultradns-ws.credential /> - - <jclouds.osgi.export>org.jclouds.ultradns.ws*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> diff --git a/skeletons/standalone-compute/pom.xml b/skeletons/standalone-compute/pom.xml index 64c8d0a..2e2ebe9 100644 --- a/skeletons/standalone-compute/pom.xml +++ b/skeletons/standalone-compute/pom.xml @@ -28,7 +28,6 @@ <groupId>org.apache.jclouds.api</groupId> <artifactId>servermanager</artifactId> <name>jclouds example components for a standalone compute provider</name> - <packaging>bundle</packaging> <properties> <!-- when instances are hung, open a ticket and add here --> @@ -38,9 +37,6 @@ <test.servermanager.endpoint>https://servermanager.com</test.servermanager.endpoint> <test.servermanager.api-version>1.0</test.servermanager.api-version> <test.servermanager.build-version /> - - <jclouds.osgi.export>org.jclouds.servermanager*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> <dependency>