You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/06/15 10:21:33 UTC

[6/8] wicket git commit: Cleanup of Maven's compiler settings

Cleanup of Maven's compiler settings


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b9718f9c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b9718f9c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b9718f9c

Branch: refs/heads/WICKET-5906-7.x
Commit: b9718f9c7e537ffc08fbbb6fb9c793b6bca8fadb
Parents: 5e73409
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Jun 12 13:51:29 2015 +0200
Committer: Andrea Del Bene <“adelbene@apache.org”>
Committed: Mon Jun 15 10:20:28 2015 +0200

----------------------------------------------------------------------
 pom.xml | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/b9718f9c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d28c9ce..6b11c5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache</groupId>
 		<artifactId>apache</artifactId>
-		<version>14</version>
+		<version>17</version>
 	</parent>
 	<groupId>org.apache.wicket</groupId>
 	<artifactId>wicket-parent</artifactId>
@@ -118,9 +118,14 @@
 		<!-- Encoding -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		
+
+		<maven.compiler.optimize>true</maven.compiler.optimize>
+		<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
+		<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
+		<maven.compiler.source>1.7</maven.compiler.source>
+		<maven.compiler.target>1.7</maven.compiler.target>
+
 		<!-- Project Versions -->
-		<mvn.build.java.version>1.7</mvn.build.java.version>
 		<jacoco.version>0.7.4.201502262128</jacoco.version>
 		<jetty.version>8.1.17.v20150415</jetty.version>
 		<jetty9.version>9.0.7.v20131107</jetty9.version>
@@ -677,19 +682,10 @@
 					<version>2.3</version>
 				</plugin>
 				<plugin>
-					<inherited>true</inherited>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.3</version>
-					<configuration>
-						<source>${mvn.build.java.version}</source>
-						<target>${mvn.build.java.version}</target>
-						<compilerVersion>${mvn.build.java.version}</compilerVersion>
-						<encoding>${project.build.sourceEncoding}</encoding>
-						<showWarnings>true</showWarnings>
-						<optimize>true</optimize>
-						<debug>true</debug>
-					</configuration>
+					<inherited>true</inherited>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>