Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update Hamcrest from 1.3.RC2 to 1.3

  • Loading branch information...
commit 40375ef1fc08b1f666b21d299d8b52b10a53e6fb 1 parent ee03724
@marcphilipp marcphilipp authored
View
2  .classpath
@@ -3,6 +3,6 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.0RC2.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
2  build.xml
@@ -28,7 +28,7 @@
<property name="javadocdir" location="${dist}/javadoc" />
<property name="javadoczip" location="${dist}-javadoc.zip" />
- <property name="hamcrestlib" location="lib/hamcrest-core-1.3.0RC2.jar" />
+ <property name="hamcrestlib" location="lib/hamcrest-core-1.3.jar" />
<property name="hamcrestsrc" location="${dist}/temp.hamcrest.source" />
<property name="maven.deploy.goal" value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
View
2  build/maven/junit-pom-template.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
- <version>1.3.RC2</version>
+ <version>1.3</version>
<scope>compile</scope>
</dependency>
</dependencies>
View
2  build/maven/sample_project_template/pom.xml
@@ -9,7 +9,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.hamcrest>1.3.RC2</version.hamcrest>
+ <version.hamcrest>1.3</version.hamcrest>
</properties>
<dependencies>
View
2  build/profile_junit.sh
@@ -1,2 +1,2 @@
-java -classpath ../bin:../lib/hamcrest-core-1.3.0RC2.jar -agentlib:hprof=cpu=samples,depth=18 org.junit.runner.JUnitCore org.junit.tests.AllTests
+java -classpath ../bin:../lib/hamcrest-core-1.3.jar -agentlib:hprof=cpu=samples,depth=18 org.junit.runner.JUnitCore org.junit.tests.AllTests
cat java.hprof.txt
View
BIN  lib/hamcrest-core-1.3.0RC2.jar
Binary file not shown
View
BIN  lib/hamcrest-core-1.3.jar
Binary file not shown
View
6 src/main/java/org/junit/matchers/JUnitMatchers.java
@@ -3,6 +3,8 @@
import org.hamcrest.CoreMatchers;
import org.hamcrest.Matcher;
import org.hamcrest.core.CombinableMatcher;
+import org.hamcrest.core.CombinableMatcher.CombinableBothMatcher;
+import org.hamcrest.core.CombinableMatcher.CombinableEitherMatcher;
import org.junit.internal.matchers.CauseMatcher;
/**
@@ -88,7 +90,7 @@
* @deprecated Please use {@link CoreMatchers#both(Matcher)} instead.
*/
@Deprecated
- public static <T> CombinableMatcher<T> both(Matcher<? super T> matcher) {
+ public static <T> CombinableBothMatcher<T> both(Matcher<? super T> matcher) {
return CoreMatchers.both(matcher);
}
@@ -101,7 +103,7 @@
* @deprecated Please use {@link CoreMatchers#either(Matcher)} instead.
*/
@Deprecated
- public static <T> CombinableMatcher<T> either(Matcher<? super T> matcher) {
+ public static <T> CombinableEitherMatcher<T> either(Matcher<? super T> matcher) {
return CoreMatchers.either(matcher);
}
Please sign in to comment.
Something went wrong with that request. Please try again.