pool/maven-compiler-plugin
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 750520 from Java:packages

Browse Source 
fix build against plexus-languages >= 1.0

OBS-URL: https://build.opensuse.org/request/show/750520
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-compiler-plugin?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2019-11-26 15:55:29 +00:00 committed by Git OBS Bridge
commit 5fc70c316a
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
00-plexus-languages-1.0.patch Normal file
View File

@ -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

9
maven-compiler-plugin.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Nov 21 20:20:18 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- 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
-------------------------------------------------------------------
Wed Apr 3 09:20:36 UTC 2019 - Fridrich Strba <fstrba@suse.com>

11
maven-compiler-plugin.spec
View File

@ -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 @@ 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: 00-plexus-languages-1.0.patch
BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: maven-lib
@ -87,6 +88,7 @@ API documentation for %{name}.
cp %{SOURCE1} build.xml
%patch0 -p1
%endif
%patch1 -p1
%build
%if %{with bootstrap}
@ -106,7 +108,10 @@ build-jar-repository -s lib \
%{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