You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2017/03/13 19:50:08 UTC

[2/2] wicket git commit: Remove implicit class modifiers

Remove implicit class modifiers


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

Branch: refs/heads/master
Commit: b5a0f65f0b3a7aed2e6eae203053ddaa5c858132
Parents: 247ef29
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Mar 7 21:47:49 2017 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Mar 13 20:50:01 2017 +0100

----------------------------------------------------------------------
 .../src/main/resources/archetype-resources/pom.xml     |  6 +++---
 pom.xml                                                | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/b5a0f65f/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
index d72a73b..b599b4b 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
@@ -43,9 +43,9 @@
 	</licenses>
 	<properties>
 		<wicket.version>@project.version@</wicket.version>
-		<jetty9.version>9.4.0.v20161208</jetty9.version>
-		<log4j.version>2.8</log4j.version>
-		<junit.version>4.12</junit.version>
+		<jetty9.version>@jetty.version@</jetty9.version>
+		<log4j.version>@log4j.version@</log4j.version>
+		<junit.version>@junit.version@</junit.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- allowed values: R7, 1.0, 1.5, 2.0 or none -->
 		<wtp.version>none</wtp.version>

http://git-wip-us.apache.org/repos/asf/wicket/blob/b5a0f65f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 70cf8d4..69099da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,19 +128,20 @@
 
 		<!-- Project Versions -->
 		<jacoco.version>0.7.9</jacoco.version>
-		<jetty.version>9.4.0.v20161208</jetty.version>
+		<jetty.version>9.4.2.v20170220</jetty.version>
 		<joda-time.version>2.9.7</joda-time.version>
 		<junit.version>4.12</junit.version>
-		<spring.version>4.3.6.RELEASE</spring.version>
+		<spring.version>4.3.7.RELEASE</spring.version>
 		<servlet-api.version>3.1.0</servlet-api.version>
 		<maven.javadoc.version>2.10.4</maven.javadoc.version>
 		<maven.surefire.version>2.19.1</maven.surefire.version>
-		<mockito.version>2.6.9</mockito.version>
-		<slf4j.version>1.7.22</slf4j.version>
+		<mockito.version>2.7.14</mockito.version>
+		<slf4j.version>1.7.24</slf4j.version>
+		<log4j.version>2.8.1</log4j.version>
 		<hamcrest.version>2.0.0.0</hamcrest.version>
 		<objenesis.version>2.5.1</objenesis.version>
 		<aspectj.version>1.8.10</aspectj.version>
-		<metrics.version>3.1.2</metrics.version>
+		<metrics.version>3.1.3</metrics.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -407,7 +408,7 @@
 			<dependency>
 				<groupId>com.github.openjson</groupId>
 				<artifactId>openjson</artifactId>
-				<version>1.0.0</version>
+				<version>1.0.1</version>
 				<type>jar</type>
 			</dependency>
 			<dependency>