From b078adc3ce5eef1735e7e12d13016eb6fe5c6b27 Mon Sep 17 00:00:00 2001 From: Ioannis Canellos Date: Sun, 3 Jun 2012 18:26:31 +0300 Subject: [PATCH] Removed fragments and dynamic imports. Added centralized control of the maven-bundle-plugin. --- apis/atmos/pom.xml | 19 ++--------- apis/byon/pom.xml | 28 ++++------------ apis/cloudfiles/pom.xml | 26 ++++----------- apis/cloudloadbalancers/pom.xml | 20 +++--------- apis/cloudservers/pom.xml | 28 ++++------------ apis/cloudsigma/pom.xml | 29 +++++------------ apis/cloudstack/pom.xml | 28 +++++----------- apis/cloudwatch/pom.xml | 19 ++--------- apis/deltacloud/pom.xml | 29 +++++------------ apis/ec2/pom.xml | 29 +++++------------ apis/elasticstack/pom.xml | 28 +++++----------- apis/eucalyptus/pom.xml | 29 +++++------------ apis/filesystem/pom.xml | 16 +++------- apis/nova/pom.xml | 28 +++++----------- apis/openstack-nova-ec2/pom.xml | 29 +++++------------ apis/openstack-nova/pom.xml | 28 +++++----------- apis/s3/pom.xml | 19 ++--------- apis/swift/pom.xml | 19 ++--------- apis/vcloud/pom.xml | 28 +++++----------- apis/walrus/pom.xml | 19 ++--------- archetypes/pom.xml | 1 + blobstore/pom.xml | 20 +++++------- common/aws/pom.xml | 21 +++--------- common/azure/pom.xml | 21 +++--------- common/openstack/pom.xml | 21 +++--------- common/trmk/pom.xml | 21 ++++-------- compute/pom.xml | 31 +++++++++--------- core/pom.xml | 16 +++------- drivers/apachehc/pom.xml | 21 +++--------- drivers/bouncycastle/pom.xml | 19 +++-------- drivers/enterprise/pom.xml | 20 +++--------- drivers/gae/pom.xml | 16 +++------- drivers/joda/pom.xml | 20 +++--------- drivers/jsch/pom.xml | 18 ++--------- drivers/log4j/pom.xml | 20 +++--------- drivers/netty/pom.xml | 20 +++--------- drivers/slf4j/pom.xml | 21 +++--------- drivers/sshj/pom.xml | 18 ++--------- labs/aws-elb/pom.xml | 19 ++--------- labs/carrenza-vcloud-director/pom.xml | 29 +++++------------ labs/cdmi/pom.xml | 29 +++++------------ labs/dmtf/pom.xml | 25 ++++----------- labs/elb/pom.xml | 20 ++---------- labs/glesys/pom.xml | 18 ++--------- labs/jenkins/pom.xml | 27 ++++------------ labs/joyent-sdc/pom.xml | 26 ++++----------- labs/nodepool/pom.xml | 18 ++--------- labs/openstack-glance/pom.xml | 27 ++++------------ labs/openstack-keystone/pom.xml | 27 ++++------------ labs/openstack-quantum/pom.xml | 26 ++++----------- labs/openstack-swift/pom.xml | 28 +++++----------- labs/opsource-servers/pom.xml | 28 ++++------------ labs/savvis-symphonyvpdc/pom.xml | 28 ++++------------ labs/vcloud-director/pom.xml | 29 +++++------------ labs/virtualbox/pom.xml | 19 ++--------- loadbalancer/pom.xml | 23 ++++--------- project/pom.xml | 17 +++++++++- providers/aws-cloudwatch/pom.xml | 19 ++--------- providers/aws-ec2/pom.xml | 32 ++++++------------- providers/aws-s3/pom.xml | 27 ++++------------ providers/azureblob/pom.xml | 19 ++--------- providers/bluelock-vcloud-zone01/pom.xml | 28 +++++----------- providers/cloudfiles-uk/pom.xml | 19 ++--------- providers/cloudfiles-us/pom.xml | 19 ++--------- providers/cloudloadbalancers-uk/pom.xml | 18 ++--------- providers/cloudloadbalancers-us/pom.xml | 18 ++--------- providers/cloudonestorage/pom.xml | 19 ++--------- providers/cloudservers-uk/pom.xml | 28 +++++----------- providers/cloudservers-us/pom.xml | 29 +++++------------ providers/cloudsigma-lvs/pom.xml | 28 ++++------------ providers/cloudsigma-zrh/pom.xml | 28 +++++----------- providers/elastichosts-lax-p/pom.xml | 29 +++++------------ providers/elastichosts-lon-b/pom.xml | 28 +++++----------- providers/elastichosts-lon-p/pom.xml | 28 +++++----------- providers/elastichosts-sat-p/pom.xml | 29 +++++------------ providers/elastichosts-tor-p/pom.xml | 29 +++++------------ providers/eucalyptus-partnercloud-ec2/pom.xml | 29 +++++------------ providers/eucalyptus-partnercloud-s3/pom.xml | 25 ++++----------- providers/go2cloud-jhb1/pom.xml | 29 +++++------------ providers/gogrid/pom.xml | 28 +++++----------- .../greenhousedata-element-vcloud/pom.xml | 29 +++++------------ providers/hpcloud-compute/pom.xml | 29 +++++------------ providers/hpcloud-objectstorage/pom.xml | 21 +++--------- providers/ninefold-compute/pom.xml | 28 +++++----------- providers/ninefold-storage/pom.xml | 19 ++--------- providers/openhosting-east1/pom.xml | 29 +++++------------ providers/rimuhosting/pom.xml | 28 +++++----------- providers/serverlove-z1-man/pom.xml | 28 ++++------------ providers/skalicloud-sdg-my/pom.xml | 28 +++++----------- providers/slicehost/pom.xml | 28 +++++----------- providers/softlayer/pom.xml | 28 +++++----------- providers/stratogen-vcloud-mycloud/pom.xml | 29 +++++------------ providers/synaptic-storage/pom.xml | 19 ++--------- providers/trmk-ecloud/pom.xml | 29 +++++------------ providers/trmk-vcloudexpress/pom.xml | 29 +++++------------ providers/trystack-nova/pom.xml | 28 +++++----------- sandbox-apis/libvirt/pom.xml | 19 ++--------- sandbox-apis/nirvanix/pom.xml | 19 ++--------- sandbox-apis/pcs/pom.xml | 19 ++--------- sandbox-apis/scality-rs2/pom.xml | 19 ++--------- sandbox-apis/simpledb/pom.xml | 19 ++--------- sandbox-apis/sqs/pom.xml | 19 ++--------- sandbox-drivers/asynchttpclient/pom.xml | 20 +++--------- sandbox-providers/aws-simpledb/pom.xml | 19 ++--------- sandbox-providers/azurequeue/pom.xml | 19 ++--------- sandbox-providers/boxdotnet/pom.xml | 18 ++--------- sandbox-providers/dunkel-vcd/pom.xml | 19 ++--------- sandbox-providers/googlestorage/pom.xml | 19 ++--------- sandbox-providers/hosteurope-storage/pom.xml | 19 ++--------- sandbox-providers/ibm-smartcloud/pom.xml | 18 ++--------- sandbox-providers/scaleup-storage/pom.xml | 20 ++---------- sandbox-providers/tiscali-storage/pom.xml | 19 ++--------- sandbox-providers/twitter/pom.xml | 19 ++--------- .../virtacore-publiccloud-lax/pom.xml | 19 ++--------- scriptbuilder/pom.xml | 20 +++--------- skeletons/standalone-compute/pom.xml | 18 ++--------- 116 files changed, 664 insertions(+), 2036 deletions(-) diff --git a/apis/atmos/pom.xml b/apis/atmos/pom.xml index eac3f8804e..3ba1605c0f 100644 --- a/apis/atmos/pom.xml +++ b/apis/atmos/pom.xml @@ -39,6 +39,9 @@ FIXME FIXME + + * + org.jclouds.atmos*;version="${project.version}";-noimport:=true @@ -108,21 +111,5 @@ - - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.atmos*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/apis/byon/pom.xml b/apis/byon/pom.xml index 44d0fc548f..3477244f66 100644 --- a/apis/byon/pom.xml +++ b/apis/byon/pom.xml @@ -36,6 +36,13 @@ file://c:/test.txt + org.jclouds.byon*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -105,25 +112,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.byon*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/apis/cloudfiles/pom.xml b/apis/cloudfiles/pom.xml index 13bb997d70..708148679c 100644 --- a/apis/cloudfiles/pom.xml +++ b/apis/cloudfiles/pom.xml @@ -39,6 +39,12 @@ ${test.rackspace.identity} ${test.rackspace.credential} + org.jclouds.cloudfiles*;version="${project.version}" + + org.jclouds*;version="${project.version}", + org.jclouds.openstack.swift.options;version="${project.version}", + * + @@ -123,25 +129,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.cloudfiles*;version="${project.version}" - - org.jclouds*;version="${project.version}", - org.jclouds.openstack.swift.options;version="${project.version}", - * - - - - - - - diff --git a/apis/cloudloadbalancers/pom.xml b/apis/cloudloadbalancers/pom.xml index c2a1e088e7..48fcd6eda1 100644 --- a/apis/cloudloadbalancers/pom.xml +++ b/apis/cloudloadbalancers/pom.xml @@ -39,7 +39,10 @@ ${test.rackspace.identity} ${test.rackspace.credential} - + + org.jclouds.cloudloadbalancers*;version="${project.version}" + org.jclouds*;version="${project.version}",* + org.jclouds @@ -111,19 +114,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.cloudloadbalancers*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/apis/cloudservers/pom.xml b/apis/cloudservers/pom.xml index d3ecc8fd3e..6587497784 100644 --- a/apis/cloudservers/pom.xml +++ b/apis/cloudservers/pom.xml @@ -43,6 +43,13 @@ + org.jclouds.cloudservers*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -126,26 +133,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.cloudservers*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/apis/cloudsigma/pom.xml b/apis/cloudsigma/pom.xml index abb3643b4a..5b49b23147 100644 --- a/apis/cloudsigma/pom.xml +++ b/apis/cloudsigma/pom.xml @@ -42,6 +42,14 @@ f3c7c665-cd54-4a78-8fd2-7ec2f028cf29 + + org.jclouds.cloudsigma*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -112,25 +120,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.cloudsigma*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/apis/cloudstack/pom.xml b/apis/cloudstack/pom.xml index 5bab0db9ee..bef1c61535 100644 --- a/apis/cloudstack/pom.xml +++ b/apis/cloudstack/pom.xml @@ -60,6 +60,14 @@ + + org.jclouds.cloudstack*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -146,24 +154,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.cloudstack*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/apis/cloudwatch/pom.xml b/apis/cloudwatch/pom.xml index db881fddc7..7628283e0a 100644 --- a/apis/cloudwatch/pom.xml +++ b/apis/cloudwatch/pom.xml @@ -39,6 +39,9 @@ ${test.aws.identity} ${test.aws.credential} + + org.jclouds.cloudwatch*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -101,21 +104,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.cloudwatch*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/apis/deltacloud/pom.xml b/apis/deltacloud/pom.xml index 8f8e467f42..ff88685938 100644 --- a/apis/deltacloud/pom.xml +++ b/apis/deltacloud/pom.xml @@ -56,6 +56,14 @@ + + org.jclouds.deltacloud*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -125,25 +133,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.deltacloud*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml index 08d90c6424..6d8204062b 100644 --- a/apis/ec2/pom.xml +++ b/apis/ec2/pom.xml @@ -42,6 +42,14 @@ + + org.jclouds.ec2*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -126,26 +134,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.ec2*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/apis/elasticstack/pom.xml b/apis/elasticstack/pom.xml index dd17c4e8d2..f550178f42 100644 --- a/apis/elasticstack/pom.xml +++ b/apis/elasticstack/pom.xml @@ -56,6 +56,14 @@ 38df0986-4d85-4b76-b502-3878ffc80161 + + org.jclouds.elasticstack*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -125,24 +133,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.elasticstack*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/apis/eucalyptus/pom.xml b/apis/eucalyptus/pom.xml index af22df3166..f1c72e0e0e 100644 --- a/apis/eucalyptus/pom.xml +++ b/apis/eucalyptus/pom.xml @@ -42,6 +42,14 @@ + + org.jclouds.eucalyptus*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -120,26 +128,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.eucalyptus*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/apis/filesystem/pom.xml b/apis/filesystem/pom.xml index ff342df44d..6e130e1857 100644 --- a/apis/filesystem/pom.xml +++ b/apis/filesystem/pom.xml @@ -33,6 +33,11 @@ jclouds components to access filesystem bundle + + org.jclouds.filesystem*;version="${project.version}" + org.jclouds*;version="${project.version}",* + + org.jclouds @@ -96,17 +101,6 @@ - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.filesystem*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - diff --git a/apis/nova/pom.xml b/apis/nova/pom.xml index b308f8cef2..a097a1c10d 100644 --- a/apis/nova/pom.xml +++ b/apis/nova/pom.xml @@ -44,6 +44,14 @@ + + org.jclouds.openstack.nova*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -129,25 +137,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.openstack.nova*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/apis/openstack-nova-ec2/pom.xml b/apis/openstack-nova-ec2/pom.xml index e8ef79dbf7..8af5b62e4c 100644 --- a/apis/openstack-nova-ec2/pom.xml +++ b/apis/openstack-nova-ec2/pom.xml @@ -42,6 +42,14 @@ + + org.jclouds.openstack.nova.ec2*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -125,26 +133,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.openstack.nova.ec2*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/apis/openstack-nova/pom.xml b/apis/openstack-nova/pom.xml index 8e144f766b..478c13c04d 100644 --- a/apis/openstack-nova/pom.xml +++ b/apis/openstack-nova/pom.xml @@ -46,6 +46,14 @@ false passwordCredentials + + org.jclouds.openstack.nova.v1_1*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -137,25 +145,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.openstack.nova.v1_1*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml index ba491d8531..3759c5eab4 100644 --- a/apis/s3/pom.xml +++ b/apis/s3/pom.xml @@ -39,6 +39,9 @@ ${test.aws.identity} ${test.aws.credential} + + org.jclouds.s3*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -121,21 +124,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.s3*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/apis/swift/pom.xml b/apis/swift/pom.xml index cab2eb7425..2076c90024 100644 --- a/apis/swift/pom.xml +++ b/apis/swift/pom.xml @@ -39,6 +39,9 @@ test:tester testing + + org.jclouds.openstack.swift*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -121,21 +124,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.openstack.swift*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/apis/vcloud/pom.xml b/apis/vcloud/pom.xml index 1c8c524ab2..ddfce7d368 100644 --- a/apis/vcloud/pom.xml +++ b/apis/vcloud/pom.xml @@ -42,6 +42,14 @@ + + org.jclouds.vcloud*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -123,25 +131,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.vcloud*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/apis/walrus/pom.xml b/apis/walrus/pom.xml index 553d6bc2ce..42b7201f27 100644 --- a/apis/walrus/pom.xml +++ b/apis/walrus/pom.xml @@ -39,6 +39,9 @@ ${test.eucalyptus.identity} ${test.eucalyptus.credential} + + org.jclouds.walrus*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -117,21 +120,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.walrus*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 206000d04f..ca597868ee 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -30,6 +30,7 @@ jclouds-archetypes pom jclouds Maven archetypes + rest-client-archetype compute-service-archetype diff --git a/blobstore/pom.xml b/blobstore/pom.xml index 892e18495a..c453614eab 100644 --- a/blobstore/pom.xml +++ b/blobstore/pom.xml @@ -38,6 +38,14 @@ http://jclouds.googlecode.com/svn/trunk/blobstore + + + org.jclouds;version="${project.version}", + * + + org.jclouds.blobstore*;version="${project.version}";-noimport:=true + + ${project.groupId} @@ -86,18 +94,6 @@ - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.blobstore*;version="${project.version}" - org.jclouds*;version="${project.version}",* - jclouds-core;bundle-version="[1.3,2)" - - - diff --git a/common/aws/pom.xml b/common/aws/pom.xml index 91d129daa1..a17ed98e81 100644 --- a/common/aws/pom.xml +++ b/common/aws/pom.xml @@ -33,6 +33,11 @@ jclouds Core components to access Amazon AWS bundle + + org.jclouds.aws*;version="${project.version}" + org.jclouds*;version="${project.version}",* + + org.jclouds @@ -48,20 +53,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.aws*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/common/azure/pom.xml b/common/azure/pom.xml index 8965dd4dff..de82407402 100644 --- a/common/azure/pom.xml +++ b/common/azure/pom.xml @@ -33,6 +33,11 @@ jclouds Core components to access Azure bundle + + org.jclouds.azure*;version="${project.version}" + org.jclouds*;version="${project.version}",* + + org.jclouds @@ -48,20 +53,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.azure*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/common/openstack/pom.xml b/common/openstack/pom.xml index dafa36d51e..1a0859f32d 100644 --- a/common/openstack/pom.xml +++ b/common/openstack/pom.xml @@ -34,6 +34,11 @@ jclouds Core components to access OpenStack apis bundle + + org.jclouds.openstack*;version="${project.version}" + org.jclouds*;version="${project.version}",* + + org.jclouds @@ -49,20 +54,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.openstack*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/common/trmk/pom.xml b/common/trmk/pom.xml index f4c3d1e712..cd96a8d4a5 100644 --- a/common/trmk/pom.xml +++ b/common/trmk/pom.xml @@ -34,6 +34,12 @@ common Terremark components bundle + + org.jclouds.trmk.vcloud_0_8*;version="${project.version}" + org.jclouds*;version="${project.version}",* + + + org.jclouds @@ -73,20 +79,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.trmk.vcloud_0_8*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/compute/pom.xml b/compute/pom.xml index 63facba357..93f43c59d4 100644 --- a/compute/pom.xml +++ b/compute/pom.xml @@ -33,6 +33,21 @@ jclouds components to access compute providers bundle + + + org.jclouds;version=${project.version}, + org.jclouds*;version=${project.version}, + * + + + org.jclouds.cim*;version=${project.version};-noimport:=true, + org.jclouds.compute*;version=${project.version};-noimport:=true, + org.jclouds.net*;version=${project.version};-noimport:=true, + org.jclouds.ovf*;version=${project.version};-noimport:=true, + org.jclouds.ssh*;version=${project.version};-noimport:=true + + + ${project.groupId} @@ -53,20 +68,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.net*;version="${project.version}",org.jclouds.compute*;version="${project.version}",org.jclouds.cim*;version="${project.version}",org.jclouds.ovf*;version="${project.version}",org.jclouds.ssh*;version="${project.version}" - !org.jclouds.compute.*;org.jclouds*;version="${project.version}",* - jclouds-core;bundle-version="[1.3,2)" - - - - - diff --git a/core/pom.xml b/core/pom.xml index 368cdddae3..5c7aadd022 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -38,6 +38,11 @@ http://jclouds.googlecode.com/svn/trunk + + * + org.jclouds*;version=${project.version};-noimport:=true + + net.oauth.core @@ -126,17 +131,6 @@ - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds*;version=${project.version} - org.jclouds.* - - - diff --git a/drivers/apachehc/pom.xml b/drivers/apachehc/pom.xml index e04cd53b46..9806b486cb 100644 --- a/drivers/apachehc/pom.xml +++ b/drivers/apachehc/pom.xml @@ -33,6 +33,11 @@ bundle Apache HttpComponents client + + org.jclouds.http.apachehc*;version="${project.version}" + org.jclouds*;version="${project.version}",* + + @@ -70,20 +75,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.http.apachehc*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/drivers/bouncycastle/pom.xml b/drivers/bouncycastle/pom.xml index b679b0dc5e..e2abd25e5b 100644 --- a/drivers/bouncycastle/pom.xml +++ b/drivers/bouncycastle/pom.xml @@ -33,6 +33,10 @@ jclouds bouncycastle EncryptionService Module bundle + + org.jclouds.encryption.bouncycastle*;version="${project.version}" + org.jclouds*;version="${project.version}",* + @@ -65,20 +69,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.encryption.bouncycastle*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/drivers/enterprise/pom.xml b/drivers/enterprise/pom.xml index c878f04021..9915f43dba 100644 --- a/drivers/enterprise/pom.xml +++ b/drivers/enterprise/pom.xml @@ -33,6 +33,11 @@ jclouds enterprise configuration bundle + + org.jclouds.enterprise*;version="${project.version}" + org.jclouds*;version="${project.version}",* + + @@ -79,19 +84,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.enterprise*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/drivers/gae/pom.xml b/drivers/gae/pom.xml index 1722205f6c..7d3eabc0b4 100644 --- a/drivers/gae/pom.xml +++ b/drivers/gae/pom.xml @@ -33,6 +33,11 @@ Google App Engine Components bundle + + org.jclouds.gae*;version="${project.version}" + org.jclouds*;version="${project.version}",* + + @@ -97,17 +102,6 @@ classes - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.gae*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - diff --git a/drivers/joda/pom.xml b/drivers/joda/pom.xml index 09fcdd4c45..68e5fe517e 100644 --- a/drivers/joda/pom.xml +++ b/drivers/joda/pom.xml @@ -33,6 +33,10 @@ jclouds joda DateService Module bundle + + org.jclouds.date.joda*;version="${project.version}" + org.jclouds*;version="${project.version}",* + @@ -65,21 +69,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.date.joda*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/drivers/jsch/pom.xml b/drivers/jsch/pom.xml index fb4803c5e6..d584683918 100644 --- a/drivers/jsch/pom.xml +++ b/drivers/jsch/pom.xml @@ -50,6 +50,9 @@ + + org.jclouds.ssh.jsch*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -93,21 +96,6 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.ssh.jsch*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - live diff --git a/drivers/log4j/pom.xml b/drivers/log4j/pom.xml index d873e9ea06..748c5047c3 100644 --- a/drivers/log4j/pom.xml +++ b/drivers/log4j/pom.xml @@ -33,6 +33,11 @@ jclouds Log4J Logging Module bundle + + org.jclouds.logging.log4j*;version="${project.version}" + org.jclouds*;version="${project.version}",* + + @@ -65,20 +70,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.logging.log4j*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/drivers/netty/pom.xml b/drivers/netty/pom.xml index 389db65f34..f79f463196 100644 --- a/drivers/netty/pom.xml +++ b/drivers/netty/pom.xml @@ -33,6 +33,11 @@ jclouds netty payload module bundle + + org.jclouds.netty*;version="${project.version}" + org.jclouds*;version="${project.version}",* + + org.jclouds @@ -54,20 +59,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.netty*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/drivers/slf4j/pom.xml b/drivers/slf4j/pom.xml index 246b846cb5..905683c817 100644 --- a/drivers/slf4j/pom.xml +++ b/drivers/slf4j/pom.xml @@ -33,6 +33,11 @@ jclouds SLF4J Logging Module bundle + + org.jclouds.logging.slf4j*;version="${project.version}" + org.jclouds*;version="${project.version}",* + + @@ -65,20 +70,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.logging.slf4j*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/drivers/sshj/pom.xml b/drivers/sshj/pom.xml index d8fbcb8cf4..e76230570f 100644 --- a/drivers/sshj/pom.xml +++ b/drivers/sshj/pom.xml @@ -50,6 +50,9 @@ + + org.jclouds.sshj*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -98,21 +101,6 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.sshj*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - live diff --git a/labs/aws-elb/pom.xml b/labs/aws-elb/pom.xml index c4a43951db..d8ff4fffe4 100644 --- a/labs/aws-elb/pom.xml +++ b/labs/aws-elb/pom.xml @@ -46,6 +46,9 @@ ${test.aws.identity} ${test.aws.credential} + + org.jclouds.aws.elb*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -142,20 +145,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.aws.elb*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/labs/carrenza-vcloud-director/pom.xml b/labs/carrenza-vcloud-director/pom.xml index b2064d1d26..f0a329b573 100644 --- a/labs/carrenza-vcloud-director/pom.xml +++ b/labs/carrenza-vcloud-director/pom.xml @@ -48,6 +48,14 @@ + + org.jclouds.carrenza.vcloud.director*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -132,26 +140,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.carrenza.vcloud.director*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/labs/cdmi/pom.xml b/labs/cdmi/pom.xml index 5a2a5293e3..72a2961ef2 100644 --- a/labs/cdmi/pom.xml +++ b/labs/cdmi/pom.xml @@ -41,6 +41,14 @@ FIXME_CREDENTIALS FIXME_HTTPURL FIXME_HTTPMD5 + + org.jclouds.snia.cdmi.v1*;version="${project.version}" + + org.jclouds.blobstore.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -111,25 +119,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.snia.cdmi.v1*;version="${project.version}" - - org.jclouds.blobstore.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/labs/dmtf/pom.xml b/labs/dmtf/pom.xml index cde6657685..996c936a41 100644 --- a/labs/dmtf/pom.xml +++ b/labs/dmtf/pom.xml @@ -34,6 +34,11 @@ bundle + org.jclouds.dmtf.*;version="${project.version}" + + org.jclouds*;version="${project.version}", + * + @@ -43,23 +48,5 @@ ${project.version} - - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.dmtf.*;version="${project.version}" - - org.jclouds*;version="${project.version}", - * - - - - - - + diff --git a/labs/elb/pom.xml b/labs/elb/pom.xml index e1cd5f7fbe..b8b7420e09 100644 --- a/labs/elb/pom.xml +++ b/labs/elb/pom.xml @@ -47,6 +47,9 @@ ${test.aws.identity} ${test.aws.credential} + + org.jclouds.elb*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -142,22 +145,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.elb*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - - diff --git a/labs/glesys/pom.xml b/labs/glesys/pom.xml index cbf2ab5180..d95f776971 100644 --- a/labs/glesys/pom.xml +++ b/labs/glesys/pom.xml @@ -42,6 +42,9 @@ + + org.jclouds.glesys*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -112,19 +115,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.glesys*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/labs/jenkins/pom.xml b/labs/jenkins/pom.xml index 8c06216b8a..4e0cd8ba94 100644 --- a/labs/jenkins/pom.xml +++ b/labs/jenkins/pom.xml @@ -39,6 +39,13 @@ 1.460 ANONYMOUS ANONYMOUS + + org.jclouds.jenkins.v1*;version="${project.version}" + + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -100,24 +107,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.jenkins.v1*;version="${project.version}" - - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/labs/joyent-sdc/pom.xml b/labs/joyent-sdc/pom.xml index 58f0315af9..b7a0a548b3 100644 --- a/labs/joyent-sdc/pom.xml +++ b/labs/joyent-sdc/pom.xml @@ -39,6 +39,12 @@ FIXME_IDENTITY FIXME_CREDENTIALS + org.jclouds.joyent.sdc.v6_5*;version="${project.version}" + + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -100,24 +106,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.joyent.sdc.v6_5*;version="${project.version}" - - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/labs/nodepool/pom.xml b/labs/nodepool/pom.xml index 403658b301..1cccd6e2aa 100644 --- a/labs/nodepool/pom.xml +++ b/labs/nodepool/pom.xml @@ -17,6 +17,9 @@ 0.1.46 ${test.aws.identity} ${test.aws.credential} + + org.jclouds.nodepool*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -74,20 +77,5 @@ test - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.nodepool*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/labs/openstack-glance/pom.xml b/labs/openstack-glance/pom.xml index 2d3beff43c..40633f5182 100644 --- a/labs/openstack-glance/pom.xml +++ b/labs/openstack-glance/pom.xml @@ -42,6 +42,13 @@ FIXME_IDENTITY FIXME_CREDENTIALS passwordCredentials + + org.jclouds.openstack.glance.v1_0*;version="${project.version}" + + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -116,24 +123,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.openstack.glance.v1_0*;version="${project.version}" - - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/labs/openstack-keystone/pom.xml b/labs/openstack-keystone/pom.xml index 57fd0b756c..8fce999d8e 100644 --- a/labs/openstack-keystone/pom.xml +++ b/labs/openstack-keystone/pom.xml @@ -42,6 +42,13 @@ FIXME_IDENTITY FIXME_CREDENTIALS passwordCredentials + + org.jclouds.openstack.keystone.v2_0*;version="${project.version}" + + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -111,24 +118,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.openstack.keystone.v2_0*;version="${project.version}" - - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/labs/openstack-quantum/pom.xml b/labs/openstack-quantum/pom.xml index 39b4ff1922..9c3511b67f 100644 --- a/labs/openstack-quantum/pom.xml +++ b/labs/openstack-quantum/pom.xml @@ -42,6 +42,12 @@ FIXME_IDENTITY FIXME_CREDENTIALS passwordCredentials + org.jclouds.openstack.quantum.v1_0*;version="${project.version}" + + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -116,24 +122,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.openstack.quantum.v1_0*;version="${project.version}" - - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/labs/openstack-swift/pom.xml b/labs/openstack-swift/pom.xml index d1480dd579..f4a546af8d 100644 --- a/labs/openstack-swift/pom.xml +++ b/labs/openstack-swift/pom.xml @@ -44,6 +44,14 @@ passwordCredentials FIXME_HTTPURL FIXME_HTTPMD5 + + org.jclouds.openstack.swift.v1*;version="${project.version}" + + org.jclouds.blobstore.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -127,25 +135,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.openstack.swift.v1*;version="${project.version}" - - org.jclouds.blobstore.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/labs/opsource-servers/pom.xml b/labs/opsource-servers/pom.xml index ef4eb9cb8a..7d2a0da341 100644 --- a/labs/opsource-servers/pom.xml +++ b/labs/opsource-servers/pom.xml @@ -42,6 +42,13 @@ + org.jclouds.vcloud.director.v1_5*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -113,25 +120,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.vcloud.director.v1_5*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/labs/savvis-symphonyvpdc/pom.xml b/labs/savvis-symphonyvpdc/pom.xml index 312eb29c78..6b2b01b072 100644 --- a/labs/savvis-symphonyvpdc/pom.xml +++ b/labs/savvis-symphonyvpdc/pom.xml @@ -43,6 +43,13 @@ FIXME FIXME FIXME + org.jclouds.savvis.vpdc*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -118,25 +125,4 @@ - - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.savvis.vpdc*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/labs/vcloud-director/pom.xml b/labs/vcloud-director/pom.xml index cf2258d2ce..5d01a18b84 100644 --- a/labs/vcloud-director/pom.xml +++ b/labs/vcloud-director/pom.xml @@ -48,6 +48,14 @@ + + org.jclouds.vcloud.director.v1_5*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -136,25 +144,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.vcloud.director.v1_5*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/labs/virtualbox/pom.xml b/labs/virtualbox/pom.xml index 89fccebb82..3e5a1af7b9 100644 --- a/labs/virtualbox/pom.xml +++ b/labs/virtualbox/pom.xml @@ -43,6 +43,9 @@ test-ubuntu-11.10-i386 toor:password true + + org.jclouds.virtualbox*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -155,20 +158,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.virtualbox*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/loadbalancer/pom.xml b/loadbalancer/pom.xml index 8801b175e1..dc113b757a 100644 --- a/loadbalancer/pom.xml +++ b/loadbalancer/pom.xml @@ -32,6 +32,12 @@ jclouds components to access loadbalancer providers bundle + + org.jclouds.loadbalancer*;version="${project.version}" + org.jclouds*;version="${project.version}",* + jclouds-core;bundle-version="[1.3,2)" + + @@ -81,20 +87,5 @@ test - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.loadbalancer*;version="${project.version}" - org.jclouds*;version="${project.version}",* - jclouds-core;bundle-version="[1.3,2)" - - - - - + diff --git a/project/pom.xml b/project/pom.xml index 26f74430eb..5d64f6b1e3 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -344,7 +344,7 @@ test.jks CreateInternetService-options-test.xml - true + false @@ -561,6 +561,21 @@ pageTracker._trackPageview(); + + org.apache.felix + maven-bundle-plugin + 2.3.7 + + NONE + + ${project.artifactId} + ${jclouds.osgi.export} + ${jclouds.osgi.import} + ${jclouds.osgi.dynamic} + ${jclouds.osgi.fragment} + + + maven-remote-resources-plugin 1.2.1 diff --git a/providers/aws-cloudwatch/pom.xml b/providers/aws-cloudwatch/pom.xml index 91e056c68b..609d63557c 100644 --- a/providers/aws-cloudwatch/pom.xml +++ b/providers/aws-cloudwatch/pom.xml @@ -39,6 +39,9 @@ ${test.aws.identity} ${test.aws.credential} + + org.jclouds.aws.cloudwatch*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -107,20 +110,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.aws.cloudwatch*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml index 8884235746..02d3aebc72 100644 --- a/providers/aws-ec2/pom.xml +++ b/providers/aws-ec2/pom.xml @@ -42,6 +42,16 @@ + + org.jclouds.aws.ec2*;version="${project.version}" + + 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}", + * + @@ -131,28 +141,6 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.aws.ec2*;version="${project.version}" - - 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}", - * - - - - - - diff --git a/providers/aws-s3/pom.xml b/providers/aws-s3/pom.xml index 504b13d31f..df59d53a4b 100644 --- a/providers/aws-s3/pom.xml +++ b/providers/aws-s3/pom.xml @@ -41,6 +41,13 @@ ${test.aws.identity} ${test.aws.credential} 25 + + org.jclouds.aws.s3*;version="${project.version}" + + org.jclouds*;version="${project.version}", + org.jclouds.http.options;version="${project.version}", + * + @@ -142,25 +149,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.aws.s3*;version="${project.version}" - - org.jclouds*;version="${project.version}", - org.jclouds.http.options;version="${project.version}", - * - - - - - - - diff --git a/providers/azureblob/pom.xml b/providers/azureblob/pom.xml index 73f56cc972..d069336efe 100644 --- a/providers/azureblob/pom.xml +++ b/providers/azureblob/pom.xml @@ -39,6 +39,9 @@ ${test.azure.identity} ${test.azure.credential} + + org.jclouds.azureblob*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -110,21 +113,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.azureblob*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/providers/bluelock-vcloud-zone01/pom.xml b/providers/bluelock-vcloud-zone01/pom.xml index 1c42fd94e1..c9d3bd6cdb 100644 --- a/providers/bluelock-vcloud-zone01/pom.xml +++ b/providers/bluelock-vcloud-zone01/pom.xml @@ -42,6 +42,14 @@ + + org.jclouds.bluelock.vcloud.zone01*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -120,26 +128,6 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.bluelock.vcloud.zone01*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/providers/cloudfiles-uk/pom.xml b/providers/cloudfiles-uk/pom.xml index d53054cffd..f55d07e7b0 100644 --- a/providers/cloudfiles-uk/pom.xml +++ b/providers/cloudfiles-uk/pom.xml @@ -39,6 +39,9 @@ ${test.rackspace-uk.identity} ${test.rackspace-uk.credential} + + org.jclouds.rackspace.cloudfiles*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -125,21 +128,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.rackspace.cloudfiles*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/providers/cloudfiles-us/pom.xml b/providers/cloudfiles-us/pom.xml index 5f060dcd16..3bf2dfaba6 100644 --- a/providers/cloudfiles-us/pom.xml +++ b/providers/cloudfiles-us/pom.xml @@ -40,6 +40,9 @@ ${test.rackspace-us.identity} ${test.rackspace-us.credential} + + org.jclouds.rackspace.cloudfiles*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -127,21 +130,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.rackspace.cloudfiles*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/providers/cloudloadbalancers-uk/pom.xml b/providers/cloudloadbalancers-uk/pom.xml index 3bf8bed256..c7be621898 100644 --- a/providers/cloudloadbalancers-uk/pom.xml +++ b/providers/cloudloadbalancers-uk/pom.xml @@ -39,6 +39,9 @@ ${test.rackspace-uk.identity} ${test.rackspace-uk.credential} + + org.jclouds.rackspace.cloudloadbalancers*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -124,19 +127,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.rackspace.cloudloadbalancers*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/providers/cloudloadbalancers-us/pom.xml b/providers/cloudloadbalancers-us/pom.xml index ddc4d94598..cc2e829f51 100644 --- a/providers/cloudloadbalancers-us/pom.xml +++ b/providers/cloudloadbalancers-us/pom.xml @@ -39,6 +39,9 @@ ${test.rackspace-us.identity} ${test.rackspace-us.credential} + + org.jclouds.rackspace.cloudloadbalancers*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -124,19 +127,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.rackspace.cloudloadbalancers*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/providers/cloudonestorage/pom.xml b/providers/cloudonestorage/pom.xml index 8390b7c257..c2bf04a802 100644 --- a/providers/cloudonestorage/pom.xml +++ b/providers/cloudonestorage/pom.xml @@ -39,6 +39,9 @@ FIXME_IDENTITY FIXME_CREDENTIAL + + org.jclouds.cloudonestorage*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -118,21 +121,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.cloudonestorage*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/providers/cloudservers-uk/pom.xml b/providers/cloudservers-uk/pom.xml index 2d321b589e..6824736748 100644 --- a/providers/cloudservers-uk/pom.xml +++ b/providers/cloudservers-uk/pom.xml @@ -42,6 +42,14 @@ + + org.jclouds.rackspace.cloudservers*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -125,26 +133,6 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.rackspace.cloudservers*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/providers/cloudservers-us/pom.xml b/providers/cloudservers-us/pom.xml index 30d1d29751..ffad8b0127 100644 --- a/providers/cloudservers-us/pom.xml +++ b/providers/cloudservers-us/pom.xml @@ -42,6 +42,14 @@ + + org.jclouds.rackspace.cloudservers*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -126,25 +134,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.rackspace.cloudservers*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/providers/cloudsigma-lvs/pom.xml b/providers/cloudsigma-lvs/pom.xml index 79a99bf03e..40588bc9c7 100644 --- a/providers/cloudsigma-lvs/pom.xml +++ b/providers/cloudsigma-lvs/pom.xml @@ -42,6 +42,13 @@ + org.jclouds.cloudsigma*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -120,26 +127,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.cloudsigma*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/providers/cloudsigma-zrh/pom.xml b/providers/cloudsigma-zrh/pom.xml index b055df3123..9ef52e455b 100644 --- a/providers/cloudsigma-zrh/pom.xml +++ b/providers/cloudsigma-zrh/pom.xml @@ -42,6 +42,14 @@ + + org.jclouds.cloudsigma*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -120,26 +128,6 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.cloudsigma*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/providers/elastichosts-lax-p/pom.xml b/providers/elastichosts-lax-p/pom.xml index 250a691183..6f5718cb8f 100644 --- a/providers/elastichosts-lax-p/pom.xml +++ b/providers/elastichosts-lax-p/pom.xml @@ -40,6 +40,14 @@ FIXME_IDENTITY FIXME_CREDENTIAL + + org.jclouds.elastichosts*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -116,26 +124,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.elastichosts*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/providers/elastichosts-lon-b/pom.xml b/providers/elastichosts-lon-b/pom.xml index 20a2e6a392..b627498781 100644 --- a/providers/elastichosts-lon-b/pom.xml +++ b/providers/elastichosts-lon-b/pom.xml @@ -40,6 +40,14 @@ FIXME_IDENTITY FIXME_CREDENTIAL + + org.jclouds.elastichosts*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -116,26 +124,6 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.elastichosts*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/providers/elastichosts-lon-p/pom.xml b/providers/elastichosts-lon-p/pom.xml index 95e8ff17fc..0eabd22f51 100644 --- a/providers/elastichosts-lon-p/pom.xml +++ b/providers/elastichosts-lon-p/pom.xml @@ -40,6 +40,14 @@ FIXME_IDENTITY FIXME_CREDENTIAL + + org.jclouds.elastichosts*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -116,26 +124,6 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.elastichosts*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/providers/elastichosts-sat-p/pom.xml b/providers/elastichosts-sat-p/pom.xml index c3ba01d40e..f00132986c 100644 --- a/providers/elastichosts-sat-p/pom.xml +++ b/providers/elastichosts-sat-p/pom.xml @@ -40,6 +40,14 @@ FIXME_IDENTITY FIXME_CREDENTIAL + + org.jclouds.elastichosts*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -116,26 +124,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.elastichosts*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/providers/elastichosts-tor-p/pom.xml b/providers/elastichosts-tor-p/pom.xml index 02eb2abebc..32d4b96999 100644 --- a/providers/elastichosts-tor-p/pom.xml +++ b/providers/elastichosts-tor-p/pom.xml @@ -40,6 +40,14 @@ FIXME_IDENTITY FIXME_CREDENTIAL + + org.jclouds.elastichosts*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -116,26 +124,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.elastichosts*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/providers/eucalyptus-partnercloud-ec2/pom.xml b/providers/eucalyptus-partnercloud-ec2/pom.xml index 214e2b4d1d..ad10fef969 100644 --- a/providers/eucalyptus-partnercloud-ec2/pom.xml +++ b/providers/eucalyptus-partnercloud-ec2/pom.xml @@ -42,6 +42,14 @@ kvm + + org.jclouds.epc*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -132,26 +140,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.epc*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/providers/eucalyptus-partnercloud-s3/pom.xml b/providers/eucalyptus-partnercloud-s3/pom.xml index 543407cc2b..54db912995 100644 --- a/providers/eucalyptus-partnercloud-s3/pom.xml +++ b/providers/eucalyptus-partnercloud-s3/pom.xml @@ -40,6 +40,12 @@ FIXME_IDENTITY FIXME_CREDENTIAL 15 + + org.jclouds.epc*;version="${project.version}" + + org.jclouds*;version="${project.version}", + * + @@ -127,23 +133,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.epc*;version="${project.version}" - - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/providers/go2cloud-jhb1/pom.xml b/providers/go2cloud-jhb1/pom.xml index 87063ab955..3d03a911b4 100644 --- a/providers/go2cloud-jhb1/pom.xml +++ b/providers/go2cloud-jhb1/pom.xml @@ -40,6 +40,14 @@ FIXME_IDENTITY FIXME_CREDENTIAL + + org.jclouds.go2cloud*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -116,25 +124,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.go2cloud*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/providers/gogrid/pom.xml b/providers/gogrid/pom.xml index 23a0921d2d..4c2ccd5fad 100644 --- a/providers/gogrid/pom.xml +++ b/providers/gogrid/pom.xml @@ -40,6 +40,14 @@ FIXME FIXME + + org.jclouds.gogrid*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -109,24 +117,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.gogrid*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/providers/greenhousedata-element-vcloud/pom.xml b/providers/greenhousedata-element-vcloud/pom.xml index 9c1e60df64..1212a5c95a 100644 --- a/providers/greenhousedata-element-vcloud/pom.xml +++ b/providers/greenhousedata-element-vcloud/pom.xml @@ -42,6 +42,14 @@ + + org.jclouds.greenhousedata.element.vcloud*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -120,26 +128,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.greenhousedata.element.vcloud*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/providers/hpcloud-compute/pom.xml b/providers/hpcloud-compute/pom.xml index dd4ba59595..825bf7075c 100644 --- a/providers/hpcloud-compute/pom.xml +++ b/providers/hpcloud-compute/pom.xml @@ -42,6 +42,14 @@ + + org.jclouds.hpcloud.compute*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -127,25 +135,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.hpcloud.compute*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/providers/hpcloud-objectstorage/pom.xml b/providers/hpcloud-objectstorage/pom.xml index 360b992e40..e2c664f951 100644 --- a/providers/hpcloud-objectstorage/pom.xml +++ b/providers/hpcloud-objectstorage/pom.xml @@ -38,7 +38,10 @@ 1.0 FIXME_IDENTITY - FIXME_CREDENTIAL + FIXME_CREDENTIAL + + org.jclouds.hpcloud.objectstorage*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -144,21 +147,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.hpcloud.objectstorage*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/providers/ninefold-compute/pom.xml b/providers/ninefold-compute/pom.xml index 043a3b345a..ccb42dd382 100644 --- a/providers/ninefold-compute/pom.xml +++ b/providers/ninefold-compute/pom.xml @@ -42,6 +42,14 @@ 1215 user:Password01 true + + org.jclouds.ninefold.compute*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -121,25 +129,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.ninefold.compute*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/providers/ninefold-storage/pom.xml b/providers/ninefold-storage/pom.xml index a25d2ae2b8..dbed7413f2 100644 --- a/providers/ninefold-storage/pom.xml +++ b/providers/ninefold-storage/pom.xml @@ -39,6 +39,9 @@ FIXME_IDENTITY FIXME_CREDENTIAL + + org.jclouds.ninefold.storage*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -117,20 +120,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.ninefold.storage*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/providers/openhosting-east1/pom.xml b/providers/openhosting-east1/pom.xml index 2f4fc2d066..2d87dbcc9d 100644 --- a/providers/openhosting-east1/pom.xml +++ b/providers/openhosting-east1/pom.xml @@ -40,6 +40,14 @@ FIXME_IDENTITY FIXME_CREDENTIAL + + org.jclouds.openhosting*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -116,25 +124,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.openhosting*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/providers/rimuhosting/pom.xml b/providers/rimuhosting/pom.xml index 08fa382bf3..ba7d16a413 100644 --- a/providers/rimuhosting/pom.xml +++ b/providers/rimuhosting/pom.xml @@ -39,6 +39,14 @@ FIXME + + org.jclouds.rimuhosting.miro*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -116,24 +124,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.rimuhosting.miro*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/providers/serverlove-z1-man/pom.xml b/providers/serverlove-z1-man/pom.xml index 9d70165979..4aba15a885 100644 --- a/providers/serverlove-z1-man/pom.xml +++ b/providers/serverlove-z1-man/pom.xml @@ -40,6 +40,13 @@ FIXME_IDENTITY FIXME_CREDENTIAL + org.jclouds.serverlove*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -116,25 +123,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.serverlove*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/providers/skalicloud-sdg-my/pom.xml b/providers/skalicloud-sdg-my/pom.xml index 5f824806d3..a9f7e66132 100644 --- a/providers/skalicloud-sdg-my/pom.xml +++ b/providers/skalicloud-sdg-my/pom.xml @@ -40,6 +40,14 @@ FIXME_IDENTITY FIXME_CREDENTIAL + + org.jclouds.skalicloud*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -116,25 +124,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.skalicloud*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/providers/slicehost/pom.xml b/providers/slicehost/pom.xml index f1ae925b3c..9e0876d015 100644 --- a/providers/slicehost/pom.xml +++ b/providers/slicehost/pom.xml @@ -39,6 +39,14 @@ FIXME + + org.jclouds.slicehost*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -108,25 +116,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.slicehost*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/providers/softlayer/pom.xml b/providers/softlayer/pom.xml index d37ec00884..6a5b8099dd 100644 --- a/providers/softlayer/pom.xml +++ b/providers/softlayer/pom.xml @@ -56,6 +56,14 @@ + + org.jclouds.softlayer*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -125,24 +133,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.softlayer*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/providers/stratogen-vcloud-mycloud/pom.xml b/providers/stratogen-vcloud-mycloud/pom.xml index f39e9ff056..99104b655a 100644 --- a/providers/stratogen-vcloud-mycloud/pom.xml +++ b/providers/stratogen-vcloud-mycloud/pom.xml @@ -42,6 +42,14 @@ + + org.jclouds.stratogen.vcloud.mycloud*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -120,26 +128,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.stratogen.vcloud.mycloud*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/providers/synaptic-storage/pom.xml b/providers/synaptic-storage/pom.xml index 8eb2a76de5..3e1ed7c8ac 100644 --- a/providers/synaptic-storage/pom.xml +++ b/providers/synaptic-storage/pom.xml @@ -39,6 +39,9 @@ FIXME_IDENTITY FIXME_CREDENTIAL + + org.jclouds.synaptic.storage*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -117,20 +120,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.synaptic.storage*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/providers/trmk-ecloud/pom.xml b/providers/trmk-ecloud/pom.xml index c6682dd1af..9fb87647a9 100644 --- a/providers/trmk-ecloud/pom.xml +++ b/providers/trmk-ecloud/pom.xml @@ -41,6 +41,14 @@ FIXME FIXME + + org.jclouds.trmk.ecloud*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -119,25 +127,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.trmk.ecloud*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/providers/trmk-vcloudexpress/pom.xml b/providers/trmk-vcloudexpress/pom.xml index 66db21a08c..a2609ae339 100644 --- a/providers/trmk-vcloudexpress/pom.xml +++ b/providers/trmk-vcloudexpress/pom.xml @@ -40,6 +40,14 @@ FIXME FIXME + + org.jclouds.trmk.ecloud*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -117,25 +125,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.trmk.ecloud*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - - diff --git a/providers/trystack-nova/pom.xml b/providers/trystack-nova/pom.xml index c33d9e65fe..b37bdd8af7 100644 --- a/providers/trystack-nova/pom.xml +++ b/providers/trystack-nova/pom.xml @@ -42,6 +42,14 @@ + + org.jclouds.trystack.nova*;version="${project.version}" + + org.jclouds.compute.internal;version="${project.version}", + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + @@ -127,25 +135,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.trystack.nova*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - diff --git a/sandbox-apis/libvirt/pom.xml b/sandbox-apis/libvirt/pom.xml index 7f22ade9dc..5d8c2fd0e4 100644 --- a/sandbox-apis/libvirt/pom.xml +++ b/sandbox-apis/libvirt/pom.xml @@ -41,6 +41,9 @@ FIXME FIXME + + org.jclouds.libvirt*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -142,20 +145,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.libvirt*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/sandbox-apis/nirvanix/pom.xml b/sandbox-apis/nirvanix/pom.xml index 925eb7832d..cbd62be6da 100644 --- a/sandbox-apis/nirvanix/pom.xml +++ b/sandbox-apis/nirvanix/pom.xml @@ -50,6 +50,9 @@ FIXME FIXME + + org.jclouds.nirvanix.sdn*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -120,21 +123,5 @@ - - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.nirvanix.sdn*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/sandbox-apis/pcs/pom.xml b/sandbox-apis/pcs/pom.xml index 93e715e4a1..5cd1aa41ea 100644 --- a/sandbox-apis/pcs/pom.xml +++ b/sandbox-apis/pcs/pom.xml @@ -50,6 +50,9 @@ FIXME FIXME + + org.jclouds.mezeo.pcs*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -120,21 +123,5 @@ - - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.mezeo.pcs*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/sandbox-apis/scality-rs2/pom.xml b/sandbox-apis/scality-rs2/pom.xml index 4ecd6fcc6d..3b42c76c5e 100644 --- a/sandbox-apis/scality-rs2/pom.xml +++ b/sandbox-apis/scality-rs2/pom.xml @@ -40,6 +40,9 @@ FIXME_IDENTITY FIXME_CREDENTIAL + + org.jclouds.scality.rs2*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -119,21 +122,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.scality.rs2*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/sandbox-apis/simpledb/pom.xml b/sandbox-apis/simpledb/pom.xml index f2eb35cca4..ae47dfba99 100644 --- a/sandbox-apis/simpledb/pom.xml +++ b/sandbox-apis/simpledb/pom.xml @@ -39,6 +39,9 @@ ${test.aws.identity} ${test.aws.credential} + + org.jclouds.simpledb*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -94,21 +97,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.simpledb*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/sandbox-apis/sqs/pom.xml b/sandbox-apis/sqs/pom.xml index 0f786b6ab8..da72c61635 100644 --- a/sandbox-apis/sqs/pom.xml +++ b/sandbox-apis/sqs/pom.xml @@ -39,6 +39,9 @@ ${test.aws.identity} ${test.aws.credential} + + org.jclouds.sqs*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -94,20 +97,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.sqs*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/sandbox-drivers/asynchttpclient/pom.xml b/sandbox-drivers/asynchttpclient/pom.xml index d4b7492d6c..db2faa9c74 100644 --- a/sandbox-drivers/asynchttpclient/pom.xml +++ b/sandbox-drivers/asynchttpclient/pom.xml @@ -33,6 +33,10 @@ Ning Http client bundle + + org.jclouds.http.ning*;version="${project.version}" + org.jclouds*;version="${project.version}",* + @@ -69,20 +73,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.http.ning*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/sandbox-providers/aws-simpledb/pom.xml b/sandbox-providers/aws-simpledb/pom.xml index 5f3d512932..401013b7f0 100644 --- a/sandbox-providers/aws-simpledb/pom.xml +++ b/sandbox-providers/aws-simpledb/pom.xml @@ -39,6 +39,9 @@ ${test.aws.identity} ${test.aws.credential} + + org.jclouds.aws.simpledb*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -108,21 +111,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.aws.simpledb*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/sandbox-providers/azurequeue/pom.xml b/sandbox-providers/azurequeue/pom.xml index 9ac7b86682..d307069c03 100644 --- a/sandbox-providers/azurequeue/pom.xml +++ b/sandbox-providers/azurequeue/pom.xml @@ -39,6 +39,9 @@ ${test.azure.identity} ${test.azure.credential} + + org.jclouds.azurequeue*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -101,20 +104,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.azurequeue*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/sandbox-providers/boxdotnet/pom.xml b/sandbox-providers/boxdotnet/pom.xml index 9402b6712d..e6deb79311 100644 --- a/sandbox-providers/boxdotnet/pom.xml +++ b/sandbox-providers/boxdotnet/pom.xml @@ -53,6 +53,9 @@ FIXME FIXME + + org.jclouds.boxdotnet*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -112,19 +115,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.boxdotnet*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/sandbox-providers/dunkel-vcd/pom.xml b/sandbox-providers/dunkel-vcd/pom.xml index 3ee62987b9..8c234c1d58 100644 --- a/sandbox-providers/dunkel-vcd/pom.xml +++ b/sandbox-providers/dunkel-vcd/pom.xml @@ -41,6 +41,9 @@ + + org.jclouds.dunkel.vcd*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -119,21 +122,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.dunkel.vcd*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/sandbox-providers/googlestorage/pom.xml b/sandbox-providers/googlestorage/pom.xml index 64e3d81458..aa97217078 100644 --- a/sandbox-providers/googlestorage/pom.xml +++ b/sandbox-providers/googlestorage/pom.xml @@ -40,6 +40,9 @@ FIX_ME FIX_ME + + org.jclouds.googlestorage*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -119,20 +122,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.googlestorage*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/sandbox-providers/hosteurope-storage/pom.xml b/sandbox-providers/hosteurope-storage/pom.xml index 162cf90d30..b31e1ce1ed 100644 --- a/sandbox-providers/hosteurope-storage/pom.xml +++ b/sandbox-providers/hosteurope-storage/pom.xml @@ -40,6 +40,9 @@ FIX_ME FIX_ME + + org.jclouds.hosteurope.storage*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -126,21 +129,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.hosteurope.storage*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/sandbox-providers/ibm-smartcloud/pom.xml b/sandbox-providers/ibm-smartcloud/pom.xml index 9f11432c2a..af0159ee8c 100644 --- a/sandbox-providers/ibm-smartcloud/pom.xml +++ b/sandbox-providers/ibm-smartcloud/pom.xml @@ -54,6 +54,9 @@ FIXME FIXME + + org.jclouds.ibm.smartcloud*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -126,20 +129,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.ibm.smartcloud*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/sandbox-providers/scaleup-storage/pom.xml b/sandbox-providers/scaleup-storage/pom.xml index ad334e7815..32b72486fb 100644 --- a/sandbox-providers/scaleup-storage/pom.xml +++ b/sandbox-providers/scaleup-storage/pom.xml @@ -40,6 +40,9 @@ FIX_ME FIX_ME + + org.jclouds.scaleup.storage*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -126,22 +129,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.scaleup.storage*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - - diff --git a/sandbox-providers/tiscali-storage/pom.xml b/sandbox-providers/tiscali-storage/pom.xml index d8ecf017fd..5630a8eb8e 100644 --- a/sandbox-providers/tiscali-storage/pom.xml +++ b/sandbox-providers/tiscali-storage/pom.xml @@ -40,6 +40,9 @@ FIX_ME FIX_ME + + org.jclouds.tiscali.storage*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -127,20 +130,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.tiscali.storage*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - - diff --git a/sandbox-providers/twitter/pom.xml b/sandbox-providers/twitter/pom.xml index 2844ae7b61..fbe0a8cee4 100644 --- a/sandbox-providers/twitter/pom.xml +++ b/sandbox-providers/twitter/pom.xml @@ -54,6 +54,9 @@ FIXME FIXME + + org.jclouds.twitter*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -112,20 +115,4 @@ - - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.twitter*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/sandbox-providers/virtacore-publiccloud-lax/pom.xml b/sandbox-providers/virtacore-publiccloud-lax/pom.xml index 571f5cdc5a..e41a96159c 100644 --- a/sandbox-providers/virtacore-publiccloud-lax/pom.xml +++ b/sandbox-providers/virtacore-publiccloud-lax/pom.xml @@ -39,6 +39,9 @@ FIXME_IDENTITY FIXME_CREDENTIAL + + org.jclouds.virtacore.publiccloud*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -118,21 +121,5 @@ - - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.virtacore.publiccloud*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/scriptbuilder/pom.xml b/scriptbuilder/pom.xml index 7de9261141..66626a3138 100644 --- a/scriptbuilder/pom.xml +++ b/scriptbuilder/pom.xml @@ -31,9 +31,14 @@ jclouds script builder creates scripts that can be used to manage services bundle + + + org.jclouds.scriptbuilder*;version="${project.version}" + org.jclouds*;version="${project.version}",* + ${project.groupId} @@ -49,19 +54,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.scriptbuilder*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - diff --git a/skeletons/standalone-compute/pom.xml b/skeletons/standalone-compute/pom.xml index 6667fb2467..5760dd91a0 100644 --- a/skeletons/standalone-compute/pom.xml +++ b/skeletons/standalone-compute/pom.xml @@ -40,6 +40,9 @@ 1.0 FIXME + + org.jclouds.servermanager*;version="${project.version}" + org.jclouds*;version="${project.version}",* @@ -113,19 +116,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.servermanager*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - -