From 0cff35d41e94a918b7af594728a733ed5683b23b Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Thu, 29 Jun 2023 10:58:25 +0200 Subject: [PATCH] re-import sources as agreed with the maintainer --- .gitignore | 13 ++++++++++++- 0001-plexus-languages-1.0.patch | 25 ------------------------- 0002-MCOMPILER-359-Fix-for-NPE.patch | 25 ------------------------- gating.yaml | 8 -------- 4 files changed, 12 insertions(+), 59 deletions(-) delete mode 100644 0001-plexus-languages-1.0.patch delete mode 100644 0002-MCOMPILER-359-Fix-for-NPE.patch delete mode 100644 gating.yaml diff --git a/.gitignore b/.gitignore index 3ac18d1..a68c2c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,13 @@ -SOURCES/maven-compiler-plugin-3.7.0-source-release.zip +maven-compiler-plugin-2.0.2.tar.xz +/maven-compiler-plugin-2.3.2.tar.xz +/maven-compiler-plugin-2.4.tar.xz +/maven-compiler-plugin-2.5.1-source-release.zip +/maven-compiler-plugin-3.0-source-release.zip +/maven-compiler-plugin-3.1-source-release.zip +/maven-compiler-plugin-3.2-source-release.zip +/maven-compiler-plugin-3.3-source-release.zip +/maven-compiler-plugin-3.5-source-release.zip +/maven-compiler-plugin-3.5.1-source-release.zip +/maven-compiler-plugin-3.6.0-source-release.zip +/maven-compiler-plugin-3.6.1-source-release.zip /maven-compiler-plugin-3.7.0-source-release.zip diff --git a/0001-plexus-languages-1.0.patch b/0001-plexus-languages-1.0.patch deleted file mode 100644 index e7ebcf4..0000000 --- a/0001-plexus-languages-1.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fd5749e9b8d47cf350527c4831a4ee53cefc60aa Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Mon, 20 Jul 2020 22:51:52 +0100 -Subject: [PATCH 1/2] plexus languages 1.0 - ---- - .../java/org/apache/maven/plugin/compiler/CompilerMojo.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java -index 8bc437b..326f9f9 100644 ---- a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java -+++ b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java -@@ -50,7 +50,7 @@ import org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor; - import org.codehaus.plexus.languages.java.jpms.LocationManager; - import org.codehaus.plexus.languages.java.jpms.ResolvePathsRequest; - import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult; --import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult.ModuleNameSource; -+import org.codehaus.plexus.languages.java.jpms.ModuleNameSource; - - /** - * Compiles application sources --- -2.26.2 - diff --git a/0002-MCOMPILER-359-Fix-for-NPE.patch b/0002-MCOMPILER-359-Fix-for-NPE.patch deleted file mode 100644 index db0443e..0000000 --- a/0002-MCOMPILER-359-Fix-for-NPE.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8ef296b291e7ef1e1e4ab4fa4b520a80bde48a9f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= -Date: Tue, 17 Dec 2019 19:05:57 +0100 -Subject: [PATCH 2/2] MCOMPILER-359: Fix for NPE - ---- - .../java/org/apache/maven/plugin/compiler/TestCompilerMojo.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java -index f8b9ba1..203dd07 100644 ---- a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java -+++ b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java -@@ -250,7 +250,7 @@ public class TestCompilerMojo - - for ( Entry pathException : result.getPathExceptions().entrySet() ) - { -- Throwable cause = pathException.getValue().getCause(); -+ Throwable cause = pathException.getValue(); - while ( cause.getCause() != null ) - { - cause = cause.getCause(); --- -2.26.2 - 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}