ottlinger closed pull request #21: Clean up OSGi/Manifest metadata URL: https://github.com/apache/incubator-tamaya-extensions/pull/21
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/modules/collections/bnd.bnd b/modules/collections/bnd.bnd index 61b2571e..f9fb7f1b 100644 --- a/modules/collections/bnd.bnd +++ b/modules/collections/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.collections Import-Package: \ diff --git a/modules/consul/bnd.bnd b/modules/consul/bnd.bnd index 9928592c..d60c46c3 100644 --- a/modules/consul/bnd.bnd +++ b/modules/consul/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.consul Import-Package: \ diff --git a/modules/etcd/bnd.bnd b/modules/etcd/bnd.bnd index 129f3ec3..4d1fc022 100644 --- a/modules/etcd/bnd.bnd +++ b/modules/etcd/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.etcd Import-Package: \ diff --git a/modules/events/bnd.bnd b/modules/events/bnd.bnd index c431c8d5..c8099e33 100644 --- a/modules/events/bnd.bnd +++ b/modules/events/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.events,\ org.apache.tamaya.events.spi diff --git a/modules/features/bnd.bnd b/modules/features/bnd.bnd index c46d6ef3..e4687061 100644 --- a/modules/features/bnd.bnd +++ b/modules/features/bnd.bnd @@ -13,12 +13,12 @@ Automatic-Module-Name: org.apache.tamaya.features Bundle-Version: ${version}.${tstamp} Bundle-Name: Apache Tamaya - Features Bundle-SymbolicName: org.apache.tamaya.features -Bundle-Description: Apacha Tamaya Confi - Features +Bundle-Description: Apacha Tamaya Config - Features Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.features diff --git a/modules/filter/bnd.bnd b/modules/filter/bnd.bnd index a8bbb0dd..fd24b036 100644 --- a/modules/filter/bnd.bnd +++ b/modules/filter/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.filter Import-Package: \ diff --git a/modules/formats/base/bnd.bnd b/modules/formats/base/bnd.bnd index 84b86a23..67e1eee7 100644 --- a/modules/formats/base/bnd.bnd +++ b/modules/formats/base/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.format,\ org.apache.tamaya.format.formats diff --git a/modules/formats/json/bnd.bnd b/modules/formats/json/bnd.bnd index 49ed5fca..a3baef03 100644 --- a/modules/formats/json/bnd.bnd +++ b/modules/formats/json/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.json Import-Package: \ diff --git a/modules/formats/yaml/bnd.bnd b/modules/formats/yaml/bnd.bnd index ad4cc29d..35fe9bbe 100644 --- a/modules/formats/yaml/bnd.bnd +++ b/modules/formats/yaml/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.yaml Import-Package: \ diff --git a/modules/functions/bnd.bnd b/modules/functions/bnd.bnd index 5e8da057..acee5726 100644 --- a/modules/functions/bnd.bnd +++ b/modules/functions/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.functions Import-Package: \ diff --git a/modules/hazelcast/bnd.bnd b/modules/hazelcast/bnd.bnd index 22db283e..215c958f 100644 --- a/modules/hazelcast/bnd.bnd +++ b/modules/hazelcast/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.hazelcast Import-Package: \ diff --git a/modules/injection/cdi/bnd.bnd b/modules/injection/cdi/bnd.bnd index 2c0203cc..bab895dc 100644 --- a/modules/injection/cdi/bnd.bnd +++ b/modules/injection/cdi/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.inject.cdi,\ org.apache.tamaya.inject.extras diff --git a/modules/injection/injection-api/bnd.bnd b/modules/injection/injection-api/bnd.bnd index a6173aa1..1c9bb324 100644 --- a/modules/injection/injection-api/bnd.bnd +++ b/modules/injection/injection-api/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: API Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.inject.api,\ org.apache.tamaya.inject.spi diff --git a/modules/injection/standalone/bnd.bnd b/modules/injection/standalone/bnd.bnd index 5090a3ad..9b927ed2 100644 --- a/modules/injection/standalone/bnd.bnd +++ b/modules/injection/standalone/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.inject Import-Package: \ diff --git a/modules/jndi/bnd.bnd b/modules/jndi/bnd.bnd index 61bc5503..324dfb02 100644 --- a/modules/jndi/bnd.bnd +++ b/modules/jndi/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.jndi Import-Package: \ diff --git a/modules/microprofile/bnd.bnd b/modules/microprofile/bnd.bnd index fb1111ce..80299323 100644 --- a/modules/microprofile/bnd.bnd +++ b/modules/microprofile/bnd.bnd @@ -18,7 +18,7 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] +Bundle-ContactAddress: [email protected] Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.microprofile,\ diff --git a/modules/mutable-config/bnd.bnd b/modules/mutable-config/bnd.bnd index a0b47086..bcf0518a 100644 --- a/modules/mutable-config/bnd.bnd +++ b/modules/mutable-config/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: API Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.mutableconfig,\ org.apache.tamaya.mutableconfig.propertysources,\ diff --git a/modules/optional/bnd.bnd b/modules/optional/bnd.bnd index 502177a0..25e89428 100644 --- a/modules/optional/bnd.bnd +++ b/modules/optional/bnd.bnd @@ -18,7 +18,7 @@ Bundle-Category: API Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.optional diff --git a/modules/osgi/common/bnd.bnd b/modules/osgi/common/bnd.bnd index d4ee4ae3..47a14990 100644 --- a/modules/osgi/common/bnd.bnd +++ b/modules/osgi/common/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Bundle-Activator: org.apache.tamaya.osgi.Activator Export-Package: \ org.apache.tamaya.osgi,\ diff --git a/modules/osgi/gogo-shell/bnd.bnd b/modules/osgi/gogo-shell/bnd.bnd index a7da417b..bb23ee62 100644 --- a/modules/osgi/gogo-shell/bnd.bnd +++ b/modules/osgi/gogo-shell/bnd.bnd @@ -19,8 +19,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.gogo.shell Import-Package: \ diff --git a/modules/osgi/injection/bnd.bnd b/modules/osgi/injection/bnd.bnd index b861df6a..e30b9bc7 100644 --- a/modules/osgi/injection/bnd.bnd +++ b/modules/osgi/injection/bnd.bnd @@ -19,8 +19,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Import-Package: \ org.osgi.service.cm,\ org.osgi.framework,\ diff --git a/modules/osgi/karaf-shell/bnd.bnd b/modules/osgi/karaf-shell/bnd.bnd index 90682257..20bd813e 100644 --- a/modules/osgi/karaf-shell/bnd.bnd +++ b/modules/osgi/karaf-shell/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.karaf.shell Import-Package: \ diff --git a/modules/osgi/updater/bnd.bnd b/modules/osgi/updater/bnd.bnd index 52865f49..ffd2509c 100644 --- a/modules/osgi/updater/bnd.bnd +++ b/modules/osgi/updater/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Bundle-Activator: org.apache.tamaya.osgi.updater.Activator Export-Package: \ org.apache.tamaya.osgi.updater diff --git a/modules/resolver/bnd.bnd b/modules/resolver/bnd.bnd index 948bf645..84f4f104 100644 --- a/modules/resolver/bnd.bnd +++ b/modules/resolver/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.resolver,\ org.apache.tamaya.resolver.spi diff --git a/modules/resources/bnd.bnd b/modules/resources/bnd.bnd index f843b3b2..11a597eb 100644 --- a/modules/resources/bnd.bnd +++ b/modules/resources/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.resource Private-Package: \ diff --git a/modules/spring/bnd.bnd b/modules/spring/bnd.bnd index 91856f11..bd44b5e8 100644 --- a/modules/spring/bnd.bnd +++ b/modules/spring/bnd.bnd @@ -18,8 +18,8 @@ Bundle-Category: Implementation Bundle-Copyright: (C) Apache Foundation Bundle-License: Apache Licence version 2 Bundle-Vendor: Apache Software Foundation -Bundle-ContactAddress: [email protected] -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: [email protected] +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.integration.spring Import-Package: \ diff --git a/pom.xml b/pom.xml index fbeafaf6..4118b960 100644 --- a/pom.xml +++ b/pom.xml @@ -548,6 +548,23 @@ under the License. <inherited>true</inherited> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <version>1.4</version> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>create</goal> + </goals> + </execution> + </executions> + <configuration> + <shortRevisionLength>8</shortRevisionLength> + </configuration> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> @@ -555,6 +572,9 @@ under the License. <archive> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> <addMavenDescriptor>false</addMavenDescriptor> + <manifest> + <addDefaultImplementationEntries>false</addDefaultImplementationEntries> + </manifest> <manifestEntries> <Specification-Title>Apache ${project.name}</Specification-Title> <Specification-Version>${project.version}</Specification-Version> @@ -563,7 +583,6 @@ under the License. <Implementation-Version>${project.version} ${buildNumber}</Implementation-Version> <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor> <SCM-Revision>${buildNumber}</SCM-Revision> - <SCM-url>${project.scm.url}</SCM-url> </manifestEntries> </archive> </configuration> @@ -863,6 +882,10 @@ under the License. <target>${maven.compile.targetLevel}</target> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + </plugin> <plugin> <groupId>biz.aQute.bnd</groupId> <artifactId>bnd-maven-plugin</artifactId> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
