Binary files hamcrest-1.2.orig/build/hamcrest-core-1.2.jar and hamcrest-1.2/build/hamcrest-core-1.2.jar differ
Binary files hamcrest-1.2.orig/build/hamcrest-core-SNAPSHOT.jar and hamcrest-1.2/build/hamcrest-core-SNAPSHOT.jar differ
Binary files hamcrest-1.2.orig/build/hamcrest-generator-1.2.jar and hamcrest-1.2/build/hamcrest-generator-1.2.jar differ
Binary files hamcrest-1.2.orig/build/hamcrest-generator-SNAPSHOT.jar and hamcrest-1.2/build/hamcrest-generator-SNAPSHOT.jar differ
Only in hamcrest-1.2/build: hamcrest-library-SNAPSHOT.jar
Only in hamcrest-1.2/build/temp/build/hamcrest-core-1.2.jar.contents/org/hamcrest: CoreMatchers.class
Only in hamcrest-1.2/build/temp/build/hamcrest-core-1.2.jar.contents/org/hamcrest: CoreMatchers.java
Only in hamcrest-1.2/build/temp/build/hamcrest-core-SNAPSHOT.jar.contents/org/hamcrest: CoreMatchers.class
Only in hamcrest-1.2/build/temp/build/hamcrest-core-SNAPSHOT.jar.contents/org/hamcrest: CoreMatchers.java
Only in hamcrest-1.2/build/temp/build: hamcrest-library-1.2.jar.contents
Only in hamcrest-1.2/build/temp/build: hamcrest-library-SNAPSHOT.jar.contents
diff -ur hamcrest-1.2.orig/build/temp/hamcrest-core/generated-code/org/hamcrest/CoreMatchers.java hamcrest-1.2/build/temp/hamcrest-core/generated-code/org/hamcrest/CoreMatchers.java
--- hamcrest-1.2.orig/build/temp/hamcrest-core/generated-code/org/hamcrest/CoreMatchers.java	2012-02-13 06:04:43.567944167 -0500
+++ hamcrest-1.2/build/temp/hamcrest-core/generated-code/org/hamcrest/CoreMatchers.java	2012-02-13 06:18:08.839869836 -0500
@@ -0,0 +1,289 @@
+// Generated source.
+package org.hamcrest;
+
+public class CoreMatchers {
+
+  /**
+   * Evaluates to true only if ALL of the passed in matchers evaluate to true.
+   */
+  public static <T> org.hamcrest.Matcher<T> allOf(java.lang.Iterable<org.hamcrest.Matcher<? super T>> matchers) {
+    return org.hamcrest.core.AllOf.<T>allOf(matchers);
+  }
+
+  public static <T> org.hamcrest.Matcher<T> allOf(org.hamcrest.Matcher<? super T>... param1) {
+    return org.hamcrest.core.AllOf.<T>allOf(param1);
+  }
+
+  /**
+   * Evaluates to true only if ALL of the passed in matchers evaluate to true.
+   */
+  public static <T> org.hamcrest.Matcher<T> allOf(org.hamcrest.Matcher<T> first, org.hamcrest.Matcher<? super T> second) {
+    return org.hamcrest.core.AllOf.<T>allOf(first, second);
+  }
+
+  /**
+   * Evaluates to true only if ALL of the passed in matchers evaluate to true.
+   */
+  public static <T> org.hamcrest.Matcher<T> allOf(org.hamcrest.Matcher<T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third) {
+    return org.hamcrest.core.AllOf.<T>allOf(first, second, third);
+  }
+
+  /**
+   * Evaluates to true only if ALL of the passed in matchers evaluate to true.
+   */
+  public static <T> org.hamcrest.Matcher<T> allOf(org.hamcrest.Matcher<T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third, org.hamcrest.Matcher<? super T> fourth) {
+    return org.hamcrest.core.AllOf.<T>allOf(first, second, third, fourth);
+  }
+
+  /**
+   * Evaluates to true only if ALL of the passed in matchers evaluate to true.
+   */
+  public static <T> org.hamcrest.Matcher<T> allOf(org.hamcrest.Matcher<T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third, org.hamcrest.Matcher<? super T> fourth, org.hamcrest.Matcher<? super T> fifth) {
+    return org.hamcrest.core.AllOf.<T>allOf(first, second, third, fourth, fifth);
+  }
+
+  /**
+   * Evaluates to true only if ALL of the passed in matchers evaluate to true.
+   */
+  public static <T> org.hamcrest.Matcher<T> allOf(org.hamcrest.Matcher<T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third, org.hamcrest.Matcher<? super T> fourth, org.hamcrest.Matcher<? super T> fifth, org.hamcrest.Matcher<? super T> sixth) {
+    return org.hamcrest.core.AllOf.<T>allOf(first, second, third, fourth, fifth, sixth);
+  }
+
+  /**
+   * Evaluates to true if ANY of the passed in matchers evaluate to true.
+   */
+  public static <T> org.hamcrest.core.AnyOf<T> anyOf(java.lang.Iterable<org.hamcrest.Matcher<? super T>> matchers) {
+    return org.hamcrest.core.AnyOf.<T>anyOf(matchers);
+  }
+
+  public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<? super T>... param1) {
+    return org.hamcrest.core.AnyOf.<T>anyOf(param1);
+  }
+
+  /**
+   * Evaluates to true if ANY of the passed in matchers evaluate to true.
+   */
+  public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<T> first, org.hamcrest.Matcher<? super T> second) {
+    return org.hamcrest.core.AnyOf.<T>anyOf(first, second);
+  }
+
+  /**
+   * Evaluates to true if ANY of the passed in matchers evaluate to true.
+   */
+  public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third) {
+    return org.hamcrest.core.AnyOf.<T>anyOf(first, second, third);
+  }
+
+  /**
+   * Evaluates to true if ANY of the passed in matchers evaluate to true.
+   */
+  public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third, org.hamcrest.Matcher<? super T> fourth) {
+    return org.hamcrest.core.AnyOf.<T>anyOf(first, second, third, fourth);
+  }
+
+  /**
+   * Evaluates to true if ANY of the passed in matchers evaluate to true.
+   */
+  public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third, org.hamcrest.Matcher<? super T> fourth, org.hamcrest.Matcher<? super T> fifth) {
+    return org.hamcrest.core.AnyOf.<T>anyOf(first, second, third, fourth, fifth);
+  }
+
+  /**
+   * Evaluates to true if ANY of the passed in matchers evaluate to true.
+   */
+  public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third, org.hamcrest.Matcher<? super T> fourth, org.hamcrest.Matcher<? super T> fifth, org.hamcrest.Matcher<? super T> sixth) {
+    return org.hamcrest.core.AnyOf.<T>anyOf(first, second, third, fourth, fifth, sixth);
+  }
+
+  /**
+   * This is useful for fluently combining matchers that must both pass.  For example:
+   * <pre>
+   *   assertThat(string, both(containsString("a")).and(containsString("b")));
+   * </pre>
+   */
+  public static <LHS> org.hamcrest.core.CombinableMatcher<LHS> both(org.hamcrest.Matcher<? super LHS> matcher) {
+    return org.hamcrest.core.CombinableMatcher.<LHS>both(matcher);
+  }
+
+  /**
+   * This is useful for fluently combining matchers where either may pass, for example:
+   * <pre>
+   *   assertThat(string, both(containsString("a")).and(containsString("b")));
+   * </pre>
+   */
+  public static <LHS> org.hamcrest.core.CombinableMatcher<LHS> either(org.hamcrest.Matcher<? super LHS> matcher) {
+    return org.hamcrest.core.CombinableMatcher.<LHS>either(matcher);
+  }
+
+  public static <T> org.hamcrest.Matcher<T> describedAs(java.lang.String param1, org.hamcrest.Matcher<T> param2, java.lang.Object... param3) {
+    return org.hamcrest.core.DescribedAs.<T>describedAs(param1, param2, param3);
+  }
+
+  /**
+   * 
+   * 
+   * @param itemMatcher A matcher to apply to every element in a collection.
+   * @return Evaluates to TRUE for a collection in which every item matches itemMatcher
+   */
+  public static <U> org.hamcrest.Matcher<java.lang.Iterable<U>> everyItem(org.hamcrest.Matcher<U> itemMatcher) {
+    return org.hamcrest.core.Every.<U>everyItem(itemMatcher);
+  }
+
+  /**
+   * Decorates another Matcher, retaining the behavior but allowing tests
+   * to be slightly more expressive.
+   * 
+   * For example:  assertThat(cheese, equalTo(smelly))
+   *          vs.  assertThat(cheese, is(equalTo(smelly)))
+   */
+  public static <T> org.hamcrest.Matcher<T> is(org.hamcrest.Matcher<T> matcher) {
+    return org.hamcrest.core.Is.<T>is(matcher);
+  }
+
+  /**
+   * This is a shortcut to the frequently used is(equalTo(x)).
+   * 
+   * For example:  assertThat(cheese, is(equalTo(smelly)))
+   *          vs.  assertThat(cheese, is(smelly))
+   */
+  public static <T> org.hamcrest.Matcher<? super T> is(T value) {
+    return org.hamcrest.core.Is.<T>is(value);
+  }
+
+  /**
+   * This is a shortcut to the frequently used is(instanceOf(SomeClass.class)).
+   * 
+   * For example:  assertThat(cheese, is(instanceOf(Cheddar.class)))
+   *          vs.  assertThat(cheese, is(Cheddar.class))
+   */
+  public static <T> org.hamcrest.Matcher<? super T> is(java.lang.Class<T> type) {
+    return org.hamcrest.core.Is.<T>is(type);
+  }
+
+  /**
+   * This matcher always evaluates to true.
+   */
+  public static <T> org.hamcrest.Matcher<T> anything() {
+    return org.hamcrest.core.IsAnything.<T>anything();
+  }
+
+  /**
+   * This matcher always evaluates to true.
+   * 
+   * @param description A meaningful string used when describing itself.
+   */
+  public static <T> org.hamcrest.Matcher<T> anything(java.lang.String description) {
+    return org.hamcrest.core.IsAnything.<T>anything(description);
+  }
+
+  public static <T> org.hamcrest.Matcher<java.lang.Iterable<? super T>> hasItem(org.hamcrest.Matcher<? super T> elementMatcher) {
+    return org.hamcrest.core.IsCollectionContaining.<T>hasItem(elementMatcher);
+  }
+
+  public static <T> org.hamcrest.Matcher<java.lang.Iterable<? super T>> hasItem(T element) {
+    return org.hamcrest.core.IsCollectionContaining.<T>hasItem(element);
+  }
+
+  public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(org.hamcrest.Matcher<? super T>... param1) {
+    return org.hamcrest.core.IsCollectionContaining.<T>hasItems(param1);
+  }
+
+  public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(T... param1) {
+    return org.hamcrest.core.IsCollectionContaining.<T>hasItems(param1);
+  }
+
+  /**
+   * Is the value equal to another value, as tested by the
+   * {@link java.lang.Object#equals} invokedMethod?
+   */
+  public static <T> org.hamcrest.Matcher<? super T> equalTo(T operand) {
+    return org.hamcrest.core.IsEqual.<T>equalTo(operand);
+  }
+
+  /**
+   * Is the value an instance of a particular type? 
+   * Use this version to make generics conform, for example in 
+   * the JMock clause <code>with(any(Thing.class))</code>
+   */
+  public static <T> org.hamcrest.Matcher<T> any(java.lang.Class<T> type) {
+    return org.hamcrest.core.IsInstanceOf.<T>any(type);
+  }
+
+  /**
+   * Is the value an instance of a particular type? 
+   * This version assumes no relationship between the required type and
+   * the signature of the method that sets it up, for example in
+   * <code>assertThat(anObject, instanceOf(Thing.class));</code>
+   */
+  public static <T> org.hamcrest.Matcher<T> instanceOf(java.lang.Class<?> type) {
+    return org.hamcrest.core.IsInstanceOf.<T>instanceOf(type);
+  }
+
+  /**
+   * Inverts the rule.
+   */
+  public static <T> org.hamcrest.Matcher<T> not(org.hamcrest.Matcher<T> matcher) {
+    return org.hamcrest.core.IsNot.<T>not(matcher);
+  }
+
+  /**
+   * This is a shortcut to the frequently used not(equalTo(x)).
+   * 
+   * For example:  assertThat(cheese, is(not(equalTo(smelly))))
+   *          vs.  assertThat(cheese, is(not(smelly)))
+   */
+  public static <T> org.hamcrest.Matcher<? super T> not(T value) {
+    return org.hamcrest.core.IsNot.<T>not(value);
+  }
+
+  /**
+   * Matches if value is not null.
+   */
+  public static <T> org.hamcrest.Matcher<T> notNullValue() {
+    return org.hamcrest.core.IsNull.<T>notNullValue();
+  }
+
+  /**
+   * Matches if value is not null. With type inference.
+   */
+  public static <T> org.hamcrest.Matcher<T> notNullValue(java.lang.Class<T> type) {
+    return org.hamcrest.core.IsNull.<T>notNullValue(type);
+  }
+
+  /**
+   * Matches if value is null.
+   */
+  public static <T> org.hamcrest.Matcher<T> nullValue() {
+    return org.hamcrest.core.IsNull.<T>nullValue();
+  }
+
+  /**
+   * Matches if value is null. With type inference.
+   */
+  public static <T> org.hamcrest.Matcher<T> nullValue(java.lang.Class<T> type) {
+    return org.hamcrest.core.IsNull.<T>nullValue(type);
+  }
+
+  /**
+   * Creates a new instance of IsSame
+   * 
+   * @param object The predicate evaluates to true only when the argument is
+   *               this object.
+   */
+  public static <T> org.hamcrest.Matcher<T> sameInstance(T object) {
+    return org.hamcrest.core.IsSame.<T>sameInstance(object);
+  }
+
+  public static org.hamcrest.Matcher<java.lang.String> containsString(java.lang.String substring) {
+    return org.hamcrest.core.StringContains.containsString(substring);
+  }
+
+  public static org.hamcrest.Matcher<java.lang.String> startsWith(java.lang.String substring) {
+    return org.hamcrest.core.StringStartsWith.startsWith(substring);
+  }
+
+  public static org.hamcrest.Matcher<java.lang.String> endsWith(java.lang.String substring) {
+    return org.hamcrest.core.StringEndsWith.endsWith(substring);
+  }
+
+}
Only in hamcrest-1.2/build/temp: hamcrest-library
diff -ur hamcrest-1.2.orig/build.xml hamcrest-1.2/build.xml
--- hamcrest-1.2.orig/build.xml	2012-02-13 06:02:50.594954597 -0500
+++ hamcrest-1.2/build.xml	2012-02-13 06:18:41.192865385 -0500
@@ -43,6 +43,7 @@
               classpath="
                 build/hamcrest-core-${version}.jar;
                 build/hamcrest-generator-${version}.jar;
+                lib/generator/qdox.jar;
               ">
             <arg value="core-matchers.xml"/>
             <arg value="hamcrest-core/src/main/java"/>
@@ -70,6 +71,7 @@
                 build/hamcrest-core-${version}.jar;
                 build/hamcrest-generator-${version}.jar;
                 build/hamcrest-library-${version}.jar;
+                lib/generator/qdox.jar;
               ">
             <arg value="matchers.xml"/>
             <arg value="hamcrest-core/src/main/java,hamcrest-library/src/main/java"/>