Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master 85ae2a471 -> d672b2d99
TAMAYA-202: Applied C. Schneider's recommendation: Use bnd-maven-plugin. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/d672b2d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/d672b2d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/d672b2d9 Branch: refs/heads/master Commit: d672b2d99c29a8f4387658318d28088d603ef291 Parents: 85ae2a4 Author: anatole <[email protected]> Authored: Sun Nov 27 21:21:04 2016 +0100 Committer: anatole <[email protected]> Committed: Sun Nov 27 21:21:04 2016 +0100 ---------------------------------------------------------------------- modules/events/pom.xml | 26 +------------------------- modules/filter/pom.xml | 23 +---------------------- modules/formats/base/pom.xml | 19 +------------------ modules/formats/json/pom.xml | 14 +------------- modules/formats/yaml/pom.xml | 14 +------------- modules/functions/pom.xml | 19 +------------------ modules/injection/injection-api/pom.xml | 2 +- modules/injection/standalone/pom.xml | 22 +--------------------- modules/mutable-config/pom.xml | 18 +----------------- modules/optional/pom.xml | 18 +----------------- modules/pom.xml | 22 ++++++++++++++++++++++ modules/resolver/pom.xml | 22 +--------------------- modules/resources/pom.xml | 21 +-------------------- modules/spi-support/pom.xml | 18 +----------------- modules/spring/pom.xml | 2 +- 15 files changed, 36 insertions(+), 224 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d672b2d9/modules/events/pom.xml ---------------------------------------------------------------------- diff --git a/modules/events/pom.xml b/modules/events/pom.xml index 1f9d05c..1e80133 100644 --- a/modules/events/pom.xml +++ b/modules/events/pom.xml @@ -30,7 +30,7 @@ under the License. <artifactId>tamaya-events</artifactId> <name>Apache Tamaya Event and dynamic Update Extensions</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <properties> <jdkVersion>1.7</jdkVersion> @@ -74,28 +74,4 @@ under the License. </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.tamaya.events, - org.apache.tamaya.events.delta, - org.apache.tamaya.events.folderobserver, - org.apache.tamaya.events.spi - </Export-Package> - <Private-Package> - org.apache.tamaya.events.internal - </Private-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - - </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d672b2d9/modules/filter/pom.xml ---------------------------------------------------------------------- diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml index 5355a6c..9700829 100644 --- a/modules/filter/pom.xml +++ b/modules/filter/pom.xml @@ -30,7 +30,7 @@ under the License. <artifactId>tamaya-filter</artifactId> <name>Apache Tamaya Adaptive Configuration Filtering</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <properties> <jdkVersion>1.7</jdkVersion> @@ -65,25 +65,4 @@ under the License. </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.tamaya.filter, - </Export-Package> - <!--<Private-Package>--> - <!--org.apache.tamaya.events.internal--> - <!--</Private-Package>--> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - - </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d672b2d9/modules/formats/base/pom.xml ---------------------------------------------------------------------- diff --git a/modules/formats/base/pom.xml b/modules/formats/base/pom.xml index 04daa47..7af96a0 100644 --- a/modules/formats/base/pom.xml +++ b/modules/formats/base/pom.xml @@ -29,7 +29,7 @@ under the License. </parent> <artifactId>tamaya-formats</artifactId> <name>Apache Tamaya Modules Formats Common</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <properties> <jdkVersion>1.7</jdkVersion> @@ -73,21 +73,4 @@ under the License. </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.tamaya.format, - org.apache.tamaya.format.formats - </Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d672b2d9/modules/formats/json/pom.xml ---------------------------------------------------------------------- diff --git a/modules/formats/json/pom.xml b/modules/formats/json/pom.xml index 8346231..f3264e0 100644 --- a/modules/formats/json/pom.xml +++ b/modules/formats/json/pom.xml @@ -30,7 +30,7 @@ under the License. </parent> <artifactId>tamaya-json</artifactId> <name>Apache Tamaya JSON Support</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <inceptionYear>2015</inceptionYear> <properties> @@ -130,18 +130,6 @@ under the License. </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.tamaya.json - </Export-Package> - </instructions> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d672b2d9/modules/formats/yaml/pom.xml ---------------------------------------------------------------------- diff --git a/modules/formats/yaml/pom.xml b/modules/formats/yaml/pom.xml index 0ec6b38..696bbfb 100644 --- a/modules/formats/yaml/pom.xml +++ b/modules/formats/yaml/pom.xml @@ -30,7 +30,7 @@ under the License. </parent> <artifactId>tamaya-yaml</artifactId> <name>Apache Tamaya YAML Support</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <inceptionYear>2016</inceptionYear> <properties> @@ -100,18 +100,6 @@ under the License. </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.tamaya.json - </Export-Package> - </instructions> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d672b2d9/modules/functions/pom.xml ---------------------------------------------------------------------- diff --git a/modules/functions/pom.xml b/modules/functions/pom.xml index 9d40858..04da1c3 100644 --- a/modules/functions/pom.xml +++ b/modules/functions/pom.xml @@ -30,7 +30,7 @@ under the License. <artifactId>tamaya-functions</artifactId> <name>Apache Tamaya Modules Common Functional Extensions</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <properties> <jdkVersion>1.7</jdkVersion> @@ -66,21 +66,4 @@ under the License. </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.tamaya.functions - </Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d672b2d9/modules/injection/injection-api/pom.xml ---------------------------------------------------------------------- diff --git a/modules/injection/injection-api/pom.xml b/modules/injection/injection-api/pom.xml index 32e300d..bb7624e 100644 --- a/modules/injection/injection-api/pom.xml +++ b/modules/injection/injection-api/pom.xml @@ -29,7 +29,7 @@ under the License. </parent> <artifactId>tamaya-injection-api</artifactId> <name>Apache Tamaya Modules - Injection API</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <properties> <jdkVersion>1.7</jdkVersion> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d672b2d9/modules/injection/standalone/pom.xml ---------------------------------------------------------------------- diff --git a/modules/injection/standalone/pom.xml b/modules/injection/standalone/pom.xml index 7732b9b..0a5f414 100644 --- a/modules/injection/standalone/pom.xml +++ b/modules/injection/standalone/pom.xml @@ -29,7 +29,7 @@ under the License. </parent> <artifactId>tamaya-injection</artifactId> <name>Apache Tamaya Modules - Injection Standalone</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <properties> <jdkVersion>1.7</jdkVersion> @@ -74,24 +74,4 @@ under the License. </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.tamaya.inject - </Export-Package> - <Private-Package> - org.apache.tamaya.inject.internal - </Private-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d672b2d9/modules/mutable-config/pom.xml ---------------------------------------------------------------------- diff --git a/modules/mutable-config/pom.xml b/modules/mutable-config/pom.xml index 1961860..a8393fd 100644 --- a/modules/mutable-config/pom.xml +++ b/modules/mutable-config/pom.xml @@ -29,7 +29,7 @@ under the License. <name>Apache Tamaya Modules - Mutable Configuration</name> <description>This module provides abstraction, if your scenario needs to actively change configuration entries and write changes back to some property sources, files etc.</description> - <packaging>bundle</packaging> + <packaging>jar</packaging> <properties> <jdkVersion>1.7</jdkVersion> @@ -75,20 +75,4 @@ under the License. </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.tamaya.mutableconfig - </Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d672b2d9/modules/optional/pom.xml ---------------------------------------------------------------------- diff --git a/modules/optional/pom.xml b/modules/optional/pom.xml index f24e8e4..6ab12b3 100644 --- a/modules/optional/pom.xml +++ b/modules/optional/pom.xml @@ -33,7 +33,7 @@ under the License. <description>This module provides a simple class that can be used as a single dependency for evaluating configuration. It runs basically without Tamaya being on the classpath, but if available it considers/uses Tamaya functionality.</description> - <packaging>bundle</packaging> + <packaging>jar</packaging> <properties> <jdkVersion>1.7</jdkVersion> @@ -64,20 +64,4 @@ under the License. </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.tamaya.optional - </Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d672b2d9/modules/pom.xml ---------------------------------------------------------------------- diff --git a/modules/pom.xml b/modules/pom.xml index d243154..ae6ef25 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -100,6 +100,28 @@ under the License. </dependency> </dependencies> </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-maven-plugin</artifactId> + <version>3.3.0</version> + <executions> + <execution> + <goals> + <goal>bnd-process</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.5</version> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d672b2d9/modules/resolver/pom.xml ---------------------------------------------------------------------- diff --git a/modules/resolver/pom.xml b/modules/resolver/pom.xml index 3a97788..3633c1e 100644 --- a/modules/resolver/pom.xml +++ b/modules/resolver/pom.xml @@ -29,7 +29,7 @@ under the License. </parent> <artifactId>tamaya-resolver</artifactId> <name>Apache Tamaya Resolver Services</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <properties> <jdkVersion>1.7</jdkVersion> @@ -64,24 +64,4 @@ under the License. </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.tamaya.resolver, - org.apache.tamaya.resolver.spi - </Export-Package> - <Private-Package> - org.apache.tamaya.resolver.internal - </Private-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d672b2d9/modules/resources/pom.xml ---------------------------------------------------------------------- diff --git a/modules/resources/pom.xml b/modules/resources/pom.xml index 334cb17..627bf0e 100644 --- a/modules/resources/pom.xml +++ b/modules/resources/pom.xml @@ -29,7 +29,7 @@ under the License. </parent> <artifactId>tamaya-resources</artifactId> <name>Apache Tamaya Resource Services</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <properties> <jdkVersion>1.7</jdkVersion> @@ -57,23 +57,4 @@ under the License. </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.tamaya.resource - </Export-Package> - <Private-Package> - org.apache.tamaya.resource.internal - </Private-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d672b2d9/modules/spi-support/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spi-support/pom.xml b/modules/spi-support/pom.xml index 3e347f3..9edf80e 100644 --- a/modules/spi-support/pom.xml +++ b/modules/spi-support/pom.xml @@ -32,7 +32,7 @@ under the License. <name> Apache Tamaya Common Support Classes</name> <description>Apache Tamaya Support Classes useful when implementing the Tamaya SPI or code independent of the core RI implementation.</description> - <packaging>bundle</packaging> + <packaging>jar</packaging> <properties> <jdkVersion>1.7</jdkVersion> @@ -62,20 +62,4 @@ under the License. </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.tamaya.spisupport - </Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d672b2d9/modules/spring/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml index 7b09413..568a9b8 100644 --- a/modules/spring/pom.xml +++ b/modules/spring/pom.xml @@ -29,7 +29,7 @@ under the License. <artifactId>tamaya-spring</artifactId> <name>Apache Tamaya Spring Integration</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <properties> <spring.version>4.2.1.RELEASE</spring.version>
