diff --git a/0001-Fix-build-with-OpenJDK-11.patch b/0001-Fix-build-with-OpenJDK-11.patch
new file mode 100644
index 0000000..4e882e2
--- /dev/null
+++ b/0001-Fix-build-with-OpenJDK-11.patch
@@ -0,0 +1,131 @@
+From d33031924faa557bb43ba0471f74d942ddfeae50 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Tue, 5 Nov 2019 14:50:23 +0100
+Subject: [PATCH] Fix build with OpenJDK 11
+
+---
+ .../src/main/java/org/hamcrest/collection/ArrayMatching.java  | 3 ++-
+ .../org/hamcrest/collection/IsArrayContainingInAnyOrder.java  | 2 +-
+ .../org/hamcrest/collection/IsArrayContainingInOrder.java     | 2 +-
+ .../hamcrest/collection/IsIterableContainingInAnyOrder.java   | 2 +-
+ .../collection/IsIterableContainingInRelativeOrder.java       | 2 +-
+ hamcrest/src/main/java/org/hamcrest/core/AllOf.java           | 2 +-
+ hamcrest/src/main/java/org/hamcrest/core/AnyOf.java           | 2 +-
+ .../src/main/java/org/hamcrest/core/CombinableMatcher.java    | 4 ++--
+ 8 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
+index fc968e0..baab775 100644
+--- a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
+@@ -67,7 +67,8 @@ public class ArrayMatching {
+    */
+   @SafeVarargs
+   public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
+-      return arrayContainingInAnyOrder(asList(itemMatchers));
++      Collection<Matcher<? super E>> itemMatchersList = asList(itemMatchers);
++      return new ArrayAsIterableMatcher<>(new IsIterableContainingInAnyOrder<>(itemMatchersList), itemMatchersList, "in any order");
+   }
+ 
+   /**
+diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
+index 7e72a62..c0c7efc 100644
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
+@@ -59,7 +59,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> {
+      *     a list of matchers, each of which must be satisfied by an entry in an examined array
+      */
+     public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
+-        return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
++        return new IsArrayContainingInAnyOrder<E>(Arrays.asList(itemMatchers));
+     }
+ 
+     /**
+diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
+index c046914..2022f1a 100644
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
+@@ -73,7 +73,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> {
+      *     the matchers that must be satisfied by the items in the examined array
+      */
+     public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {
+-        return arrayContaining(asList(itemMatchers));
++        return new IsArrayContainingInOrder<E>(asList(itemMatchers));
+     }
+ 
+     /**
+diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
+index d6a9a33..9a7e6c0 100644
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
+@@ -98,7 +98,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher
+      */
+     @SafeVarargs
+     public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {
+-        return containsInAnyOrder(Arrays.asList(itemMatchers));
++        return new IsIterableContainingInAnyOrder<T>(Arrays.asList(itemMatchers));
+     }
+ 
+     /**
+diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
+index 0657768..06d6a57 100644
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
+@@ -99,7 +99,7 @@ public class IsIterableContainingInRelativeOrder<E> extends TypeSafeDiagnosingMa
+      */
+     @SafeVarargs
+     public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(Matcher<? super E>... itemMatchers) {
+-        return containsInRelativeOrder(asList(itemMatchers));
++        return new IsIterableContainingInRelativeOrder<E>(asList(itemMatchers));
+     }
+ 
+     /**
+diff --git a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
+index b8c3faa..f8951bd 100644
+--- a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
++++ b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
+@@ -56,6 +56,6 @@ public class AllOf<T> extends DiagnosingMatcher<T> {
+      */
+     @SafeVarargs
+     public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {
+-        return allOf(Arrays.asList(matchers));
++        return new AllOf<T>(Arrays.asList(matchers));
+     }
+ }
+diff --git a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
+index 7a22c22..5a63574 100644
+--- a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
++++ b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
+@@ -46,6 +46,6 @@ public class AnyOf<T> extends ShortcutCombination<T> {
+      */
+     @SafeVarargs
+     public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) {
+-        return anyOf(Arrays.asList(matchers));
++        return new AnyOf<T>(Arrays.asList(matchers));
+     }
+ }
+diff --git a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
+index e37efce..6b44884 100644
+--- a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
++++ b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
+@@ -57,7 +57,7 @@ public class CombinableMatcher<T> extends TypeSafeDiagnosingMatcher<T> {
+         this.first = matcher;
+     }
+     public CombinableMatcher<X> and(Matcher<? super X> other) {
+-      return new CombinableMatcher<>(first).and(other);
++      return new CombinableMatcher<>(first).and((Matcher)other);
+     }
+   }
+ 
+@@ -76,7 +76,7 @@ public class CombinableMatcher<T> extends TypeSafeDiagnosingMatcher<T> {
+         this.first = matcher;
+     }
+     public CombinableMatcher<X> or(Matcher<? super X> other) {
+-      return new CombinableMatcher<>(first).or(other);
++      return new CombinableMatcher<>(first).or((Matcher)other);
+     }
+   }
+ }
+-- 
+2.21.0
+
diff --git a/getMethods-sort.patch b/getMethods-sort.patch
deleted file mode 100644
index 85707f7..0000000
--- a/getMethods-sort.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 72d003605170af32c20b72caff4ab35f3a40b254 Mon Sep 17 00:00:00 2001
-From: fanmenggang <fanmenggang@huawei.com>
-Date: Wed, 8 May 2019 16:15:56 +0000
-Subject: [PATCH] hamcrest: eliminate class file differences
-
-reason: eliminate class file differences
-
-diff --git a/hamcrest-generator/src/main/java/org/hamcrest/generator/ReflectiveFactoryReader.java b/hamcrest-generator/src/main/java/org/hamcrest/generator/ReflectiveFactoryReader.java
-index f51e659..5fa1c8f 100644
---- a/hamcrest-generator/src/main/java/org/hamcrest/generator/ReflectiveFactoryReader.java
-+++ b/hamcrest-generator/src/main/java/org/hamcrest/generator/ReflectiveFactoryReader.java
-@@ -42,8 +42,8 @@ public class ReflectiveFactoryReader implements Iterable<FactoryMethod> {
-         return new Iterator<FactoryMethod>() {
- 
-             private int currentMethod = -1;
--            private Method[] allMethods = cls.getMethods();
--
-+            private Method[] tmpMethods = cls.getMethods();
-+            private Method[] allMethods = sort(tmpMethods,0,tmpMethods.length - 1);
-             @Override
-             public boolean hasNext() {
-                 while (true) {
-@@ -72,6 +72,43 @@ public class ReflectiveFactoryReader implements Iterable<FactoryMethod> {
-             private boolean outsideArrayBounds() {
-               return currentMethod < 0 || allMethods.length <= currentMethod;
-             }
-+
-+            private Method[] sort(Method[] method, int low, int high) {
-+                int start = low;
-+                int end = high;
-+                String key = method[low].toString();
-+
-+                while(end > start) {
-+                       while(end > start && method[end].toString().compareTo(key) >= 0) {
-+                               end--;
-+                       }
-+
-+                        if(end > start) {
-+                               Method temp = method[end];
-+                               method[end] = method[start];
-+                               method[start] = temp;
-+                               start++;
-+                       }
-+
-+                        while(start < end && method[start].toString().compareTo(key) <= 0) {
-+                               start++;
-+                       }
-+
-+                        if(start < end ) {
-+                               Method temp = method[end];
-+                               method[end] = method[start];
-+                               method[start] = temp;
-+                               end--;
-+                       }
-+               }
-+                       if(start > low) {
-+                               sort(method,low, start - 1);
-+                       }
-+                       if(end < high) {
-+                               sort(method,start + 1, high);
-+                       }
-+               return method;
-+               }
-         };
-     }
- 
-@@ -171,4 +208,4 @@ public class ReflectiveFactoryReader implements Iterable<FactoryMethod> {
-       return name.replace('$', '.');
-     }
- 
--}
-\ No newline at end of file
-+}
diff --git a/hamcrest-1.3-build.patch b/hamcrest-1.3-build.patch
deleted file mode 100644
index 877e51e..0000000
--- a/hamcrest-1.3-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 1cfd4fb..5a7c740 100644
---- a/build.xml
-+++ b/build.xml
-@@ -14,13 +14,13 @@
-     <target name="generator" description="Build code generator tool">
-         <java-to-jar srcdir="hamcrest-generator/src/main/java"
-                      modulename="hamcrest-generator-nodeps"
--                     classpath="lib/generator/qdox-1.12.jar"/>
-+                     classpath="lib/generator/qdox.jar"/>
- 
-         <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
--        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
-+        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar.jar"/>
-         <jarjar jarfile="build/hamcrest-generator-${version}.jar">
-             <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
--            <zipfileset src="lib/generator/qdox-1.12.jar"/>
-+            <zipfileset src="lib/generator/qdox.jar"/>
-             <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
-         </jarjar>
-         <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
-@@ -152,7 +152,8 @@
- 
-         <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
-                  destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
--                 windowtitle="Hamcrest" source="1.6" failonerror="yes" overview="overview.html">
-+                 windowtitle="Hamcrest" source="1.6" failonerror="yes">
-+            <arg value="-Xdoclint:none"/>
-             <classpath>
-                 <fileset dir="lib/integration">
-                     <include name="*.jar"/>
-@@ -313,6 +314,7 @@
-             <javadoc packagenames="org.hamcrest.*" sourcepath="build/temp/@{modulename}-${version}-sources.jar.contents" defaultexcludes="yes"
-                      destdir="build/temp/@{modulename}-${version}-javadoc.jar.contents" author="true" version="true" use="true"
-                      windowtitle="Hamcrest" source="1.6" failonerror="yes">
-+                <arg value="-Xdoclint:none"/>
-                 <classpath>
-                     <fileset dir="lib/integration">
-                         <include name="*.jar"/>
diff --git a/hamcrest-1.3-fork-javac.patch b/hamcrest-1.3-fork-javac.patch
deleted file mode 100644
index f5a86fe..0000000
--- a/hamcrest-1.3-fork-javac.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 54b7ccdd1e16f1d6dd07359eae0fcac8f1883373 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Mon, 2 Jan 2017 10:31:56 +0100
-Subject: [PATCH] Fork javac
-
----
- build.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build.xml b/build.xml
-index 1cfd4fb..69acfe8 100644
---- a/build.xml
-+++ b/build.xml
-@@ -284,7 +284,7 @@
-                 <attribute name="Built-Date" value="${build.timestamp}"/>
-             </manifest>
-             <mkdir dir="build/temp/@{modulename}-${version}.jar.contents"/>
--            <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false">
-+            <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false" fork="true">
-                 <classpath>
-                     <fileset dir="lib/integration">
-                         <include name="*.jar"/>
--- 
-2.9.3
-
diff --git a/hamcrest-1.3-javadoc.patch b/hamcrest-1.3-javadoc.patch
deleted file mode 100644
index adaae0d..0000000
--- a/hamcrest-1.3-javadoc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/build.xml b/build.xml
-index ed57763..a4550cb 100644
---- a/build.xml
-+++ b/build.xml
-@@ -135,11 +135,10 @@
-     </target>
- 
-     <target name="javadoc" description="build javadoc jars">
--        <java-to-javadoc-jar modulename="hamcrest-generator-nodeps"/>
-+        <java-to-javadoc-jar modulename="hamcrest-generator"/>
-         <java-to-javadoc-jar modulename="hamcrest-core"/>
-         <java-to-javadoc-jar modulename="hamcrest-library"/>
-         <java-to-javadoc-jar modulename="hamcrest-integration"/>
--        <copy file="build/hamcrest-generator-nodeps-${version}-javadoc.jar" tofile="build/hamcrest-generator-${version}-javadoc.jar"/>
- 
-         <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
-                  destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
diff --git a/hamcrest-1.3-no-jarjar.patch b/hamcrest-1.3-no-jarjar.patch
deleted file mode 100644
index c2399ba..0000000
--- a/hamcrest-1.3-no-jarjar.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 54d43fe..ed57763 100644
---- a/build.xml
-+++ b/build.xml
-@@ -13,17 +13,8 @@
- 
-     <target name="generator" description="Build code generator tool">
-         <java-to-jar srcdir="hamcrest-generator/src/main/java"
--                     modulename="hamcrest-generator-nodeps"
-+                     modulename="hamcrest-generator"
-                      classpath="lib/generator/qdox.jar"/>
--
--        <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
--        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar.jar"/>
--        <jarjar jarfile="build/hamcrest-generator-${version}.jar">
--            <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
--            <zipfileset src="lib/generator/qdox.jar"/>
--            <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
--        </jarjar>
--        <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
-     </target>
- 
-     <target name="core" depends="generator" description="Build core Hamcrest library">
diff --git a/hamcrest-1.3-qdox-2.0.patch b/hamcrest-1.3-qdox-2.0.patch
deleted file mode 100644
index a65f977..0000000
--- a/hamcrest-1.3-qdox-2.0.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 6d7da5456a7458a249bed9c4c1e768cc7cc2fe40 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Wed, 1 Feb 2017 12:57:14 +0100
-Subject: [PATCH] Port to qdox 2.0
-
----
- .../src/main/java/org/hamcrest/generator/QDox.java |  4 ++--
- .../org/hamcrest/generator/QDoxFactoryReader.java  | 26 ++++++++++++----------
- 2 files changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java
-index efaf615..338178d 100644
---- a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java
-+++ b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java
-@@ -1,6 +1,6 @@
- package org.hamcrest.generator;
- 
--import com.thoughtworks.qdox.JavaDocBuilder;
-+import com.thoughtworks.qdox.JavaProjectBuilder;
- import com.thoughtworks.qdox.model.JavaClass;
- 
- import java.io.File;
-@@ -16,7 +16,7 @@ import java.io.Reader;
-  */
- public class QDox {
- 
--    private final JavaDocBuilder javaDocBuilder = new JavaDocBuilder();
-+    private final JavaProjectBuilder javaDocBuilder = new JavaProjectBuilder();
- 
-     public void addSourceTree(File sourceDir) {
-         javaDocBuilder.addSourceTree(sourceDir);
-diff --git a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java
-index 5108140..97fce01 100644
---- a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java
-+++ b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java
-@@ -4,8 +4,10 @@ import com.thoughtworks.qdox.model.DocletTag;
- import com.thoughtworks.qdox.model.JavaClass;
- import com.thoughtworks.qdox.model.JavaMethod;
- import com.thoughtworks.qdox.model.JavaParameter;
--import com.thoughtworks.qdox.model.Type;
-+import com.thoughtworks.qdox.model.JavaType;
-+import com.thoughtworks.qdox.model.impl.DefaultJavaClass;
- 
-+import java.util.ArrayList;
- import java.util.Iterator;
- import java.util.List;
- import java.util.regex.Pattern;
-@@ -56,15 +58,15 @@ public class QDoxFactoryReader implements Iterable<FactoryMethod> {
-         JavaMethod methodSource = findMethodInSource(factoryMethod);
-         if (methodSource != null) {
-             factoryMethod.setJavaDoc(createJavaDocComment(methodSource));
--            JavaParameter[] parametersFromSource
-+            List<JavaParameter> parametersFromSource
-                     = methodSource.getParameters();
-             List<FactoryMethod.Parameter> parametersFromReflection
-                     = factoryMethod.getParameters();
- 
--            if (parametersFromReflection.size() == parametersFromSource.length) {
--                for (int i = 0; i < parametersFromSource.length; i++) {
-+            if (parametersFromReflection.size() == parametersFromSource.size()) {
-+                for (int i = 0; i < parametersFromSource.size(); i++) {
-                     parametersFromReflection.get(i).setName(
--                            parametersFromSource[i].getName());
-+                            parametersFromSource.get(i).getName());
-                 }
-             }
-         }
-@@ -79,18 +81,18 @@ public class QDoxFactoryReader implements Iterable<FactoryMethod> {
-         // Note, this doesn't always work - it struggles with some kinds of generics.
-         // This seems to cover most cases though.
-         List<FactoryMethod.Parameter> params = factoryMethod.getParameters();
--        Type[] types = new Type[params.size()];
-+        List<JavaType> types = new ArrayList<JavaType>(params.size());
-         boolean varArgs = false;
--        for (int i = 0; i < types.length; i++) {
-+        for (int i = 0; i < params.size(); i++) {
-             String type = params.get(i).getType();
-             varArgs = VARARGS_REGEX.matcher(type).find();
-             // QDox ignores varargs and generics, so we strip them out to help QDox.
-             type = GENERIC_REGEX.matcher(type).replaceAll("");
-             type = VARARGS_REGEX.matcher(type).replaceAll("");
--            types[i] = new Type(type);
-+            types.add(new DefaultJavaClass(type));
-         }
--        JavaMethod[] methods = classSource.getMethodsBySignature(factoryMethod.getName(), types, false, varArgs);
--        return methods.length == 1 ?  methods[0] : null;
-+        List<JavaMethod> methods = classSource.getMethodsBySignature(factoryMethod.getName(), types, false, varArgs);
-+        return methods.size() == 1 ?  methods.get(0) : null;
-     }
- 
-     /**
-@@ -98,8 +100,8 @@ public class QDoxFactoryReader implements Iterable<FactoryMethod> {
-      */
-     private static String createJavaDocComment(JavaMethod methodSource) {
-         String comment = methodSource.getComment();
--        DocletTag[] tags = methodSource.getTags();
--        if ((comment == null || comment.trim().length() == 0) && tags.length == 0) {
-+        List<DocletTag> tags = methodSource.getTags();
-+        if ((comment == null || comment.trim().length() == 0) && tags.size() == 0) {
-             return null;
-         }
-         StringBuilder result = new StringBuilder();
--- 
-2.9.3
-
diff --git a/hamcrest-2.2.pom b/hamcrest-2.2.pom
new file mode 100644
index 0000000..89489bc
--- /dev/null
+++ b/hamcrest-2.2.pom
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.hamcrest</groupId>
+  <artifactId>hamcrest</artifactId>
+  <version>2.2</version>
+  <name>Hamcrest</name>
+  <description>Core API and libraries of hamcrest matcher framework.</description>
+  <url>http://hamcrest.org/JavaHamcrest/</url>
+  <licenses>
+    <license>
+      <name>BSD License 3</name>
+      <url>http://opensource.org/licenses/BSD-3-Clause</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>joewalnes</id>
+      <name>Joe Walnes</name>
+    </developer>
+    <developer>
+      <id>npryce</id>
+      <name>Nat Pryce</name>
+    </developer>
+    <developer>
+      <id>sf105</id>
+      <name>Steve Freeman</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>git@github.com:hamcrest/JavaHamcrest.git</connection>
+    <url>https://github.com/hamcrest/JavaHamcrest</url>
+  </scm>
+</project>
diff --git a/hamcrest-build.xml b/hamcrest-build.xml
new file mode 100644
index 0000000..74681b8
--- /dev/null
+++ b/hamcrest-build.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="hamcrest" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="build.properties"/>
+
+  <property name="project.groupId" value="org.hamcrest"/>
+  <property name="project.artifactId" value="hamcrest"/>
+  <property name="project.version" value="2.2"/>
+
+  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.target" value="${compiler.source}"/>
+
+  <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
+  <property name="build.dir" value="target"/>
+  <property name="build.outputDir" value="${build.dir}/classes"/>
+  <property name="build.srcDir" value="src/main/java"/>
+  <property name="build.resourceDir" value="src/main/resources"/>
+  <property name="build.testOutputDir" value="${build.dir}/test-classes"/>
+  <property name="build.testDir" value="src/test/java"/>
+  <property name="build.testResourceDir" value="src/test/resources"/>
+  <property name="test.reports" value="${build.dir}/test-reports"/>
+  <property name="reporting.outputDirectory" value="${build.dir}/site"/>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${build.outputDir}"/>
+    <javac destdir="${build.outputDir}"
+           nowarn="false"
+           debug="true"
+           optimize="false"
+           deprecation="true"
+           target="${compiler.target}"
+           verbose="false"
+           fork="false"
+           source="${compiler.source}">
+      <src>
+        <pathelement location="${build.srcDir}"/>
+      </src>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests"
+          depends="compile"
+          description="Compile the test code"
+          unless="test.skip">
+    <mkdir dir="${build.testOutputDir}"/>
+    <javac destdir="${build.testOutputDir}"
+           nowarn="false"
+           debug="true"
+           optimize="false"
+           deprecation="true"
+           target="${compiler.target}"
+           verbose="false"
+           fork="false"
+           source="${compiler.source}">
+      <src>
+        <pathelement location="${build.testDir}"/>
+      </src>
+      <classpath>
+        <pathelement location="${build.outputDir}"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test"
+          depends="compile-tests, junit-missing"
+          unless="junit.skipped"
+          description="Run the test cases">
+    <mkdir dir="${test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="brief" usefile="false"/>
+      <classpath>
+        <pathelement location="${build.outputDir}"/>
+        <pathelement location="${build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${test.reports}" unless="test">
+        <fileset dir="${build.testDir}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${test.reports}" if="test">
+        <fileset dir="${build.testDir}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+
+  <target name="test-junit-status"
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing"
+          depends="test-junit-status"
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${build.srcDir}"
+             packagenames="*"
+             destdir="${reporting.outputDirectory}/apidocs"
+             access="protected"
+             source="${compiler.source}"
+             verbose="false"
+             version="true"
+             use="true"
+             author="true"
+             splitindex="false"
+             nodeprecated="false"
+             nodeprecatedlist="false"
+             notree="false"
+             noindex="false"
+             nohelp="false"
+             nonavbar="false"
+             serialwarn="false"
+             charset="ISO-8859-1"
+             linksource="false"
+             doctitle="Hamcrest ${project.version} API"
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${build.dir}/${build.finalName}.jar"
+         compress="true"
+         index="false"
+         basedir="${build.outputDir}"
+         excludes="**/package.html">
+      <manifest>
+        <attribute name="Automatic-Module-Name" value="${project.groupId}"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="${project.artifactId}"/>
+        <attribute name="Bundle-SymbolicName" value="${project.groupId}"/>
+        <attribute name="Bundle-Version" value="${project.version}"/>
+        <attribute name="Export-Package" value="org.hamcrest.beans;version=&quot;${project.version}&quot;;uses:=&quot;org.hamcrest&quot;,org.hamcrest.collection;version=&quot;${project.version}&quot;;uses:=&quot;org.hamcrest&quot;,org.hamcrest.comparator;version=&quot;${project.version}&quot;;uses:=&quot;org.hamcrest&quot;,org.hamcrest.core;version=&quot;${project.version}&quot;;uses:=&quot;org.hamcrest&quot;,org.hamcrest.internal;version=&quot;${project.version}&quot;;uses:=&quot;org.hamcrest&quot;,org.hamcrest.io;version=&quot;${project.version}&quot;;uses:=&quot;org.hamcrest&quot;,org.hamcrest.number;version=&quot;${project.version}&quot;;uses:=&quot;org.hamcrest&quot;,org.hamcrest.object;version=&quot;${project.version}&quot;;uses:=&quot;org.hamcrest&quot;,org.hamcrest.text;version=&quot;${project.version}&quot;;uses:=&quot;org.hamcrest&quot;,org.hamcrest.xml;version=&quot;${project.version}&quot;;uses:=&quot;javax.xml.namespace,org.hamcrest,org.w3c.dom&quot;,org.hamcrest;version=&quot;${project.version}&quot;;uses:=&quot;javax.xml.namespace,org.hamcrest.collection,org.hamcrest.core,org.hamcrest.internal,org.w3c.dom&quot;"/>
+        <attribute name="Import-Package" value="javax.xml.namespace;resolution:=optional,javax.xml.xpath;resolution:=optional,org.hamcrest.beans,org.hamcrest.collection,org.hamcrest.comparator,org.hamcrest.core,org.hamcrest.internal,org.hamcrest.number,org.hamcrest.object,org.hamcrest.text,org.hamcrest.xml,org.hamcrest,org.w3c.dom;resolution:=optional"/>
+        <attribute name="Implementation-Title" value="${project.artifactId}"/>
+        <attribute name="Implementation-Vendor" value="${project.groupId}"/>
+        <attribute name="Implementation-Version" value="${project.version}"/>
+        <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
+        <attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
+        <attribute name="JavaPackages-Version" value="${project.version}"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+</project>
diff --git a/hamcrest-core-MANIFEST.MF b/hamcrest-core-MANIFEST.MF
deleted file mode 100644
index 754d5d9..0000000
--- a/hamcrest-core-MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Vendor: Fedoraproject.org
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Name: Hamcrest Core
-Bundle-SymbolicName: org.hamcrest.core
-Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too
- ls:org.eclipse.orbit/org.hamcrest.core;tag=v201303031735
-Export-Package: org.hamcrest;version="1.3.0";core=split;mandatory:=cor
- e,org.hamcrest.core;version="1.3.0",org.hamcrest.internal;version="1.
- 3.0";x-internal:=true
-Bundle-Version: 1.3.0.v201303031735
-Bundle-ManifestVersion: 2
diff --git a/hamcrest-generator-MANIFEST.MF b/hamcrest-generator-MANIFEST.MF
deleted file mode 100644
index f99c220..0000000
--- a/hamcrest-generator-MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.hamcrest.generator
-Bundle-Version: 1.3.0.v20090501071000
-Export-Package: org.hamcrest.generator;version="1.3.0",org.hamcrest.ge
- nerator.config;version="1.3.0"
-Bundle-ManifestVersion: 2
-Import-Package: com.thoughtworks.qdox;version="1.6.3",com.thoughtworks
- .qdox.ant;version="1.6.3",com.thoughtworks.qdox.directorywalker;versi
- on="1.6.3",com.thoughtworks.qdox.junit;version="1.6.3",com.thoughtwor
- ks.qdox.model;version="1.6.3",com.thoughtworks.qdox.model.util;versio
- n="1.6.3",com.thoughtworks.qdox.parser;version="1.6.3",com.thoughtwor
- ks.qdox.parser.impl;version="1.6.3",com.thoughtworks.qdox.parser.stru
- cts;version="1.6.3",com.thoughtworks.qdox.tools;version="1.6.3"
diff --git a/hamcrest-integration-MANIFEST.MF b/hamcrest-integration-MANIFEST.MF
deleted file mode 100644
index ab68061..0000000
--- a/hamcrest-integration-MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.hamcrest.integration
-Require-Bundle: org.hamcrest.core;bundle-version="1.3.0"
-Bundle-Version: 1.3.0.v20090501071000
-Export-Package: org.hamcrest;integration=split;mandatory:=integration;
- version="1.3.0",org.hamcrest.integration;version="1.3.0"
-Bundle-ManifestVersion: 2
-Import-Package: org.easymock;version="2.4.0";resolution:=optional,org.
- jmock.core;version="1.10";resolution:=optional
diff --git a/hamcrest-java-1.3.tar.gz b/hamcrest-java-1.3.tar.gz
deleted file mode 100644
index ebd21cc..0000000
Binary files a/hamcrest-java-1.3.tar.gz and /dev/null differ
diff --git a/hamcrest-java-2.2.tar.gz b/hamcrest-java-2.2.tar.gz
new file mode 100644
index 0000000..c9e5799
Binary files /dev/null and b/hamcrest-java-2.2.tar.gz differ
diff --git a/hamcrest-library-MANIFEST.MF b/hamcrest-library-MANIFEST.MF
deleted file mode 100644
index 5fc8676..0000000
--- a/hamcrest-library-MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.hamcrest.library
-Require-Bundle: org.hamcrest.core;bundle-version="1.3.0"
-Bundle-Version: 1.3.0.v20090501071000
-Export-Package: org.hamcrest;version="1.3.0";library=split;mandatory:=
- library,org.hamcrest.beans;version="1.3.0",org.hamcrest.collection;ve
- rsion="1.3.0",org.hamcrest.number;version="1.3.0",org.hamcrest.object
- ;version="1.3.0",org.hamcrest.text;version="1.3.0",org.hamcrest.xml;v
- ersion="1.3.0"
-Bundle-ManifestVersion: 2
diff --git a/hamcrest.spec b/hamcrest.spec
index 5efb8ee..c74d85f 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -1,32 +1,29 @@
+%bcond_with tests
 Name:           hamcrest
-Version:        1.3
-Release:        25
+Version:        2.2
+Release:        1
 Epoch:          0
 Summary:        Library of matcher objects for building test expressions
 
-License:        BSD
+License:        BSD-3-Clause
 URL:            https://github.com/hamcrest/JavaHamcrest
 Source0:        https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-%{version}.tar.gz
-Source1:        hamcrest-core-MANIFEST.MF
-Source2:        hamcrest-library-MANIFEST.MF
-Source3:        hamcrest-integration-MANIFEST.MF
-Source4:        hamcrest-generator-MANIFEST.MF
-
-Patch0001:      hamcrest-1.3-build.patch
-Patch0002:      hamcrest-1.3-no-jarjar.patch
-Patch0003:      hamcrest-1.3-javadoc.patch
-Patch0004:      hamcrest-1.3-qdox-2.0.patch
-Patch0005:      hamcrest-1.3-fork-javac.patch
-
-# pacth for openEuler
-Patch9000:      getMethods-sort.patch
+Source1:        %{name}-build.xml
+Source2:        https://repo1.maven.org/maven2/org/hamcrest/hamcrest/%{version}/hamcrest-%{version}.pom
+Patch0001:      0001-Fix-build-with-OpenJDK-11.patch
 
 BuildArch:      noarch
-BuildRequires:  javapackages-local ant ant-junit easymock junit qdox testng
-Requires:       qdox easymock >= 3.0
+BuildRequires:  ant
+BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
+BuildRequires:  javapackages-local
+%if %{with tests}
+BuildRequires:  ant-junit
+%endif
 
 Provides:       %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:      %{name}-core < %{epoch}:%{version}-%{release}
+Obsoletes:      %{name}-demo < %{epoch}:%{version}-%{release}
 
 %description
 Provides a library of matcher objects (also known as constraints or
@@ -42,67 +39,56 @@ Obsoletes:      %{name}-javadoc < %{epoch}:%{version}-%{release}
 %description help
 Javadoc for hamcrest package.
 
-%package demo
-Summary:        Demos for hamcrest package
-Requires:       junit testng %{name} = %{epoch}:%{version}-%{release}
-
-%description demo
-Demo files for hamcrest package.
-
 %prep
-%autosetup -n JavaHamcrest-%{name}-java-%{version} -p1
-
-find . -type f -name "*.jar" -delete
-rm -rf hamcrest-integration/src/main/java/org/hamcrest/integration/JMock1Adapter.java
-rm -rf hamcrest-integration/src/main/java/org/hamcrest/JMock1Matchers.java
-rm -rf hamcrest-unit-test/src/main/java/org/hamcrest/integration/JMock1AdapterTest.java
-
-
-ln -sf $(build-classpath qdox) lib/generator/
-ln -sf $(build-classpath easymock3) lib/integration/
-ln -sf $(build-classpath jmock) lib/integration/
-ln -sf $(build-classpath testng-jdk15) lib/integration/
+%autosetup -n JavaHamcrest-%{version} -p1
+# Only build hamcrest
+mkdir ../bak
+cp -r hamcrest/* ../bak
+cp LICENSE.txt ../bak
+cp README.md ../bak
+rm -rf *
+cp -r ../bak/* .
+rm -rf ../bak
+cp %{SOURCE1} build.xml
+cp %{SOURCE2} .
 
 %build
-export CLASSPATH=$(build-classpath qdox)
-export OPT_JAR_LIST="junit ant/ant-junit"
-ant -Dant.build.javac.source=1.5 -Dversion=%{version} -Dbuild.sysclasspath=last clean core generator library bigjar javadoc
-
-jar ufm build/hamcrest-core-%{version}.jar %{SOURCE1}
-jar ufm build/hamcrest-library-%{version}.jar %{SOURCE2}
-jar ufm build/hamcrest-integration-%{version}.jar %{SOURCE3}
-jar ufm build/hamcrest-generator-%{version}.jar %{SOURCE4}
+%ant \
+%if %{without tests}
+    -Dtest.skip=true \
+%endif
+    jar javadoc
 
 %install
-sed -i 's/@VERSION@/%{version}/g' pom/*.pom
+# jars
+install -dm 0755 %{buildroot}%{_javadir}/%{name}
+install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
+ln -sf %{name}.jar %{buildroot}%{_javadir}/%{name}/all.jar
+ln -sf %{name}.jar %{buildroot}%{_javadir}/%{name}/core.jar
+ln -sf %{name}.jar %{buildroot}%{_javadir}/%{name}/library.jar
 
-%mvn_artifact pom/hamcrest-parent.pom
-%mvn_artifact pom/hamcrest-all.pom build/hamcrest-all-%{version}.jar
-%mvn_artifact pom/hamcrest-core.pom build/hamcrest-core-%{version}.jar
-%mvn_artifact pom/hamcrest-generator.pom build/hamcrest-generator-%{version}.jar
-%mvn_artifact pom/hamcrest-library.pom build/hamcrest-library-%{version}.jar
-%mvn_artifact pom/hamcrest-integration.pom build/hamcrest-integration-%{version}.jar
+# poms
+install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
+install -pm 0644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
+%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -a "org.hamcrest:hamcrest-all,org.hamcrest:hamcrest-core,org.hamcrest:hamcrest-library"
 
-%mvn_package :hamcrest-parent core
-%mvn_package :hamcrest-core core
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}
 
-%mvn_file ':hamcrest-{*}' %{name}/@1
-
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/hamcrest
-cp -rp hamcrest-examples $RPM_BUILD_ROOT%{_datadir}/hamcrest/
-
-%mvn_install -J build/temp/hamcrest-all-1.3-javadoc.jar.contents/
-
-
-%files -f .mfiles -f .mfiles-core
+%files -f .mfiles
+%{_javadir}/%{name}
 %license LICENSE.txt
+%doc README.md
 
-%files help -f .mfiles-javadoc
-
-%files demo
-%{_datadir}/hamcrest
+%files help
+%{_javadocdir}/%{name}
 
 %changelog
+* Mon Sep 25 2023 wangkai <13474090681@163.com> - 0:2.2-1
+- Update to 2.2
+
 * Tue Dec 03 2019 daiqianwen <daiqianwen@huawei.com> - 0:1.3-25
 - Package init
 
diff --git a/hamcrest.yaml b/hamcrest.yaml
new file mode 100644
index 0000000..e9f9382
--- /dev/null
+++ b/hamcrest.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: hamcrest/JavaHamcrest
+tag_prefix: "^v"
+separator: "."