You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2016/07/03 12:32:24 UTC
[2/2] wicket git commit: Updated dependencies to newer versions
Updated dependencies to newer versions
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/049f81a0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/049f81a0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/049f81a0
Branch: refs/heads/master
Commit: 049f81a058c87efb06d1978762a6d77aec954ec3
Parents: 4857b1b
Author: Martijn Dashorst <da...@apache.org>
Authored: Sun Jul 3 14:32:17 2016 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Sun Jul 3 14:32:17 2016 +0200
----------------------------------------------------------------------
pom.xml | 18 +++++++++---------
testing/wicket-arquillian/pom.xml | 3 +--
wicket-examples/pom.xml | 12 ++++++------
wicket-experimental/wicket-atmosphere/pom.xml | 2 +-
.../wicket-native-websocket-tomcat/pom.xml | 2 +-
5 files changed, 18 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/049f81a0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 20f44bf..09cebb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
<!-- Project Versions -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
- <jetty.version>9.3.5.v20151012</jetty.version>
+ <jetty.version>9.3.10.v20160621</jetty.version>
<joda-time.version>2.9.4</joda-time.version>
<junit.version>4.12</junit.version>
<spring.version>4.3.0.RELEASE</spring.version>
@@ -138,7 +138,7 @@
<mockito.version>1.10.19</mockito.version>
<slf4j.version>1.7.21</slf4j.version>
<hamcrest.version>2.0.0.0</hamcrest.version>
- <objenesis.version>2.2</objenesis.version>
+ <objenesis.version>2.4</objenesis.version>
<!-- do not increase the version - wicket-user-guide requires 2.2.4 -->
<grails.version>2.2.4</grails.version>
<aspectj.version>1.8.9</aspectj.version>
@@ -168,7 +168,7 @@
<groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId>
<scope>provided</scope>
- <version>2.3.2-b01</version>
+ <version>2.3.2-b02</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
@@ -234,7 +234,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>19.0</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
@@ -424,7 +424,7 @@
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet</artifactId>
- <version>2.2.4.Final</version>
+ <version>2.2.5.Final</version>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
@@ -434,7 +434,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
- <version>5.0.4</version>
+ <version>5.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -493,13 +493,13 @@
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
- <version>3.0.1-b05</version>
+ <version>3.0.1-b08</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>el-impl</artifactId>
- <version>2.2</version>
+ <version>2.2.1-b05</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -517,7 +517,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>5.2.2.Final</version>
+ <version>5.2.4.Final</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/049f81a0/testing/wicket-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml
index 26c9c0f..a6cba0c 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -37,11 +37,10 @@
</description>
<properties>
- <arquillian.version>1.1.10.Final</arquillian.version>
+ <arquillian.version>1.1.11.Final</arquillian.version>
<maven.dependency.plugin.version>2.10</maven.dependency.plugin.version>
<maven.surefire.plugin.version>2.18.1</maven.surefire.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <slf4j.version>1.7.12</slf4j.version>
<wildfly.version>8.2.1.Final</wildfly.version>
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
<jee.spec.version>1.0.3.Final</jee.spec.version>
http://git-wip-us.apache.org/repos/asf/wicket/blob/049f81a0/wicket-examples/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index f7c70c7..03043a3 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -44,9 +44,9 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>com.uwyn</groupId>
+ <groupId>org.codelibs</groupId>
<artifactId>jhighlight</artifactId>
- <version>1.0</version>
+ <version>1.0.3</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
@@ -102,10 +102,6 @@
<artifactId>cage</artifactId>
</dependency>
<dependency>
- <groupId>com.uwyn</groupId>
- <artifactId>jhighlight</artifactId>
- </dependency>
- <dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<scope>compile</scope>
@@ -163,6 +159,10 @@
<artifactId>wicket-atmosphere</artifactId>
</dependency>
<dependency>
+ <groupId>org.codelibs</groupId>
+ <artifactId>jhighlight</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>compile</scope>
http://git-wip-us.apache.org/repos/asf/wicket/blob/049f81a0/wicket-experimental/wicket-atmosphere/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/pom.xml b/wicket-experimental/wicket-atmosphere/pom.xml
index 44fbf19..2109367 100644
--- a/wicket-experimental/wicket-atmosphere/pom.xml
+++ b/wicket-experimental/wicket-atmosphere/pom.xml
@@ -42,7 +42,7 @@
</repositories>
<properties>
<atmosphere.version>2.2.8</atmosphere.version>
- <jquery.atmosphere.version>2.2.7</jquery.atmosphere.version>
+ <jquery.atmosphere.version>2.2.13</jquery.atmosphere.version>
</properties>
<dependencyManagement>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/049f81a0/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml b/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
index 3042f85..02f0ae5 100644
--- a/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
@@ -28,7 +28,7 @@
<name>Wicket Native WebSocket Tomcat 7.x</name>
<description>Provides the code specific to integrate with Tomcat web container</description>
<properties>
- <tomcat.version>7.0.55</tomcat.version>
+ <tomcat.version>7.0.70</tomcat.version>
</properties>
<dependencyManagement>
<dependencies>