You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by pl...@apache.org on 2014/12/06 22:19:51 UTC
incubator-tamaya git commit: Clean-up of the POMs.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master cd87f5933 -> 653b94bd4
Clean-up of the POMs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/653b94bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/653b94bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/653b94bd
Branch: refs/heads/master
Commit: 653b94bd4ae82ac9760576ed27e52af63049b7e1
Parents: cd87f59
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Sat Dec 6 22:19:29 2014 +0100
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Sat Dec 6 22:19:29 2014 +0100
----------------------------------------------------------------------
api/pom.xml | 11 -----------
core/pom.xml | 13 +------------
modules/cdi/pom.xml | 11 -----------
modules/managed/pom.xml | 11 -----------
modules/pom.xml | 2 +-
5 files changed, 2 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/653b94bd/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 78bd2b1..78925f5 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -35,8 +35,6 @@ under the License.
<packaging>jar</packaging>
<properties>
- <maven.compile.targetLevel>1.8</maven.compile.targetLevel>
- <maven.compile.sourceLevel>1.8</maven.compile.sourceLevel>
</properties>
<build>
@@ -58,19 +56,10 @@ under the License.
<keywords>true</keywords>
<linksource>false</linksource>
<failOnError>false</failOnError>
- <source>${maven.compile.sourceLevel}</source>
<verbose>false</verbose>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.sourceLevel}</source>
- <target>${maven.compile.targetLevel}</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/653b94bd/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index e2bafce..79d401c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -31,12 +31,9 @@ under the License.
<packaging>jar</packaging>
<properties>
- <jdkVersion>1.8</jdkVersion>
<slf4j.version>1.7.2</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<log4j2.version>2.1</log4j2.version>
- <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
- <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
</properties>
<build>
@@ -76,14 +73,6 @@ under the License.
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.sourceLevel}</source>
- <target>${maven.compile.targetLevel}</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<executions>
@@ -113,7 +102,7 @@ under the License.
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/653b94bd/modules/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cdi/pom.xml b/modules/cdi/pom.xml
index 07f4389..b7e6191 100644
--- a/modules/cdi/pom.xml
+++ b/modules/cdi/pom.xml
@@ -31,9 +31,6 @@ under the License.
<packaging>jar</packaging>
<properties>
- <jdkVersion>1.8</jdkVersion>
- <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
- <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
<owb.version>1.5.0-SNAPSHOT</owb.version>
<weld.version>2.2.7.Final</weld.version>
<geronimo-jcdi-1.1-spec.version>1.0-SNAPSHOT</geronimo-jcdi-1.1-spec.version>
@@ -57,14 +54,6 @@ under the License.
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.sourceLevel}</source>
- <target>${maven.compile.targetLevel}</target>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/653b94bd/modules/managed/pom.xml
----------------------------------------------------------------------
diff --git a/modules/managed/pom.xml b/modules/managed/pom.xml
index 97c8f73..53575d8 100644
--- a/modules/managed/pom.xml
+++ b/modules/managed/pom.xml
@@ -31,9 +31,6 @@ under the License.
<packaging>jar</packaging>
<properties>
- <jdkVersion>1.8</jdkVersion>
- <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
- <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
</properties>
<build>
@@ -50,14 +47,6 @@ under the License.
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.sourceLevel}</source>
- <target>${maven.compile.targetLevel}</target>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/653b94bd/modules/pom.xml
----------------------------------------------------------------------
diff --git a/modules/pom.xml b/modules/pom.xml
index a4be3a3..978bc81 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -41,7 +41,7 @@ under the License.
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>