From 009fc4cfdd63813506117e1fbb56f9682a2cc435a52c0d56b53a41746a0b81f1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 11 Mar 2022 10:08:00 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-compiler-plugin?expand=0&rev=23 --- 0001-plexus-languages-1.0.patch | 25 ------------------------- 0002-MCOMPILER-359-Fix-for-NPE.patch | 25 ------------------------- 2 files changed, 50 deletions(-) delete mode 100644 0001-plexus-languages-1.0.patch delete mode 100644 0002-MCOMPILER-359-Fix-for-NPE.patch diff --git a/0001-plexus-languages-1.0.patch b/0001-plexus-languages-1.0.patch deleted file mode 100644 index f145f0f..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 ce1f05c..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 -