Define the JDK version in a Maven property

This commit is contained in:
Ignasi Barrera 2017-10-25 08:39:30 +02:00
parent 4327e658ba
commit a03e047da6

View File

@ -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>
<clojure.version>1.3.0</clojure.version>
@ -1425,7 +1426,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>
@ -1439,35 +1440,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>