From 53753e16e99fcfa5498cbc978d0ab80126ea265e Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Thu, 29 Jun 2023 11:32:30 +0200 Subject: [PATCH] re-import sources as agreed with the maintainer --- .gitignore | 7 +++- ...TH-env-variable-instead-of-JAVA_HOME.patch | 39 ------------------- gating.yaml | 8 ---- 3 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch delete mode 100644 gating.yaml diff --git a/.gitignore b/.gitignore index d60dafe..c776534 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,6 @@ -SOURCES/plexus-interpolation-1.22.tar.gz +plexus-interpolation-1.13.tar.bz2 +/plexus-interpolation-1.14.tar.xz +sonatype-plexus-interpolation-plexus-interpolation-1.15-0-g9690e65.tar.gz +/plexus-interpolation-1.15.tar.gz +/plexus-interpolation-1.21.tar.gz +/plexus-interpolation-1.22.tar.gz diff --git a/0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch b/0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch deleted file mode 100644 index daf4bab..0000000 --- a/0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d6623bd636d7f07aa8c73234375bdd11ccd6ee95 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Wed, 25 Mar 2020 06:58:13 +0100 -Subject: [PATCH] Use PATH env variable instead of JAVA_HOME - ---- - .../plexus/interpolation/EnvarBasedValueSourceTest.java | 2 +- - .../plexus/interpolation/fixed/EnvarBasedValueSourceTest.java | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java b/src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java -index bc88e8b..6fc4c13 100644 ---- a/src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java -+++ b/src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java -@@ -87,7 +87,7 @@ public class EnvarBasedValueSourceTest - - EnvarBasedValueSource source = new EnvarBasedValueSource(); - -- String realEnvVar = "JAVA_HOME"; -+ String realEnvVar = "PATH"; - - String realValue = System.getenv().get( realEnvVar ); - assertNotNull( "Can't run this test until " + realEnvVar + " env variable is set", realValue ); -diff --git a/src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java b/src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java -index beaf014..94899d7 100644 ---- a/src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java -+++ b/src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java -@@ -87,7 +87,7 @@ public class EnvarBasedValueSourceTest - - EnvarBasedValueSource source = new EnvarBasedValueSource(); - -- String realEnvVar = "JAVA_HOME"; -+ String realEnvVar = "PATH"; - - String realValue = System.getenv().get( realEnvVar ); - assertNotNull( "Can't run this test until " + realEnvVar + " env variable is set", realValue ); --- -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}