Repository: jclouds Updated Branches: refs/heads/2.0.x 4327e658b -> f1126a113
Define the JDK version in a Maven property Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/a03e047d Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/a03e047d Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/a03e047d Branch: refs/heads/2.0.x Commit: a03e047da67338195be13649ef13860c3b410b88 Parents: 4327e65 Author: Ignasi Barrera <[email protected]> Authored: Wed Oct 25 08:39:30 2017 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Thu Nov 30 09:13:39 2017 +0100 ---------------------------------------------------------------------- project/pom.xml | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/a03e047d/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index fcc32d7..28a228d 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:[email protected]/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>
