From a9b6408281cc9a0d5feab01e62b729a3067fc62f Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Thu, 29 Jun 2023 10:50:49 +0200 Subject: [PATCH] re-import sources as agreed with the maintainer --- .gitignore | 1 - 0001-Port-to-Java-11.patch | 13 ------------- 0002-Port-to-OpenJDK-11.patch | 25 ------------------------- gating.yaml | 8 -------- 4 files changed, 47 deletions(-) delete mode 100644 0001-Port-to-Java-11.patch delete mode 100644 0002-Port-to-OpenJDK-11.patch delete mode 100644 gating.yaml diff --git a/.gitignore b/.gitignore index be3c9a4..fb28667 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/commons-collections-3.2.2-src.tar.gz /commons-collections-3.2.2-src.tar.gz diff --git a/0001-Port-to-Java-11.patch b/0001-Port-to-Java-11.patch deleted file mode 100644 index efbac70..0000000 --- a/0001-Port-to-Java-11.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java -index dfde362..00c5d26 100644 ---- a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java -+++ b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java -@@ -1116,7 +1116,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { - verify(); - - try { -- array = collection.toArray(null); -+ array = collection.toArray((Object[])null); - fail("toArray(null) should raise NPE"); - } catch (NullPointerException e) { - // expected diff --git a/0002-Port-to-OpenJDK-11.patch b/0002-Port-to-OpenJDK-11.patch deleted file mode 100644 index db64aad..0000000 --- a/0002-Port-to-OpenJDK-11.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 085b289c17f7047f4350d52bf594313392ae0caa Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Thu, 31 Oct 2019 12:30:12 +0100 -Subject: [PATCH] Port to OpenJDK 11 - ---- - .../commons/collections/collection/AbstractTestCollection.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java -index dfde362..8287f33 100644 ---- a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java -+++ b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java -@@ -1116,7 +1116,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { - verify(); - - try { -- array = collection.toArray(null); -+ array = collection.toArray((Object[]) null); - fail("toArray(null) should raise NPE"); - } catch (NullPointerException e) { - // expected --- -2.21.0 - diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index d6b7694..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !Policy -product_versions: - - rhel-9 -decision_contexts: - - osci_compose_gate -rules: - # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test - - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}