You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bi...@apache.org on 2014/09/14 18:19:37 UTC
[1/3] git commit: Upgrade the dependency on JUnit (4.11) and Hamcrest
(1.3)
Repository: maven-scm
Updated Branches:
refs/heads/master b20f21e0d -> ecb37f646
Upgrade the dependency on JUnit (4.11) and Hamcrest (1.3)
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/6bb0551e
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/6bb0551e
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/6bb0551e
Branch: refs/heads/master
Commit: 6bb0551e5b1cb03ad07c52d158bf2ed66729e7ce
Parents: 910cbfd
Author: Emmanuel Bourg <eb...@apache.org>
Authored: Wed Jan 29 11:31:50 2014 +0100
Committer: Emmanuel Bourg <eb...@apache.org>
Committed: Wed Jan 29 11:31:50 2014 +0100
----------------------------------------------------------------------
maven-scm-providers/maven-scm-provider-accurev/pom.xml | 2 +-
.../src/test/java/org/apache/maven/scm/ChangeSetMatcher.java | 2 +-
.../java/org/apache/maven/scm/CollectionSizeMatcher.java | 8 ++++----
.../apache/maven/scm/provider/accurev/VersionMatcher.java | 2 +-
pom.xml | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/6bb0551e/maven-scm-providers/maven-scm-provider-accurev/pom.xml
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/pom.xml b/maven-scm-providers/maven-scm-provider-accurev/pom.xml
index bd7792b..4a80f18 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/pom.xml
+++ b/maven-scm-providers/maven-scm-provider-accurev/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/6bb0551e/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java
index ca86693..547b782 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java
@@ -45,7 +45,7 @@ public class ChangeSetMatcher
{
this.comment = comment;
- Matcher<? extends ChangeFile> elementMatchers[] = new ChangeFileMatcher[fileNames.length];
+ Matcher<ChangeFile> elementMatchers[] = new ChangeFileMatcher[fileNames.length];
for ( int i = 0; i < elementMatchers.length; i++ )
{
elementMatchers[i] = changeFile( fileNames[i], any( String.class ) );
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/6bb0551e/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/CollectionSizeMatcher.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/CollectionSizeMatcher.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/CollectionSizeMatcher.java
index cca536d..a72f56f 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/CollectionSizeMatcher.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/CollectionSizeMatcher.java
@@ -26,7 +26,7 @@ import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
public class CollectionSizeMatcher<T>
- extends TypeSafeMatcher<Collection<T>>
+ extends TypeSafeMatcher<Iterable<T>>
{
private int size;
@@ -37,9 +37,9 @@ public class CollectionSizeMatcher<T>
}
@Override
- public boolean matchesSafely( Collection<T> collection )
+ public boolean matchesSafely( Iterable<T> iterable )
{
-
+ Collection collection = (Collection) iterable;
return collection.size() == this.size;
}
@@ -52,7 +52,7 @@ public class CollectionSizeMatcher<T>
}
- public static <T> Matcher<Collection<T>> size( int length, Class<T> clazz )
+ public static <T> Matcher<Iterable<T>> size( int length, Class<T> clazz )
{
return new CollectionSizeMatcher<T>( length);
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/6bb0551e/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/VersionMatcher.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/VersionMatcher.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/VersionMatcher.java
index a688e67..561e270 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/VersionMatcher.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/VersionMatcher.java
@@ -57,7 +57,7 @@ public class VersionMatcher
}
- public static Matcher<? extends Version> version( Long elementId, String path, String virtual, String real )
+ public static Matcher<Version> version( Long elementId, String path, String virtual, String real )
{
return new VersionMatcher( elementId, path, virtual, real );
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/6bb0551e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2a1e763..97e98d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -278,7 +278,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.2</version>
+ <version>4.11</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
[3/3] git commit: SCM-778: upgrade junit and hamcrest. closes
maven-scm#7.
Posted by bi...@apache.org.
SCM-778: upgrade junit and hamcrest.
closes maven-scm#7.
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/ecb37f64
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/ecb37f64
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/ecb37f64
Branch: refs/heads/master
Commit: ecb37f6466816ca9e8e94b6aa0c679e7a18d3dcb
Parents: b20f21e 2a276ff
Author: Benson Margulies <bi...@gmail.com>
Authored: Sun Sep 14 12:14:48 2014 -0400
Committer: Benson Margulies <bi...@gmail.com>
Committed: Sun Sep 14 12:18:54 2014 -0400
----------------------------------------------------------------------
maven-scm-providers/maven-scm-provider-accurev/pom.xml | 2 +-
.../src/test/java/org/apache/maven/scm/ChangeSetMatcher.java | 2 +-
.../java/org/apache/maven/scm/CollectionSizeMatcher.java | 8 ++++----
.../apache/maven/scm/provider/accurev/VersionMatcher.java | 2 +-
.../scm/provider/vss/commands/VssCommandLineUtilsTest.java | 1 +
pom.xml | 2 +-
6 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/ecb37f64/maven-scm-providers/maven-scm-provider-accurev/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/ecb37f64/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 5384758,97e98d6..60e6f31
--- a/pom.xml
+++ b/pom.xml
@@@ -275,14 -278,9 +275,14 @@@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.2</version>
+ <version>4.11</version>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.9.5</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-svntest</artifactId>
<version>${project.version}</version>
[2/3] git commit: Reset the vssDirectory system property set by
testGetSsDir in VssCommandLineUtilsTest before running the other tests. This
fixes a test failure after upgrading to JUnit 4.11
Posted by bi...@apache.org.
Reset the vssDirectory system property set by testGetSsDir in VssCommandLineUtilsTest before running the other tests.
This fixes a test failure after upgrading to JUnit 4.11
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/2a276ffc
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/2a276ffc
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/2a276ffc
Branch: refs/heads/master
Commit: 2a276ffcd6a193675aae24d821859fe01e462850
Parents: 6bb0551
Author: Emmanuel Bourg <eb...@apache.org>
Authored: Mon Feb 24 14:09:55 2014 +0100
Committer: Emmanuel Bourg <eb...@apache.org>
Committed: Mon Feb 24 14:09:55 2014 +0100
----------------------------------------------------------------------
.../maven/scm/provider/vss/commands/VssCommandLineUtilsTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/2a276ffc/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtilsTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtilsTest.java b/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtilsTest.java
index 37c491a..bc57633 100644
--- a/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtilsTest.java
+++ b/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtilsTest.java
@@ -41,6 +41,7 @@ public class VssCommandLineUtilsTest
throws Exception
{
super.setUp();
+ System.setProperty( VSS_DIRECTORY_PROPERTY, "" );
//scmManager = getScmManager();
}