Repository: wicket Updated Branches: refs/heads/master 776ef8142 -> c2a4dd391
Library updates Jetty: 9.2.6 Log4j: 2.1.0 JUnit: 4.12 Mockito: 1.10.16 SLF4J: 1.7.8 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c2a4dd39 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c2a4dd39 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c2a4dd39 Branch: refs/heads/master Commit: c2a4dd39151c558463e1a49c1685d027819d9a1b Parents: 776ef81 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Mon Dec 15 22:28:22 2014 +0200 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Mon Dec 15 22:28:22 2014 +0200 ---------------------------------------------------------------------- .../quickstart/src/main/resources/archetype-resources/pom.xml | 6 +++--- pom.xml | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c2a4dd39/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 2faa032..1e41b1d 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>7.0.0-SNAPSHOT</wicket.version> - <jetty9.version>9.2.3.v20140905</jetty9.version> - <log4j.version>2.0.2</log4j.version> - <junit.version>4.11</junit.version> + <jetty9.version>9.2.6.v20141205</jetty9.version> + <log4j.version>2.1</log4j.version> + <junit.version>4.12</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/c2a4dd39/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6443b15..194853e 100644 --- a/pom.xml +++ b/pom.xml @@ -118,12 +118,13 @@ <jacoco.version>0.7.1.201405082137</jacoco.version> <jetty.version>8.1.16.v20140903</jetty.version> <jetty9.version>9.0.7.v20131107</jetty9.version> + <junit.version>4.12</junit.version> <spring.version>4.1.2.RELEASE</spring.version> <servlet-api.version>3.0.1</servlet-api.version> <maven.javadoc.version>2.10.1</maven.javadoc.version> <maven.surefire.version>2.18</maven.surefire.version> - <mockito.version>1.9.5</mockito.version> - <slf4j.version>1.7.7</slf4j.version> + <mockito.version>1.10.16</mockito.version> + <slf4j.version>1.7.8</slf4j.version> <hamcrest.version>1.3</hamcrest.version> </properties> <dependencyManagement> @@ -436,7 +437,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency>
