From f4e30aba3481d62f7bb07cce65e7d4c596a8229a Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 21 Aug 2019 10:53:49 +0200 Subject: [PATCH] Remove unneeded fies --- hamcrest-1.3-build.patch | 39 ------------ hamcrest-1.3-fork-javac.patch | 25 -------- hamcrest-1.3-javadoc.patch | 17 ----- hamcrest-1.3-no-jarjar.patch | 23 ------- hamcrest-1.3-qdox-2.0.patch | 105 ------------------------------- hamcrest-core-MANIFEST.MF | 14 ----- hamcrest-generator-MANIFEST.MF | 18 ------ hamcrest-integration-MANIFEST.MF | 14 ----- hamcrest-library-MANIFEST.MF | 15 ----- 9 files changed, 270 deletions(-) delete mode 100644 hamcrest-1.3-build.patch delete mode 100644 hamcrest-1.3-fork-javac.patch delete mode 100644 hamcrest-1.3-javadoc.patch delete mode 100644 hamcrest-1.3-no-jarjar.patch delete mode 100644 hamcrest-1.3-qdox-2.0.patch delete mode 100644 hamcrest-core-MANIFEST.MF delete mode 100644 hamcrest-generator-MANIFEST.MF delete mode 100644 hamcrest-integration-MANIFEST.MF delete mode 100644 hamcrest-library-MANIFEST.MF 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 @@ - - -+ classpath="lib/generator/qdox.jar"/> - - -- -+ - - -- -+ - - - -@@ -152,7 +152,8 @@ - - -+ windowtitle="Hamcrest" source="1.6" failonerror="yes"> -+ - - - -@@ -313,6 +314,7 @@ - -+ - - - 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 -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 @@ - - - -- -+ - - - --- -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 @@ - - - -- -+ - - - -- - - - -- -- -- -- -- -- -- -- -- - - - 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 -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 { - JavaMethod methodSource = findMethodInSource(factoryMethod); - if (methodSource != null) { - factoryMethod.setJavaDoc(createJavaDocComment(methodSource)); -- JavaParameter[] parametersFromSource -+ List parametersFromSource - = methodSource.getParameters(); - List 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 { - // Note, this doesn't always work - it struggles with some kinds of generics. - // This seems to cover most cases though. - List params = factoryMethod.getParameters(); -- Type[] types = new Type[params.size()]; -+ List types = new ArrayList(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 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 { - */ - 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 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-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-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