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 2014/09/10 11:48:01 UTC
[1/5] git commit: Update Jetty versions
Repository: wicket
Updated Branches:
refs/heads/master 2aa64fe75 -> 10207bfcc
Update Jetty versions
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/67629711
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/67629711
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/67629711
Branch: refs/heads/master
Commit: 67629711459bc30b485de3ea368b8e943179232c
Parents: 2aa64fe
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Sep 10 12:05:03 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 10 12:05:03 2014 +0300
----------------------------------------------------------------------
.../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/67629711/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 7ba8dff..2faa032 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.2.v20140723</jetty9.version>
+ <jetty9.version>9.2.3.v20140905</jetty9.version>
<log4j.version>2.0.2</log4j.version>
<junit.version>4.11</junit.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/wicket/blob/67629711/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e742fe3..cc64e38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mvn.build.java.version>1.7</mvn.build.java.version>
<jacoco.version>0.7.1.201405082137</jacoco.version>
- <jetty.version>8.1.15.v20140411</jetty.version>
+ <jetty.version>8.1.16.v20140903</jetty.version>
<jetty9.version>9.0.7.v20131107</jetty9.version>
<spring.version>4.1.0.RELEASE</spring.version>
<servlet-api.version>3.0.1</servlet-api.version>
[5/5] git commit: Remove dependency to EasyMock. Rework a single test
to Mockito based
Posted by mg...@apache.org.
Remove dependency to EasyMock. Rework a single test to Mockito based
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/10207bfc
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/10207bfc
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/10207bfc
Branch: refs/heads/master
Commit: 10207bfccee2000f64676fcb939bca4247340e84
Parents: 6611bfc
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Sep 10 12:47:21 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 10 12:47:21 2014 +0300
----------------------------------------------------------------------
pom.xml | 6 ---
wicket-ioc/pom.xml | 4 +-
.../CompoundFieldValueFactoryTest.java | 45 +++++++++++---------
wicket-spring/pom.xml | 4 --
4 files changed, 28 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/10207bfc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b29b84d..0d66eb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -491,12 +491,6 @@
<version>3.0</version>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.httpunit</groupId>
<artifactId>httpunit</artifactId>
<version>1.7.2</version>
http://git-wip-us.apache.org/repos/asf/wicket/blob/10207bfc/wicket-ioc/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml
index 3cd76cd..7391f9b 100644
--- a/wicket-ioc/pom.xml
+++ b/wicket-ioc/pom.xml
@@ -49,8 +49,8 @@
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/wicket/blob/10207bfc/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 8db6ea5..f4eadbf 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
@@ -16,12 +16,16 @@
*/
package org.apache.wicket.injection;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.List;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -38,8 +42,6 @@ public class CompoundFieldValueFactoryTest extends Assert
private Field field;
- private final IMocksControl[] ctrl = new IMocksControl[4];
-
private final IFieldValueFactory[] fact = new IFieldValueFactory[4];
/**
@@ -53,8 +55,7 @@ public class CompoundFieldValueFactoryTest extends Assert
for (int i = 0; i < 4; i++)
{
- ctrl[i] = EasyMock.createControl();
- fact[i] = ctrl[i].createMock(IFieldValueFactory.class);
+ fact[i] = mock(IFieldValueFactory.class);
}
}
@@ -62,16 +63,23 @@ public class CompoundFieldValueFactoryTest extends Assert
{
for (int i = 0; i < cnt; i++)
{
- EasyMock.expect(fact[i].getFieldValue(field, this)).andReturn(null);
- ctrl[i].replay();
+ when(fact[i].getFieldValue(field, this)).thenReturn(null);
}
}
- protected void verify(final int cnt)
+ protected void verifyCalled(int... indices)
{
- for (int i = 0; i < cnt; i++)
+ for (int i : indices)
+ {
+ verify(fact[i], times(1)).getFieldValue(field, this);
+ }
+ }
+
+ private void verifyNotCalled(int... indices)
+ {
+ for (int i : indices)
{
- ctrl[i].verify();
+ verify(fact[i], never()).getFieldValue(field, this);
}
}
@@ -85,7 +93,7 @@ public class CompoundFieldValueFactoryTest extends Assert
CompoundFieldValueFactory f = new CompoundFieldValueFactory(new IFieldValueFactory[] {
fact[0], fact[1] });
f.getFieldValue(field, this);
- verify(2);
+ verifyCalled(0, 1);
try
{
@@ -108,7 +116,7 @@ public class CompoundFieldValueFactoryTest extends Assert
List<IFieldValueFactory> list = Arrays.asList(fact[0], fact[1], fact[2], fact[3]);
CompoundFieldValueFactory f = new CompoundFieldValueFactory(list);
f.getFieldValue(field, this);
- verify(4);
+ verifyCalled(0, 1, 2, 3);
try
{
@@ -131,7 +139,7 @@ public class CompoundFieldValueFactoryTest extends Assert
prepare(2);
CompoundFieldValueFactory f = new CompoundFieldValueFactory(fact[0], fact[1]);
f.getFieldValue(field, this);
- verify(2);
+ verifyCalled(0, 1);
try
{
@@ -161,15 +169,14 @@ public class CompoundFieldValueFactoryTest extends Assert
public void testBreakOnNonNullReturn()
{
prepare(2);
- EasyMock.expect(fact[2].getFieldValue(field, this)).andReturn(new Object());
- ctrl[2].replay();
- ctrl[3].replay();
+ when(fact[2].getFieldValue(field, this)).thenReturn(new Object());
List<IFieldValueFactory> list = Arrays.asList(fact[0], fact[1], fact[2], fact[3]);
CompoundFieldValueFactory f = new CompoundFieldValueFactory(list);
f.getFieldValue(field, this);
- verify(4);
+ verifyCalled(0, 1, 2);
+ verifyNotCalled(3);
}
/**
@@ -183,7 +190,7 @@ public class CompoundFieldValueFactoryTest extends Assert
fact[0], fact[1] });
f.addFactory(fact[2]);
f.getFieldValue(field, this);
- verify(3);
+ verifyCalled(0, 1, 2);
try
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/10207bfc/wicket-spring/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-spring/pom.xml b/wicket-spring/pom.xml
index f3dfd1d..4a85d13 100644
--- a/wicket-spring/pom.xml
+++ b/wicket-spring/pom.xml
@@ -42,10 +42,6 @@
<artifactId>spring-web</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- </dependency>
</dependencies>
<build>
<pluginManagement>
[2/5] git commit: Remove unused dependency to commons-lang in
wicket-examples
Posted by mg...@apache.org.
Remove unused dependency to commons-lang in wicket-examples
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c4ce524b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c4ce524b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c4ce524b
Branch: refs/heads/master
Commit: c4ce524b9ae326fd3fabdb0b1aabdd359bdd44c4
Parents: 6762971
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Sep 10 12:10:51 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 10 12:11:43 2014 +0300
----------------------------------------------------------------------
pom.xml | 5 -----
wicket-examples/pom.xml | 4 ----
2 files changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c4ce524b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cc64e38..10e8adb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -466,11 +466,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.4</version>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c4ce524b/wicket-examples/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index faefe37..b64779b 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -91,10 +91,6 @@
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
[4/5] git commit: remove the version. it is defined in the parent's
pom dependencyManagement
Posted by mg...@apache.org.
remove the version. it is defined in the parent's pom dependencyManagement
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6611bfc3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6611bfc3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6611bfc3
Branch: refs/heads/master
Commit: 6611bfc3bf84245a8b22ee4d4ffb20b10fb72c3f
Parents: e3a35f1
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Sep 10 12:46:50 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 10 12:46:50 2014 +0300
----------------------------------------------------------------------
wicket-examples/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6611bfc3/wicket-examples/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index b64779b..a1e2dc6 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -132,7 +132,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
[3/5] git commit: Remove unused dependency to commons-httpclient
Posted by mg...@apache.org.
Remove unused dependency to commons-httpclient
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e3a35f11
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e3a35f11
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e3a35f11
Branch: refs/heads/master
Commit: e3a35f112f368efc949e8a3f40ad6e3d4c9fb299
Parents: c4ce524
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Sep 10 12:46:16 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 10 12:46:16 2014 +0300
----------------------------------------------------------------------
pom.xml | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e3a35f11/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 10e8adb..b29b84d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -486,17 +486,6 @@
<version>1</version>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>3.0</version>