Use maven toolchains for releases
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fe2a75fe Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fe2a75fe Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fe2a75fe Branch: refs/heads/wicket-6.x Commit: fe2a75fe412a12669153416d5266275c92d99011 Parents: f85371d Author: Martijn Dashorst <[email protected]> Authored: Sun Jun 7 22:05:26 2015 +0200 Committer: Martijn Dashorst <[email protected]> Committed: Tue Jun 9 17:14:19 2015 +0200 ---------------------------------------------------------------------- pom.xml | 27 +++++++++++++++++++++++++-- release-dashorst.sh | 2 +- 2 files changed, 26 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/fe2a75fe/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 929835b..197152a 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,8 @@ <jetty.version>7.6.15.v20140411</jetty.version> <jetty9.version>9.0.6.v20130930</jetty9.version> <spring.version>3.0.7.RELEASE</spring.version> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> <maven.javadoc.version>2.9.1</maven.javadoc.version> <maven.surefire.version>2.12.2</maven.surefire.version> <!-- do not increase the version - wicket-user-guide requires 2.2.4 --> @@ -83,6 +85,10 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-toolchains-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <inherited>true</inherited> <configuration> @@ -667,8 +673,6 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.5.1</version> <configuration> - <source>1.6</source> - <target>1.6</target> <optimize>true</optimize> <debug>true</debug> </configuration> @@ -710,6 +714,25 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-toolchains-plugin</artifactId> + <version>1.1</version> + <executions> + <execution> + <goals> + <goal>toolchain</goal> + </goals> + </execution> + </executions> + <configuration> + <toolchains> + <jdk> + <version>${maven.compiler.source}</version> + </jdk> + </toolchains> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> <version>2.2</version> <configuration> http://git-wip-us.apache.org/repos/asf/wicket/blob/fe2a75fe/release-dashorst.sh ---------------------------------------------------------------------- diff --git a/release-dashorst.sh b/release-dashorst.sh index 6735425..fc300ef 100755 --- a/release-dashorst.sh +++ b/release-dashorst.sh @@ -79,7 +79,7 @@ EOF # set -e -export JAVA_HOME=`/usr/libexec/java_home -v1.6` +#export JAVA_HOME=`/usr/libexec/java_home -v1.6` echo " Apache Wicket Release script
