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 2015/01/09 22:25:24 UTC

incubator-tamaya git commit: TAMAYA-55 Java 8 is now only the the modules enforced where Java 7 is not supported.

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 8a026d6cb -> 671df88ec


TAMAYA-55 Java 8 is now only the the modules enforced where Java 7 is not supported.


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

Branch: refs/heads/master
Commit: 671df88ec0ab9ec7b4b62345494c88a01bf34245
Parents: 8a026d6
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Fri Jan 9 22:24:43 2015 +0100
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Fri Jan 9 22:24:43 2015 +0100

----------------------------------------------------------------------
 java7/pom.xml   |  1 -
 java8/pom.xml   | 24 ++++++++++++++++++++++++
 modules/pom.xml | 26 ++++++++++++++++++++++++++
 pom.xml         |  7 +++++++
 4 files changed, 57 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/671df88e/java7/pom.xml
----------------------------------------------------------------------
diff --git a/java7/pom.xml b/java7/pom.xml
index 3c1a80d..a71ef92 100644
--- a/java7/pom.xml
+++ b/java7/pom.xml
@@ -51,7 +51,6 @@ under the License.
                         <!-- use java7 to compile the modules in this tree -->
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-toolchains-plugin</artifactId>
-                        <version>1.1</version>
                         <executions>
                             <execution>
                                 <goals>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/671df88e/java8/pom.xml
----------------------------------------------------------------------
diff --git a/java8/pom.xml b/java8/pom.xml
index 5b1d53b..291b84b 100644
--- a/java8/pom.xml
+++ b/java8/pom.xml
@@ -35,4 +35,28 @@ under the License.
         <module>api</module>
         <module>core</module>
     </modules>
+
+    <build>
+        <plugins>
+            <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.8,)</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/671df88e/modules/pom.xml
----------------------------------------------------------------------
diff --git a/modules/pom.xml b/modules/pom.xml
index bf7d619..e1dd591 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -26,6 +26,7 @@ under the License.
         <version>0.1-incubating-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
+
     <artifactId>tamaya-extensions</artifactId>
     <groupId>org.apache.tamaya.ext</groupId>
     <name>Apache Tamaya Extension Modules</name>
@@ -42,4 +43,29 @@ under the License.
         <!-- module>integration</module -->
     </modules>
 
+    <build>
+        <plugins>
+            <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.8,)</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/671df88e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 09a7fc9..65631d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,7 @@ under the License.
         <jruby.version>1.7.16.1</jruby.version>
         <findbugs.version>3.0.0</findbugs.version>
         <rat.version>0.11</rat.version>
+        <toolchains.plugin>1.1</toolchains.plugin>
     </properties>
 
     <licenses>
@@ -261,6 +262,12 @@ under the License.
                 </plugin>
 
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-toolchains-plugin</artifactId>
+                    <version>${toolchains.plugin}</version>
+                </plugin>
+
+                <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>findbugs-maven-plugin</artifactId>
                     <version>${findbugs.version}</version>