GeekCodingX
diff --git a/‎pom.xml‎
Lines changed: 23 additions & 18 deletions b/‎pom.xml‎
Lines changed: 23 additions & 18 deletions
@@ -48,8 +48,8 @@
 
   <properties>
     <jdk.version>1.7</jdk.version>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>${jdk.version}</maven.compiler.source>
+    <maven.compiler.target>${jdk.version}</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <junit.version>4.12</junit.version>
     <hamcrest.version>1.3</hamcrest.version>
@@ -375,6 +375,7 @@
         <version>1.1</version>
         <executions>
           <execution>
+            <id>toolchain</id>
             <goals>
               <goal>toolchain</goal>
             </goals>
@@ -395,36 +396,40 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>${compiler-plugin.version}</version>
         <executions>
-        
-          <!-- Java 9 compilation  -->
-          <execution>
-            <id>default-compile</id>
-            <configuration>
-              <jdkToolchain>
-                <version>9</version>
-              </jdkToolchain>
-              <!-- compile everything to ensure module-info contains right entries -->
-              <release>9</release>
-            </configuration>
-          </execution>
-        
-          <!-- Java targetVM compilation  -->
+
           <execution>
             <id>base-compile</id>
             <goals>
               <goal>compile</goal>
             </goals>
-            <!-- recompile everything for target VM except the module-info.java -->
             <configuration>
               <excludes>
                 <exclude>module-info.java</exclude>
               </excludes>
             </configuration>
+          </execution> 
+
+          <execution>
+            <id>default-compile</id>
+            <configuration>
+              <jdkToolchain>
+                <version>9</version>
+              </jdkToolchain>
+              <release>9</release>
+            </configuration>
           </execution>
         </executions>
+        <configuration>
+          <jdkToolchain>
+            <version>[1.7,9)</version>
+          </jdkToolchain>
+          <source>${jdk.version}</source>
+          <target>${jdk.version}</target>
+        </configuration>
       </plugin>
-  
+
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>