Hello community, here is the log from the commit of package maven-jlink-plugin for openSUSE:Factory checked in at 2019-11-26 16:59:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-jlink-plugin (Old) and /work/SRC/openSUSE:Factory/.maven-jlink-plugin.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-jlink-plugin" Tue Nov 26 16:59:43 2019 rev:2 rq:750603 version:3.0.0~alpha1 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-jlink-plugin/maven-jlink-plugin.changes 2019-04-30 12:57:59.634151092 +0200 +++ /work/SRC/openSUSE:Factory/.maven-jlink-plugin.new.26869/maven-jlink-plugin.changes 2019-11-26 16:59:45.528099960 +0100 @@ -1,0 +2,9 @@ +Sun Nov 24 17:21:19 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Specify maven.compiler.release to fix build with jdk9+ and newer + maven-javadoc-plugin +- Added patch: + * maven-jlink-plugin-plexus-languages-1.0.patch + + fix build against plexus-languages >= 1.0 + +------------------------------------------------------------------- New: ---- maven-jlink-plugin-plexus-languages-1.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-jlink-plugin.spec ++++++ --- /var/tmp/diff_new_pack.wnhQiE/_old 2019-11-26 16:59:45.952099820 +0100 +++ /var/tmp/diff_new_pack.wnhQiE/_new 2019-11-26 16:59:45.952099820 +0100 @@ -1,7 +1,7 @@ # # spec file for package maven-jlink-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 @@ -27,8 +27,10 @@ Group: Development/Libraries/Java URL: https://maven.apache.org/plugins/%{name}/ Source0: https://archive.apache.org/dist/maven/plugins/%{name}-%{basever}-%{opt}-%{optver}-source-release.zip +Patch0: maven-jlink-plugin-plexus-languages-1.0.patch BuildRequires: fdupes BuildRequires: maven-local +BuildRequires: unzip BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) @@ -38,7 +40,6 @@ BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) BuildRequires: mvn(org.codehaus.plexus:plexus-java) -BuildRequires: unzip BuildArch: noarch %description @@ -54,9 +55,13 @@ %prep %setup -q -n %{name}-%{basever}-%{opt}-%{optver} +%patch0 -p1 %build -%{mvn_build} -f +%{mvn_build} -f \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} + -- -Dmaven.compiler.release=8 +%endif %install %mvn_install ++++++ maven-jlink-plugin-plexus-languages-1.0.patch ++++++ --- maven-jlink-plugin-3.0.0-alpha-1/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java 2017-09-09 16:11:26.000000000 +0200 +++ maven-jlink-plugin-3.0.0-alpha-1/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java 2019-11-22 11:53:47.920138538 +0100 @@ -49,7 +49,7 @@ 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; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.cli.Commandline;
