ottlinger closed pull request #13: Clean up OSGi/Manifest metadata URL: https://github.com/apache/incubator-tamaya-sandbox/pull/13
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/apache-commons/bnd.bnd b/apache-commons/bnd.bnd index 4ce0faa..4be766b 100644 --- a/apache-commons/bnd.bnd +++ b/apache-commons/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.commons Import-Package: \ diff --git a/camel/bnd.bnd b/camel/bnd.bnd index 9a3b4a8..4574764 100644 --- a/camel/bnd.bnd +++ b/camel/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.camel Import-Package: \ diff --git a/configjsr/bnd.bnd b/configjsr/bnd.bnd index 45a48a9..ba991d9 100644 --- a/configjsr/bnd.bnd +++ b/configjsr/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: dev-tam...@incubator.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org Bundle-DocURL: https://tamaya.incubator.apache.org Export-Package: \ org.apache.tamaya.jsr382,\ diff --git a/configured-sysprops/bnd.bnd b/configured-sysprops/bnd.bnd index fd3b542..f88b998 100644 --- a/configured-sysprops/bnd.bnd +++ b/configured-sysprops/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.sysprops Import-Package: \ diff --git a/documentation/bnd.bnd b/documentation/bnd.bnd index ef18c20..74b3f3f 100644 --- a/documentation/bnd.bnd +++ b/documentation/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.doc,\ org.apache.tamaya.doc.spi diff --git a/jodatime/bnd.bnd b/jodatime/bnd.bnd index 95f68f1..e2cf728 100644 --- a/jodatime/bnd.bnd +++ b/jodatime/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.jodatime Import-Package: \ diff --git a/management/bnd.bnd b/management/bnd.bnd index e56314c..21215d6 100644 --- a/management/bnd.bnd +++ b/management/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.management Import-Package: \ diff --git a/metamodel/bnd.bnd b/metamodel/bnd.bnd index 1c9ae8f..6111353 100644 --- a/metamodel/bnd.bnd +++ b/metamodel/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.metamodel,\ org.apache.tamaya.metamodel.dsl,\ diff --git a/pom.xml b/pom.xml index e58870c..a1d6985 100644 --- a/pom.xml +++ b/pom.xml @@ -478,12 +478,34 @@ 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> + <getRevisionOnlyOnce>true</getRevisionOnlyOnce> + <shortRevisionLength>8</shortRevisionLength> + </configuration> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> <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> @@ -492,7 +514,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> @@ -793,6 +814,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> diff --git a/propertysources/bnd.bnd b/propertysources/bnd.bnd index 48e7014..35b023d 100644 --- a/propertysources/bnd.bnd +++ b/propertysources/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.propertysources Import-Package: \ diff --git a/remote/bnd.bnd b/remote/bnd.bnd index c15a888..49366a7 100644 --- a/remote/bnd.bnd +++ b/remote/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.remote Import-Package: \ diff --git a/server/bnd.bnd b/server/bnd.bnd index 31d2e0c..8c9cba6 100644 --- a/server/bnd.bnd +++ b/server/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.server,\ org.apache.tamaya.server.spi diff --git a/ui/base/bnd.bnd b/ui/base/bnd.bnd index 1919a1f..586d423 100644 --- a/ui/base/bnd.bnd +++ b/ui/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.ui,\ org.apache.tamaya.ui.event,\ diff --git a/ui/events/bnd.bnd b/ui/events/bnd.bnd index edae68e..6c2fbaa 100644 --- a/ui/events/bnd.bnd +++ b/ui/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.ui.events Import-Package: \ diff --git a/ui/mutableconfig/bnd.bnd b/ui/mutableconfig/bnd.bnd index 0db86d0..e1a5648 100644 --- a/ui/mutableconfig/bnd.bnd +++ b/ui/mutableconfig/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.ui.mutableconfig Import-Package: \ diff --git a/uom/bnd.bnd b/uom/bnd.bnd index 067bc94..2f45a62 100644 --- a/uom/bnd.bnd +++ b/uom/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.ui.uom Import-Package: \ diff --git a/usagetracker/bnd.bnd b/usagetracker/bnd.bnd index bf31bf8..2684c6e 100644 --- a/usagetracker/bnd.bnd +++ b/usagetracker/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.usagetracker,\ org.apache.tamaya.usagetracker.spi diff --git a/validation/bnd.bnd b/validation/bnd.bnd index 05a5d72..e95d823 100644 --- a/validation/bnd.bnd +++ b/validation/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.validation,\ org.apache.tamaya.validation.spi diff --git a/vertx/bnd.bnd b/vertx/bnd.bnd index 30734b9..5daaa7f 100644 --- a/vertx/bnd.bnd +++ b/vertx/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: dev-tam...@incubator.apache.org -Bundle-DocURL: http://tamaya.apache.org +Bundle-ContactAddress: dev@tamaya.incubator.apache.org +Bundle-DocURL: https://tamaya.apache.org Export-Package: \ org.apache.tamaya.vertx Import-Package: \ ---------------------------------------------------------------- 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: us...@infra.apache.org With regards, Apache Git Services
