diff --git a/00-plexus-languages-1.0.patch b/00-plexus-languages-1.0.patch new file mode 100644 index 0000000..e87dec4 --- /dev/null +++ b/00-plexus-languages-1.0.patch @@ -0,0 +1,13 @@ +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 diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index 89a69a3..313e259 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -1,6 +1,6 @@ Name: maven-compiler-plugin Version: 3.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maven Compiler Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-compiler-plugin @@ -8,6 +8,9 @@ BuildArch: noarch Source0: http://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip +# port to plexus-languages 1.0.3 +Patch0: 00-plexus-languages-1.0.patch + BuildRequires: maven-local BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-core) @@ -35,6 +38,7 @@ API documentation for %{name}. %prep %setup -q +%patch0 -p1 %build %mvn_build -f @@ -49,6 +53,9 @@ API documentation for %{name}. %license LICENSE NOTICE %changelog +* Tue Oct 15 2019 Fabio Valentini - 3.8.1-3 +- Port to plexus-languages 1.0. + * Thu Jul 25 2019 Fedora Release Engineering - 3.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild