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 2015/06/28 17:15:02 UTC
wicket git commit: Upgrade Hamcrest to 2.0.0.0
Repository: wicket
Updated Branches:
refs/heads/master 976f3ba0c -> 1bd71af69
Upgrade Hamcrest to 2.0.0.0
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1bd71af6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1bd71af6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1bd71af6
Branch: refs/heads/master
Commit: 1bd71af691c2e76f6c24e82d617e5000305585cb
Parents: 976f3ba
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Jun 28 18:14:31 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Jun 28 18:14:31 2015 +0300
----------------------------------------------------------------------
pom.xml | 10 ++--------
wicket-core/pom.xml | 12 ++----------
wicket-ioc/pom.xml | 4 ++++
3 files changed, 8 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1bd71af6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d5952ff..7fb0884 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
<maven.surefire.version>2.18</maven.surefire.version>
<mockito.version>1.10.16</mockito.version>
<slf4j.version>1.7.12</slf4j.version>
- <hamcrest.version>1.3</hamcrest.version>
+ <hamcrest.version>2.0.0.0</hamcrest.version>
<objenesis.version>2.1</objenesis.version>
<!-- do not increase the version - wicket-user-guide requires 2.2.4 -->
<grails.version>2.2.4</grails.version>
@@ -480,13 +480,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>${hamcrest.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
+ <artifactId>hamcrest-junit</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/1bd71af6/wicket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index 3b88940..8c5bf86 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -39,24 +39,16 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <!-- provided because of WicketTester -->
<scope>provided</scope>
- <!-- provided because of the -test jar we build? -->
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <scope>provided</scope>
+ <artifactId>hamcrest-junit</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <scope>provided</scope>
- <!-- provided because of the -test jar we build? -->
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/1bd71af6/wicket-ioc/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml
index 0121874..2c47601 100644
--- a/wicket-ioc/pom.xml
+++ b/wicket-ioc/pom.xml
@@ -57,5 +57,9 @@
<artifactId>objenesis</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-junit</artifactId>
+ </dependency>
</dependencies>
</project>