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 2013/05/02 22:14:08 UTC
git commit: WICKET-5175 Upgrade dependencies to their latest stable
versions
Updated Branches:
refs/heads/master a76a47891 -> 7a2259e0f
WICKET-5175 Upgrade dependencies to their latest stable versions
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7a2259e0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7a2259e0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7a2259e0
Branch: refs/heads/master
Commit: 7a2259e0feaa8eb90ae5168d19d1ceff3b05ad71
Parents: a76a478
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu May 2 22:13:13 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu May 2 22:13:13 2013 +0200
----------------------------------------------------------------------
pom.xml | 58 ++++++++------
.../validation/DefaultPropertyResolverTest.java | 2 +-
wicket-ioc/pom.xml | 6 +-
.../injection/CompoundFieldValueFactoryTest.java | 13 ++--
wicket-spring/pom.xml | 2 +-
.../wicket/spring/test/ApplicationContextMock.java | 14 +++-
6 files changed, 60 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7a2259e0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3fa4f6d..3e4d0f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,10 +32,13 @@
<mvn.build.java.version>1.7</mvn.build.java.version>
<jetty.version>8.1.10.v20130312</jetty.version>
<jetty9.version>9.0.2.v20130417</jetty9.version>
- <spring.version>3.0.7.RELEASE</spring.version>
+ <spring.version>3.2.2.RELEASE</spring.version>
<servlet-api.version>3.0.1</servlet-api.version>
<maven.javadoc.version>2.8.1</maven.javadoc.version>
<maven.surefire.version>2.12.2</maven.surefire.version>
+ <mockito.version>1.9.5</mockito.version>
+ <slf4j.version>1.7.5</slf4j.version>
+ <hamcrest.version>1.3</hamcrest.version>
</properties>
<modules>
<module>wicket</module>
@@ -345,25 +348,25 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
- <version>1.3</version>
+ <version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
- <version>1.3</version>
+ <version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.8.5</version>
+ <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -375,22 +378,22 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.4</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
- <version>1.6.4</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.6.4</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -429,7 +432,7 @@
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -445,7 +448,12 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
- <version>2.2.2</version>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <version>4.1</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
@@ -469,10 +477,10 @@
<version>3.0</version>
</dependency>
<dependency>
- <groupId>easymock</groupId>
+ <groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>1.2_Java1.3</version>
- <scope>provided</scope>
+ <version>3.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.httpunit</groupId>
@@ -518,7 +526,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</extension>
</extensions>
<resources>
@@ -614,12 +622,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.4.1</version>
<inherited>true</inherited>
<configuration>
<pushChanges>false</pushChanges>
@@ -645,7 +653,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.1</version>
<configuration>
<source>${mvn.build.java.version}</source>
<target>${mvn.build.java.version}</target>
@@ -681,7 +689,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<configuration>
<warName>${project.artifactId}</warName>
</configuration>
@@ -727,13 +735,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
</plugin>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -779,7 +787,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<executions>
<execution>
<goals>
@@ -824,7 +832,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
- <version>1.3.0</version>
+ <version>1.3.2</version>
<configuration>
<statistics>true</statistics>
<jswarn>false</jswarn>
@@ -844,7 +852,7 @@
<version>2.5</version>
<configuration>
<skip>true</skip> <!-- Disabled until 7.0 -->
- <comparisonVersion>6.0.0</comparisonVersion>
+ <comparisonVersion>7.0.0</comparisonVersion>
<failOnError>true</failOnError>
<logResults>true</logResults>
<ignored>
@@ -875,7 +883,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<reportSets>
<reportSet>
<reports>
http://git-wip-us.apache.org/repos/asf/wicket/blob/7a2259e0/wicket-experimental/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java b/wicket-experimental/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java
index 227e3d3..3f90170 100644
--- a/wicket-experimental/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java
+++ b/wicket-experimental/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
public class DefaultPropertyResolverTest
{
@Rule
- public static WicketTesterScope scope = new WicketTesterScope();
+ public WicketTesterScope scope = new WicketTesterScope();
public static class Bean1
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/7a2259e0/wicket-ioc/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml
index ad249ad..ee77d09 100644
--- a/wicket-ioc/pom.xml
+++ b/wicket-ioc/pom.xml
@@ -41,11 +41,15 @@
<artifactId>cglib</artifactId>
</dependency>
<dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
- <groupId>easymock</groupId>
+ <groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/7a2259e0/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java b/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
index 93b9315..8db6ea5 100644
--- a/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
+++ b/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
@@ -20,7 +20,8 @@ import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.List;
-import org.easymock.MockControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -37,7 +38,7 @@ public class CompoundFieldValueFactoryTest extends Assert
private Field field;
- private final MockControl[] ctrl = new MockControl[4];
+ private final IMocksControl[] ctrl = new IMocksControl[4];
private final IFieldValueFactory[] fact = new IFieldValueFactory[4];
@@ -52,8 +53,8 @@ public class CompoundFieldValueFactoryTest extends Assert
for (int i = 0; i < 4; i++)
{
- ctrl[i] = MockControl.createControl(IFieldValueFactory.class);
- fact[i] = (IFieldValueFactory)ctrl[i].getMock();
+ ctrl[i] = EasyMock.createControl();
+ fact[i] = ctrl[i].createMock(IFieldValueFactory.class);
}
}
@@ -61,7 +62,7 @@ public class CompoundFieldValueFactoryTest extends Assert
{
for (int i = 0; i < cnt; i++)
{
- ctrl[i].expectAndReturn(fact[i].getFieldValue(field, this), null);
+ EasyMock.expect(fact[i].getFieldValue(field, this)).andReturn(null);
ctrl[i].replay();
}
}
@@ -160,7 +161,7 @@ public class CompoundFieldValueFactoryTest extends Assert
public void testBreakOnNonNullReturn()
{
prepare(2);
- ctrl[2].expectAndReturn(fact[2].getFieldValue(field, this), new Object());
+ EasyMock.expect(fact[2].getFieldValue(field, this)).andReturn(new Object());
ctrl[2].replay();
ctrl[3].replay();
List<IFieldValueFactory> list = Arrays.asList(fact[0], fact[1], fact[2], fact[3]);
http://git-wip-us.apache.org/repos/asf/wicket/blob/7a2259e0/wicket-spring/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-spring/pom.xml b/wicket-spring/pom.xml
index 64395fd..734a42b 100644
--- a/wicket-spring/pom.xml
+++ b/wicket-spring/pom.xml
@@ -43,7 +43,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>easymock</groupId>
+ <groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/7a2259e0/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
index 526a24e..fb26d2e 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
@@ -35,6 +35,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.MessageSourceResolvable;
import org.springframework.context.NoSuchMessageException;
+import org.springframework.core.env.Environment;
import org.springframework.core.io.Resource;
/**
@@ -439,8 +440,14 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
@Override
public String getId()
{
- throw new UnsupportedOperationException();
+ throw null;
+
+ }
+ @Override
+ public String getApplicationName()
+ {
+ return "";
}
/**
@@ -475,4 +482,9 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
throw new UnsupportedOperationException();
}
+ @Override
+ public Environment getEnvironment()
+ {
+ return null;
+ }
}