tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject [02/12] incubator-tamaya git commit: TAMAYA-274: Simplified compiler settings, set version to 0.4-incubating-SNAPSHOT
Date Thu, 28 Sep 2017 20:03:38 GMT
TAMAYA-274: Simplified compiler settings, set version to 0.4-incubating-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/2c4ecc32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/2c4ecc32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/2c4ecc32

Branch: refs/heads/master
Commit: 2c4ecc329757207f14e0bdaaa4af1bd5a8a99dfb
Parents: 2278346
Author: anatole <anatole@apache.org>
Authored: Wed Aug 9 00:22:29 2017 +0200
Committer: Anatole Tresch <anatole@apache.org>
Committed: Thu Sep 28 21:52:11 2017 +0200

----------------------------------------------------------------------
 examples/11-distributed/pom.xml |  5 ++---
 pom.xml                         | 11 +++++------
 2 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/2c4ecc32/examples/11-distributed/pom.xml
----------------------------------------------------------------------
diff --git a/examples/11-distributed/pom.xml b/examples/11-distributed/pom.xml
index 72e5ac1..0f0bfe9 100644
--- a/examples/11-distributed/pom.xml
+++ b/examples/11-distributed/pom.xml
@@ -31,9 +31,8 @@
     <packaging>jar</packaging>
 
     <properties>
-        <jdkVersion>1.8</jdkVersion>
-        <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
-        <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
+        <maven.compile.targetLevel>1.8</maven.compile.targetLevel>
+        <maven.compile.sourceLevel>1.8</maven.compile.sourceLevel>
         <maven.compile.optimize>false</maven.compile.optimize>
         <maven.compile.deprecation>true</maven.compile.deprecation>
         <tamaya.version>0.3-incubating-SNAPSHOT</tamaya.version>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/2c4ecc32/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index affc2d5..cd8eda3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,11 +35,10 @@
     <properties>
         <commons-io.version>2.5</commons-io.version>
         <findbugs.skip>false</findbugs.skip>
-        <jdkVersion>1.8</jdkVersion>
         <osgi.version>5.0.0</osgi.version>
         <osgi.compendium.version>${osgi.version}</osgi.compendium.version>
-        <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
-        <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
+        <maven.compile.targetLevel>1.8</maven.compile.targetLevel>
+        <maven.compile.sourceLevel>1.8</maven.compile.sourceLevel>
         <maven.compile.optimize>false</maven.compile.optimize>
         <maven.compile.deprecation>true</maven.compile.deprecation>
         <maven.javadoc.skip>false</maven.javadoc.skip>
@@ -423,9 +422,9 @@
                     <version>3.6.0</version>
                     <configuration>
                         <debug>true</debug>
-                        <optimize>${maven.compile.optimize}</optimize>
                         <source>${maven.compile.sourceLevel}</source>
                         <target>${maven.compile.targetLevel}</target>
+                        <optimize>${maven.compile.optimize}</optimize>
                         <encoding>${project.build.sourceEncoding}</encoding>
                         <showDeprecation>${maven.compile.deprecation}</showDeprecation>
                     </configuration>
@@ -722,8 +721,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>${maven.compile.sourceLevel}</source>
+                    <target>${maven.compile.targetLevel}</target>
                 </configuration>
             </plugin>
             <plugin>


Mime
View raw message