Repository: wicket Updated Branches: refs/heads/master 7d5554735 -> c1c0785ee
WICKET-5990 Upgrade Jetty usage in Wicket tests/quickstart to Jetty 9.3.x Upgrade the archetype to Jetty 9.3.x Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c1c0785e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c1c0785e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c1c0785e Branch: refs/heads/master Commit: c1c0785ee468165991be11a05d7ebcac3564afc4 Parents: 7d55547 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Sat Oct 3 14:04:37 2015 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Sat Oct 3 14:04:37 2015 +0200 ---------------------------------------------------------------------- .../quickstart/src/main/resources/archetype-resources/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c1c0785e/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 8442b32..30a8b9b 100644 --- a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml @@ -43,7 +43,7 @@ </licenses> <properties> <wicket.version>7.0.0-SNAPSHOT</wicket.version> - <jetty9.version>9.2.13.v20150730</jetty9.version> + <jetty9.version>9.3.3.v20150827</jetty9.version> <log4j.version>2.4</log4j.version> <junit.version>4.12</junit.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> http://git-wip-us.apache.org/repos/asf/wicket/blob/c1c0785e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e16788d..b648e95 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ <joda-time.version>2.7</joda-time.version> <junit.version>4.12</junit.version> <spring.version>4.2.1.RELEASE</spring.version> - <servlet-api.version>3.0.1</servlet-api.version> + <servlet-api.version>3.1.0</servlet-api.version> <maven.javadoc.version>2.10.3</maven.javadoc.version> <maven.surefire.version>2.18</maven.surefire.version> <mockito.version>1.10.16</mockito.version>
