Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master 8b94067b6 -> 4a70f5309
Fixed OSGI support. 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/4a70f530 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/4a70f530 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/4a70f530 Branch: refs/heads/master Commit: 4a70f5309b055646ed20f18ad6dcb47689655082 Parents: ad8dfd8 Author: anatole <anat...@apache.org> Authored: Sun Dec 18 23:51:55 2016 +0100 Committer: anatole <anat...@apache.org> Committed: Sun Dec 18 23:54:31 2016 +0100 ---------------------------------------------------------------------- modules/injection/cdi-ee/pom.xml | 30 +---------- modules/injection/cdi-se/pom.xml | 33 +----------- modules/injection/injection-api/pom.xml | 18 ------- modules/pom.xml | 81 ---------------------------- modules/spring/pom.xml | 28 ---------- pom.xml | 7 ++- 6 files changed, 8 insertions(+), 189 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4a70f530/modules/injection/cdi-ee/pom.xml ---------------------------------------------------------------------- diff --git a/modules/injection/cdi-ee/pom.xml b/modules/injection/cdi-ee/pom.xml index 8e3e3d3..89f05f9 100644 --- a/modules/injection/cdi-ee/pom.xml +++ b/modules/injection/cdi-ee/pom.xml @@ -28,7 +28,7 @@ under the License. <artifactId>tamaya-cdi</artifactId> <name>Apache Tamaya Modules - Injection CDI</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <properties> <owb.version>1.6.2</owb.version> @@ -43,34 +43,6 @@ under the License. <tomee.version>1.7.1</tomee.version> </properties> - <build> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <executions> - <execution> - <id>prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.tamaya.integration.cdi - </Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> <dependencies> <dependency> <groupId>org.apache.tamaya.ext</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4a70f530/modules/injection/cdi-se/pom.xml ---------------------------------------------------------------------- diff --git a/modules/injection/cdi-se/pom.xml b/modules/injection/cdi-se/pom.xml index 0f2e93a..712c57c 100644 --- a/modules/injection/cdi-se/pom.xml +++ b/modules/injection/cdi-se/pom.xml @@ -28,7 +28,7 @@ under the License. <artifactId>tamaya-cdi-se</artifactId> <name>Apache Tamaya Modules - Injection CDI (Direct)</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <properties> <owb.version>1.6.2</owb.version> @@ -40,37 +40,6 @@ under the License. <ds.version>1.1.0</ds.version> </properties> - <build> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <executions> - <execution> - <id>prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.tamaya.integration.cdi.config - </Export-Package> - <Private-Package> - org.apache.tamaya.integration.cdi.internal - </Private-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4a70f530/modules/injection/injection-api/pom.xml ---------------------------------------------------------------------- diff --git a/modules/injection/injection-api/pom.xml b/modules/injection/injection-api/pom.xml index bb7624e..47aaeca 100644 --- a/modules/injection/injection-api/pom.xml +++ b/modules/injection/injection-api/pom.xml @@ -60,22 +60,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.api, - org.apache.tamaya.inject.spi - </Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4a70f530/modules/pom.xml ---------------------------------------------------------------------- diff --git a/modules/pom.xml b/modules/pom.xml index b6301d0..a8b3bb3 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -46,85 +46,4 @@ under the License. <module>spring</module> </modules> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <configuration> - <logViolationsToConsole>true</logViolationsToConsole> - <configLocation>checkstyle/style.xml</configLocation> - </configuration> - - <dependencies> - <dependency> - <groupId>org.apache.tamaya</groupId> - <artifactId>buildconfigurations</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>enforce-versions</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireJavaVersion> - <version>[1.7,)</version> - </requireJavaVersion> - </rules> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <configuration> - <failOnError>false</failOnError> - <excludeFilterFile>findbugs/findbugs-exclude.xml</excludeFilterFile> - </configuration> - <dependencies> - <dependency> - <groupId>org.apache.tamaya</groupId> - <artifactId>buildconfigurations</artifactId> - <version>${project.version}</version> - </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> - - </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4a70f530/modules/spring/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml index 568a9b8..e3f4ed0 100644 --- a/modules/spring/pom.xml +++ b/modules/spring/pom.xml @@ -36,34 +36,6 @@ under the License. <spring.boot.version>1.2.6.RELEASE</spring.boot.version> </properties> - <build> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <executions> - <execution> - <id>prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.tamaya.integration.spring - </Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4a70f530/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7258a77..55cccbb 100644 --- a/pom.xml +++ b/pom.xml @@ -500,6 +500,7 @@ under the License. <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> <addMavenDescriptor>false</addMavenDescriptor> <manifestEntries> <Specification-Title>Apache ${project.name}</Specification-Title> @@ -614,7 +615,6 @@ under the License. </plugins> </pluginManagement> - <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -653,6 +653,7 @@ under the License. </execution> </executions> </plugin> + <plugin> <artifactId>maven-resources-plugin</artifactId> <executions> @@ -691,6 +692,9 @@ under the License. <requireMavenVersion> <version>3.0.5</version> </requireMavenVersion> + <requireJavaVersion> + <version>[1.7,)</version> + </requireJavaVersion> </rules> </configuration> </execution> @@ -942,6 +946,7 @@ under the License. <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> + <version>${rat.version}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId>
