Improve configuaration for IT's.

codehaus-plexus · Oct 27, 2018 · af7a3a1 · af7a3a1
1 parent 1e2f637
commit af7a3a1
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 19 deletions.
diff --git a/modello-maven-plugin/pom.xml b/modello-maven-plugin/pom.xml
@@ -188,6 +188,7 @@
               <filterProperties>
                 <plexusUtilsVersion>3.0.22</plexusUtilsVersion>
                 <junitVersion>3.8.2</junitVersion>
+                <java.version>${java.version}</java.version>
               </filterProperties>
               <goals>
                 <goal>clean</goal>

diff --git a/modello-maven-plugin/src/it/clone-java5/pom.xml b/modello-maven-plugin/src/it/clone-java5/pom.xml
@@ -33,8 +33,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
         </configuration>
       </plugin>
       <plugin>

diff --git a/modello-maven-plugin/src/it/clone/pom.xml b/modello-maven-plugin/src/it/clone/pom.xml
@@ -33,8 +33,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
         </configuration>
       </plugin>
       <plugin>

diff --git a/modello-maven-plugin/src/it/dom4j-no-plexus-utils/pom.xml b/modello-maven-plugin/src/it/dom4j-no-plexus-utils/pom.xml
@@ -31,8 +31,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
         </configuration>
       </plugin>
       <plugin>

diff --git a/modello-maven-plugin/src/it/features/pom.xml b/modello-maven-plugin/src/it/features/pom.xml
@@ -55,8 +55,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
         </configuration>
       </plugin>
       <plugin>

diff --git a/modello-maven-plugin/src/it/javadoc/pom.xml b/modello-maven-plugin/src/it/javadoc/pom.xml
@@ -39,8 +39,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
         </configuration>
       </plugin>
       <plugin>

diff --git a/modello-maven-plugin/src/it/jdom-no-plexus-utils/pom.xml b/modello-maven-plugin/src/it/jdom-no-plexus-utils/pom.xml
@@ -31,8 +31,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
         </configuration>
       </plugin>
       <plugin>

diff --git a/modello-maven-plugin/src/it/maven-model/pom.xml b/modello-maven-plugin/src/it/maven-model/pom.xml
@@ -14,8 +14,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
         </configuration>
       </plugin>
       <plugin>

diff --git a/modello-maven-plugin/src/it/stax-no-plexus-utils/pom.xml b/modello-maven-plugin/src/it/stax-no-plexus-utils/pom.xml
@@ -37,8 +37,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
         </configuration>
       </plugin>
       <plugin>

diff --git a/pom.xml b/pom.xml
@@ -231,6 +231,12 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.version>3.0</maven.version>
     <jackson.version>2.9.7</jackson.version>
+    <!--
+      ! This controls the minimum java version
+      ! and also the version which is used
+      ! in the integration tests.
+    -->
+    <java.version>1.7</java.version>
   </properties>
 
   <dependencyManagement>
@@ -395,8 +401,8 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.8.0</version>
           <configuration>
-            <source>1.7</source>
-            <target>1.7</target>
+            <source>${java.version}</source>
+            <target>${java.version}</target>
           </configuration>
         </plugin>
         <plugin>
@@ -427,7 +433,7 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>1.6.0</version>
+                  <version>${java.version}</version>
                 </requireJavaVersion>
                 <requireMavenVersion>
                   <version>3.0.5</version>