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-labs-aws.git
The following commit(s) were added to refs/heads/master by this push:
new b3b36f8 Sync OSGi handling with Apache JClouds Project
b3b36f8 is described below
commit b3b36f8716cbc20c2a2fa56a3128c5e7a1545135
Author: gurkerl83 <[email protected]>
AuthorDate: Sun Dec 6 14:51:14 2020 +0100
Sync OSGi handling with Apache JClouds Project
This project, the aws-lab version of Apache JClouds, share the exact build
instructions as the primary Apache JClouds project with all its modules.
Apache JClouds is shifting its strategy in handling OSGi configuration.
Instead of using the Maven Bundle Plugin, a wrapper of the BND plugin, the BND
plugin gets used directly.
- Remove the OSGi configuration from each module. The configuration gets
served to the BND through dedicated configuration / bnd files.
- Onboard bnd-configuration files, one per module.
Ignore bnd files in rat plugin
---
aws-elb/bnd.bnd | 2 ++
aws-elb/pom.xml | 8 --------
aws-iam/bnd.bnd | 2 ++
aws-iam/pom.xml | 8 --------
aws-rds/bnd.bnd | 2 ++
aws-rds/pom.xml | 8 --------
elb/bnd.bnd | 2 ++
elb/pom.xml | 8 --------
glacier/bnd.bnd | 2 ++
glacier/pom.xml | 3 ---
iam/bnd.bnd | 2 ++
iam/pom.xml | 8 --------
pom.xml | 3 +++
rds/bnd.bnd | 2 ++
rds/pom.xml | 8 --------
15 files changed, 17 insertions(+), 51 deletions(-)
diff --git a/aws-elb/bnd.bnd b/aws-elb/bnd.bnd
new file mode 100644
index 0000000..0fbbb53
--- /dev/null
+++ b/aws-elb/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.aws.elb.*;version="${project.version}";-noimport:=true
\ No newline at end of file
diff --git a/aws-elb/pom.xml b/aws-elb/pom.xml
index f73fb14..25f95d1 100644
--- a/aws-elb/pom.xml
+++ b/aws-elb/pom.xml
@@ -30,7 +30,6 @@
<artifactId>aws-elb</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>
@@ -47,13 +46,6 @@
<test.aws-elb.compute.identity>${test.aws.identity}</test.aws-elb.compute.identity>
<test.aws-elb.compute.credential>${test.aws.credential}</test.aws-elb.compute.credential>
<test.aws-elb.compute.template />
-
-
<jclouds.osgi.export>org.jclouds.aws.elb*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.labs*;version="${project.version}",
- org.jclouds*;version="${jclouds.version}",
- *
- </jclouds.osgi.import>
</properties>
<dependencies>
diff --git a/aws-iam/bnd.bnd b/aws-iam/bnd.bnd
new file mode 100644
index 0000000..27d61b1
--- /dev/null
+++ b/aws-iam/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.aws.iam.*;version="${project.version}";-noimport:=true
\ No newline at end of file
diff --git a/aws-iam/pom.xml b/aws-iam/pom.xml
index 2a6f196..7b61252 100644
--- a/aws-iam/pom.xml
+++ b/aws-iam/pom.xml
@@ -30,7 +30,6 @@
<artifactId>aws-iam</artifactId>
<name>jclouds Amazon Identity and Access Management (IAM) provider</name>
<description>Identity and Access Management (IAM) to Amazon Web
Services</description>
- <packaging>bundle</packaging>
<properties>
<test.aws.identity>FIXME_IDENTITY</test.aws.identity>
@@ -40,13 +39,6 @@
<test.aws-iam.build-version />
<test.aws-iam.identity>${test.aws.identity}</test.aws-iam.identity>
<test.aws-iam.credential>${test.aws.credential}</test.aws-iam.credential>
-
-
<jclouds.osgi.export>org.jclouds.aws.iam*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.labs*;version="${project.version}",
- org.jclouds*;version="${jclouds.version}",
- *
- </jclouds.osgi.import>
</properties>
<dependencies>
diff --git a/aws-rds/bnd.bnd b/aws-rds/bnd.bnd
new file mode 100644
index 0000000..980d764
--- /dev/null
+++ b/aws-rds/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.aws.rds.*;version="${project.version}";-noimport:=true
\ No newline at end of file
diff --git a/aws-rds/pom.xml b/aws-rds/pom.xml
index e4cecb0..e5cf0fb 100644
--- a/aws-rds/pom.xml
+++ b/aws-rds/pom.xml
@@ -30,7 +30,6 @@
<artifactId>aws-rds</artifactId>
<name>jclouds Amazon Relational Database Service provider</name>
<description>Relational Database Service implementation targeted to Amazon
Web Services</description>
- <packaging>bundle</packaging>
<properties>
<test.aws.identity>FIXME_IDENTITY</test.aws.identity>
@@ -40,13 +39,6 @@
<test.aws-rds.build-version />
<test.aws-rds.identity>${test.aws.identity}</test.aws-rds.identity>
<test.aws-rds.credential>${test.aws.credential}</test.aws-rds.credential>
-
-
<jclouds.osgi.export>org.jclouds.aws.rds*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.labs*;version="${project.version}",
- org.jclouds*;version="${jclouds.version}",
- *
- </jclouds.osgi.import>
</properties>
<dependencies>
diff --git a/elb/bnd.bnd b/elb/bnd.bnd
new file mode 100644
index 0000000..c8ef1c6
--- /dev/null
+++ b/elb/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.elb.*;version="${project.version}";-noimport:=true
\ No newline at end of file
diff --git a/elb/pom.xml b/elb/pom.xml
index 8a60fd6..b795be0 100644
--- a/elb/pom.xml
+++ b/elb/pom.xml
@@ -30,7 +30,6 @@
<artifactId>elb</artifactId>
<name>jcloud elb api</name>
<description>jclouds components to access an implementation of Elastic Load
Balancer</description>
- <packaging>bundle</packaging>
<properties>
<test.aws.identity>FIXME_IDENTITY</test.aws.identity>
@@ -47,13 +46,6 @@
<test.elb.compute.identity>${test.aws.identity}</test.elb.compute.identity>
<test.elb.compute.credential>${test.aws.credential}</test.elb.compute.credential>
<test.elb.compute.template />
-
-
<jclouds.osgi.export>org.jclouds.elb*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.labs*;version="${project.version}",
- org.jclouds*;version="${jclouds.version}",
- *
- </jclouds.osgi.import>
</properties>
<dependencies>
diff --git a/glacier/bnd.bnd b/glacier/bnd.bnd
new file mode 100644
index 0000000..c8e1e5d
--- /dev/null
+++ b/glacier/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.glacier.*;version="${project.version}";-noimport:=true
\ No newline at end of file
diff --git a/glacier/pom.xml b/glacier/pom.xml
index 2cf48f3..c7ac9ee 100644
--- a/glacier/pom.xml
+++ b/glacier/pom.xml
@@ -32,7 +32,6 @@
<artifactId>glacier</artifactId>
<name>Apache jclouds :: AWS :: Glacier API</name>
<description>jclouds components to access an implementation of
glacier</description>
- <packaging>bundle</packaging>
<properties>
<test.aws.identity>FIXME_IDENTITY</test.aws.identity>
@@ -42,8 +41,6 @@
<test.glacier.build-version />
<test.glacier.identity>${test.aws.identity}</test.glacier.identity>
<test.glacier.credential>${test.aws.credential}</test.glacier.credential>
-
<jclouds.osgi.export>org.jclouds.glacier*;version="${project.version}"</jclouds.osgi.export>
-
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<repositories>
diff --git a/iam/bnd.bnd b/iam/bnd.bnd
new file mode 100644
index 0000000..8e12758
--- /dev/null
+++ b/iam/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.iam.*;version="${project.version}";-noimport:=true
\ No newline at end of file
diff --git a/iam/pom.xml b/iam/pom.xml
index d7973c7..75afeca 100644
--- a/iam/pom.xml
+++ b/iam/pom.xml
@@ -30,7 +30,6 @@
<artifactId>iam</artifactId>
<name>jcloud iam api</name>
<description>jclouds components to access an implementation of Identity and
Access Management (IAM)</description>
- <packaging>bundle</packaging>
<properties>
<test.aws.identity>FIXME_IDENTITY</test.aws.identity>
@@ -40,13 +39,6 @@
<test.iam.build-version />
<test.iam.identity>${test.aws.identity}</test.iam.identity>
<test.iam.credential>${test.aws.credential}</test.iam.credential>
-
-
<jclouds.osgi.export>org.jclouds.iam*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.labs*;version="${project.version}",
- org.jclouds*;version="${jclouds.version}",
- *
- </jclouds.osgi.import>
</properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 52d38a1..a8f3d87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,9 @@
<exclude>**/*LoggingModule</exclude>
<exclude>**/*ViewMBeanFactory</exclude>
+ <!-- OSGi metadata rules -->
+ <exclude>**/bnd.bnd</exclude>
+
<!-- temporary files or those generated by IDE or SCM -->
<exclude>**/target/**</exclude>
<exclude>**/test-output/**</exclude>
diff --git a/rds/bnd.bnd b/rds/bnd.bnd
new file mode 100644
index 0000000..5a03ddf
--- /dev/null
+++ b/rds/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: \
+ org.jclouds.rds.*;version="${project.version}";-noimport:=true
\ No newline at end of file
diff --git a/rds/pom.xml b/rds/pom.xml
index 105edac..89a884f 100644
--- a/rds/pom.xml
+++ b/rds/pom.xml
@@ -30,7 +30,6 @@
<artifactId>rds</artifactId>
<name>jcloud rds api</name>
<description>jclouds components to access an implementation of Relational
Database Service</description>
- <packaging>bundle</packaging>
<properties>
<test.aws.identity>FIXME_IDENTITY</test.aws.identity>
@@ -40,13 +39,6 @@
<test.rds.build-version />
<test.rds.identity>${test.aws.identity}</test.rds.identity>
<test.rds.credential>${test.aws.credential}</test.rds.credential>
-
-
<jclouds.osgi.export>org.jclouds.rds*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.labs*;version="${project.version}",
- org.jclouds*;version="${jclouds.version}",
- *
- </jclouds.osgi.import>
</properties>
<dependencies>
