From 71fc1bd5aa5989880b91eb57944f650491d7443b Mon Sep 17 00:00:00 2001
From: Ignasi Barrera <nacx@apache.org>
Date: Wed, 25 Oct 2017 08:39:30 +0200
Subject: [PATCH] Define the JDK version in a Maven property

---
 project/pom.xml | 33 +++------------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/project/pom.xml b/project/pom.xml
index aa8a506b044..0fe78c42440 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -219,6 +219,7 @@
   <properties>
     <maven.compile.source>1.6</maven.compile.source>
     <maven.compile.target>1.6</maven.compile.target>
+    <jdk.version>1.7</jdk.version>
     <maven.compile.deprecation>true</maven.compile.deprecation>
     <maven.site.url.base>gitsite:git@github.com/jclouds/jclouds-maven-site.git</maven.site.url.base>
     <guava.version>18.0</guava.version>
@@ -1379,7 +1380,7 @@
       <id>jenkins</id>
       <build>
         <plugins>
-          <!-- make sure jclouds is built with the right JDK -->
+          <!-- Make sure jclouds is built with the right JDK -->
           <plugin>
             <artifactId>maven-toolchains-plugin</artifactId>
             <version>1.1</version>
@@ -1393,35 +1394,7 @@
             <configuration>
               <toolchains>
                 <jdk>
-                  <version>1.7</version>
-                  <vendor>oracle</vendor>
-                </jdk>
-              </toolchains>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>jenkins-jdk8</id>
-      <build>
-        <plugins>
-          <!-- make sure jclouds is built with the right JDK -->
-          <plugin>
-            <artifactId>maven-toolchains-plugin</artifactId>
-            <version>1.1</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>toolchain</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <toolchains>
-                <jdk>
-                  <version>1.8</version>
-                  <vendor>openjdk</vendor>
+                  <version>${jdk.version}</version>
                 </jdk>
               </toolchains>
             </configuration>