From 18faec41ae1f7ad5e9d888d3f559555ed0391a4e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 24 Apr 2022 22:59:07 +0200 Subject: [PATCH] Update to upstream version 3.10.1 --- .gitignore | 1 + 0001-plexus-languages-1.0.patch | 25 ------------------------- 0002-MCOMPILER-359-Fix-for-NPE.patch | 25 ------------------------- maven-compiler-plugin.spec | 15 +++++---------- sources | 2 +- 5 files changed, 7 insertions(+), 61 deletions(-) delete mode 100644 0001-plexus-languages-1.0.patch delete mode 100644 0002-MCOMPILER-359-Fix-for-NPE.patch diff --git a/.gitignore b/.gitignore index 0f206d1..ccc4943 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /maven-compiler-plugin-3.7.0-source-release.zip /maven-compiler-plugin-3.8.0-source-release.zip /maven-compiler-plugin-3.8.1-source-release.zip +/maven-compiler-plugin-3.10.1-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/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index da6cef3..42cd2ab 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: maven-compiler-plugin -Version: 3.8.1 -Release: 12%{?dist} +Version: 3.10.1 +Release: 1%{?dist} Summary: Maven Compiler Plugin License: ASL 2.0 URL: https://maven.apache.org/plugins/maven-compiler-plugin @@ -10,12 +10,6 @@ BuildArch: noarch Source0: https://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip -# port to plexus-languages 1.0.3 -Patch0: 0001-plexus-languages-1.0.patch - -# Taken from upstream commit: https://github.com/apache/maven-compiler-plugin/commit/116b98153ef5ce7b13c0275324baa28bca8bc887 -Patch1: 0002-MCOMPILER-359-Fix-for-NPE.patch - BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -50,8 +44,6 @@ API documentation for %{name}. %prep %setup -q -%patch0 -p1 -%patch1 -p1 # Replace path to junit in a test case with the system wide .jar sed -i 's|localRepository,\ "junit/junit/3.8.1/junit-3.8.1.jar"|"%(find-jar junit || find-jar javapackages-bootstrap/junit)"|' src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java @@ -69,6 +61,9 @@ sed -i 's|localRepository,\ "junit/junit/3.8.1/junit-3.8.1.jar"|"%(find-jar juni %license LICENSE NOTICE %changelog +* Sun Apr 24 2022 Mikolaj Izdebski - 3.10.1-1 +- Update to upstream version 3.10.1 + * Sat Feb 05 2022 Jiri Vanek - 3.8.1-12 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index 6978974..9eb69cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-compiler-plugin-3.8.1-source-release.zip) = 6ee6e9ac84ffdccee39f626f2adbfd62f880aee9ca404c9f229af68b006617a4394c1586cdc44c9a9e63bdde7d22127e6400e47459ac8f9f6ead15257a93249e +SHA512 (maven-compiler-plugin-3.10.1-source-release.zip) = 45eee4046eef276f8963ed49e3fef81a765610f5e25248c72c0e3a5e4dc2dd518fcd69c94b427187fe751ca63f5b0872dd720f181c6f1025ee84b19c3ae3b813