Hello community,
here is the log from the commit of package maven-compiler-plugin for
openSUSE:Factory checked in at 2019-11-26 16:55:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-compiler-plugin (Old)
and /work/SRC/openSUSE:Factory/.maven-compiler-plugin.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-compiler-plugin"
Tue Nov 26 16:55:29 2019 rev:2 rq:750520 version:3.8.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-compiler-plugin/maven-compiler-plugin.changes
2019-04-05 12:04:55.198598978 +0200
+++
/work/SRC/openSUSE:Factory/.maven-compiler-plugin.new.26869/maven-compiler-plugin.changes
2019-11-26 16:56:11.724170558 +0100
@@ -1,0 +2,9 @@
+Thu Nov 21 20:20:18 UTC 2019 - Fridrich Strba <[email protected]>
+
+- Added patch:
+ * 00-plexus-languages-1.0.patch
+ + fix build against plexus-java >= 1.0
+- Specify maven.compiler.release to fix build with jdk9+ and newer
+ maven-javadoc-plugin
+
+-------------------------------------------------------------------
New:
----
00-plexus-languages-1.0.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-compiler-plugin.spec ++++++
--- /var/tmp/diff_new_pack.oan03V/_old 2019-11-26 16:56:12.556170283 +0100
+++ /var/tmp/diff_new_pack.oan03V/_new 2019-11-26 16:56:12.556170283 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package maven
+# spec file for package maven-compiler-plugin
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,6 +32,7 @@
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: 00-plexus-languages-1.0.patch
BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: maven-lib
@@ -87,6 +88,7 @@
cp %{SOURCE1} build.xml
%patch0 -p1
%endif
+%patch1 -p1
%build
%if %{with bootstrap}
@@ -106,7 +108,10 @@
%{ant} -Dtest.skip=true jar
%else
xmvn --batch-mode --offline \
- -Dmaven.test.skip=true -Dsource=7 \
+ -Dmaven.test.skip=true \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+ -Dmaven.compiler.release=7 \
+%endif
package org.apache.maven.plugins:maven-javadoc-plugin:aggregate
%endif
++++++ 00-plexus-languages-1.0.patch ++++++
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
