OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-compiler-plugin?expand=0&rev=24

0001-plexus-languages-1.0.patch

@@ -0,0 +1,25 @@
+From fd5749e9b8d47cf350527c4831a4ee53cefc60aa Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+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
+

0002-MCOMPILER-359-Fix-for-NPE.patch

@@ -0,0 +1,25 @@
+From 8ef296b291e7ef1e1e4ab4fa4b520a80bde48a9f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= <hohwille@users.noreply.github.com>
+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<String, Exception> pathException : result.getPathExceptions().entrySet() )
+                 {
+-                    Throwable cause = pathException.getValue().getCause();
++                    Throwable cause = pathException.getValue();
+                     while ( cause.getCause() != null )
+                     {
+                         cause = cause.getCause();
+-- 
+2.26.2
+

maven-compiler-plugin-3.10.1-source-release.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8dc4f56babe3a5ffe9301d2272b519cc64440ec04cac301e395cc8234e07f132
-size 656659

maven-compiler-plugin-3.8.1-source-release.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c636642705d56f22ee6a0f802e811efedd2e9f84526c7a10c8a88e59571e52f1
+size 588951

maven-compiler-plugin-build.xml

@@ -14,10 +14,10 @@
             value="The Compiler Plugin is used to compile the sources of your project."/>
   <property name="project.groupId" value="org.apache.maven.plugins"/>
   <property name="project.artifactId" value="maven-compiler-plugin"/>
-  <property name="project.version" value="3.10.1"/>
+  <property name="project.version" value="3.8.1"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
-  <property name="spec.version" value="3.10"/>
+  <property name="spec.version" value="3.8"/>
 
   <property name="compiler.source" value="1.7"/>
   <property name="compiler.target" value="${compiler.source}"/>

maven-compiler-plugin.spec

@@ -23,21 +23,24 @@
 %bcond_with bootstrap
 %endif
 %global base_name maven-compiler-plugin
-Version:        3.10.1
+Version:        3.8.1
 Release:        0
 Summary:        Maven Compiler Plugin
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            https://maven.apache.org/plugins/maven-compiler-plugin
-Source0:        https://dlcdn.apache.org/maven/plugins/%{base_name}-%{version}-source-release.zip
+URL:            http://maven.apache.org/plugins/maven-compiler-plugin
+Source0:        http://archive.apache.org/dist/maven/plugins/%{base_name}-%{version}-source-release.zip
 Source1:        %{base_name}-build.xml
 Patch0:         %{base_name}-bootstrap-resources.patch
+Patch1:         0001-plexus-languages-1.0.patch
+Patch2:         0002-MCOMPILER-359-Fix-for-NPE.patch
+
+BuildRequires:  fdupes
 BuildRequires:  javapackages-local
 BuildRequires:  maven-lib
 BuildRequires:  maven-plugin-annotations
 BuildRequires:  maven-shared-incremental
 BuildRequires:  maven-shared-utils
-BuildRequires:  objectweb-asm
 BuildRequires:  plexus-compiler
 BuildRequires:  plexus-languages
 BuildRequires:  unzip
@@ -50,7 +53,6 @@ Name:           %{base_name}-bootstrap
 BuildRequires:  ant
 %else
 Name:           %{base_name}
-BuildRequires:  fdupes
 BuildRequires:  xmvn
 BuildRequires:  mvn(org.apache.maven.plugins:maven-compiler-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-jar-plugin)
@@ -86,11 +88,11 @@ API documentation for %{name}.
 cp %{SOURCE1} build.xml
 %patch0 -p1
 %endif
+%patch1 -p1
+%patch2 -p1
 
 %pom_remove_dep :::test
 
-%pom_xpath_remove pom:project/pom:parent/pom:relativePath
-
 %build
 %if %{with bootstrap}
 mkdir -p lib
@@ -102,7 +104,6 @@ build-jar-repository -s lib \
 	maven-plugin-tools/maven-plugin-annotations \
 	maven-shared-incremental/maven-shared-incremental \
 	maven-shared-utils/maven-shared-utils \
-	objectweb-asm/asm-all \
 	plexus-compiler/plexus-compiler-api \
 	plexus-compiler/plexus-compiler-javac \
 	plexus-compiler/plexus-compiler-manager \
@@ -121,9 +122,7 @@ xmvn --batch-mode --offline \
 
 %install
 %mvn_install
-%if %{without bootstrap}
 %fdupes -s %{buildroot}%{_javadocdir}
-%endif
 
 %files -f .mfiles
 %license LICENSE NOTICE