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 2015/08/03 11:44:50 UTC
wicket git commit: Fixed Hamcrest 2.0.0.0 update
Repository: wicket
Updated Branches:
refs/heads/master a4b2c0b30 -> 1ed482061
Fixed Hamcrest 2.0.0.0 update
- POM convergence is now correct, we don't depend on 2 versions of Hamcrest
- Fixed compilation issues
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1ed48206
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1ed48206
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1ed48206
Branch: refs/heads/master
Commit: 1ed4820613a690c1edc6918c673f6f3f5d9f9ed3
Parents: a4b2c0b
Author: Martijn Dashorst <ma...@gmail.com>
Authored: Mon Aug 3 11:47:06 2015 +0200
Committer: Martijn Dashorst <ma...@gmail.com>
Committed: Mon Aug 3 11:47:06 2015 +0200
----------------------------------------------------------------------
pom.xml | 21 ++++++++++++++++++--
.../org/apache/wicket/queueing/HasPath.java | 5 -----
.../org/apache/wicket/queueing/IsParentOf.java | 4 ----
3 files changed, 19 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1ed48206/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 28c4faa..268d4e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -465,6 +465,12 @@
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
@@ -480,13 +486,13 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
+ <artifactId>hamcrest-junit</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-junit</artifactId>
+ <artifactId>java-hamcrest</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
@@ -513,6 +519,12 @@
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</dependencyManagement>
@@ -532,6 +544,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/wicket/blob/1ed48206/wicket-core/src/test/java/org/apache/wicket/queueing/HasPath.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/HasPath.java b/wicket-core/src/test/java/org/apache/wicket/queueing/HasPath.java
index 3613f1f..611f610 100644
--- a/wicket-core/src/test/java/org/apache/wicket/queueing/HasPath.java
+++ b/wicket-core/src/test/java/org/apache/wicket/queueing/HasPath.java
@@ -19,7 +19,6 @@ package org.apache.wicket.queueing;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.hamcrest.Description;
-import org.hamcrest.Factory;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
@@ -127,12 +126,8 @@ class HasPath extends TypeSafeMatcher<Component>
return str;
}
-
- @Factory
public static <T> Matcher<Component> hasPath(Path path)
{
return new HasPath(path);
}
-
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/1ed48206/wicket-core/src/test/java/org/apache/wicket/queueing/IsParentOf.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/IsParentOf.java b/wicket-core/src/test/java/org/apache/wicket/queueing/IsParentOf.java
index 3f6ead0..a32655c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/queueing/IsParentOf.java
+++ b/wicket-core/src/test/java/org/apache/wicket/queueing/IsParentOf.java
@@ -20,7 +20,6 @@ import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.hamcrest.Description;
-import org.hamcrest.Factory;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
@@ -88,11 +87,8 @@ class IsParentOf extends TypeSafeMatcher<Component>
return c.getClass().getSimpleName() + "('" + c.getId() + "')";
}
- @Factory
public static <T> Matcher<Component> isParentOf(Component child)
{
return new IsParentOf(child);
}
-
-
}
\ No newline at end of file