commit maven-compiler-plugin for openSUSE:Factory
Hello community,
here is the log from the commit of package maven-compiler-plugin for
openSUSE:Factory checked in at 2019-12-02 11:35:32
Comparing /work/SRC/openSUSE:Factory/maven-compiler-plugin (Old)
and /work/SRC/openSUSE:Factory/.maven-compiler-plugin.new.4691 (New)
Package is "maven-compiler-plugin"
Mon Dec 2 11:35:32 2019 rev:4 rq:752791 version:3.8.1
Changes:
---
/work/SRC/openSUSE:Factory/maven-compiler-plugin/maven-compiler-plugin.changes
2019-11-28 13:50:54.786693866 +0100
+++
/work/SRC/openSUSE:Factory/.maven-compiler-plugin.new.4691/maven-compiler-plugin.changes
2019-12-02 11:38:27.254462107 +0100
@@ -1,0 +2,6 @@
+Fri Nov 29 10:50:57 UTC 2019 - Fridrich Strba
+
+- Remove all dependencies with scope test, since we are disabling
+ tests
+
+---
Other differences:
--
++ maven-compiler-plugin.spec ++
--- /var/tmp/diff_new_pack.3bWRjD/_old 2019-12-02 11:38:27.954462255 +0100
+++ /var/tmp/diff_new_pack.3bWRjD/_new 2019-12-02 11:38:27.958462255 +0100
@@ -52,7 +52,6 @@
%else
Name: %{base_name}
BuildRequires: xmvn
-BuildRequires:
mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness)
BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-jar-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin)
@@ -60,7 +59,6 @@
BuildRequires: mvn(org.apache.maven.plugins:maven-resources-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-surefire-plugin)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
-BuildRequires: mvn(org.mockito:mockito-core)
Obsoletes: %{base_name}-bootstrap
#!BuildRequires: maven-compiler-plugin-bootstrap
#!BuildRequires: maven-jar-plugin-bootstrap
@@ -90,6 +88,8 @@
%endif
%patch1 -p1
+%pom_remove_dep :::test
+
%build
%if %{with bootstrap}
mkdir -p lib
commit maven-compiler-plugin for openSUSE:Factory
Hello community, here is the log from the commit of package maven-compiler-plugin for openSUSE:Factory checked in at 2019-11-28 13:50:48 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" Thu Nov 28 13:50:48 2019 rev:3 rq:751522 version:3.8.1 Changes: --- /work/SRC/openSUSE:Factory/maven-compiler-plugin/maven-compiler-plugin.changes 2019-11-26 16:56:11.724170558 +0100 +++ /work/SRC/openSUSE:Factory/.maven-compiler-plugin.new.26869/maven-compiler-plugin.changes 2019-11-28 13:50:54.786693866 +0100 @@ -1,0 +2,8 @@ +Mon Nov 25 16:53:16 UTC 2019 - Fridrich Strba + +- Update to upstream version 3.8.1 +- Modified patch: + * maven-compiler-plugin-bootstrap-resources.patch ++ Regenerate from the non-bootstrap build + +--- Old: maven-compiler-plugin-3.8.0-source-release.zip New: maven-compiler-plugin-3.8.1-source-release.zip Other differences: -- ++ maven-compiler-plugin.spec ++ --- /var/tmp/diff_new_pack.yiNV8u/_old 2019-11-28 13:50:55.622693548 +0100 +++ /var/tmp/diff_new_pack.yiNV8u/_new 2019-11-28 13:50:55.626693547 +0100 @@ -23,7 +23,7 @@ %bcond_with bootstrap %endif %global base_name maven-compiler-plugin -Version:3.8.0 +Version:3.8.1 Release:0 Summary:Maven Compiler Plugin License:Apache-2.0 ++ maven-compiler-plugin-bootstrap-resources.patch ++ --- /var/tmp/diff_new_pack.yiNV8u/_old 2019-11-28 13:50:55.93532 +0100 +++ /var/tmp/diff_new_pack.yiNV8u/_new 2019-11-28 13:50:55.670693530 +0100 @@ -1,5 +1,5 @@ maven-compiler-plugin-3.8.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-compiler-plugin/plugin-help.xml 1970-01-01 01:00:00.0 +0100 -+++ maven-compiler-plugin-3.8.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-compiler-plugin/plugin-help.xml 2019-04-01 10:49:48.537467091 +0200 +--- maven-compiler-plugin-3.8.1/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-compiler-plugin/plugin-help.xml 1970-01-01 01:00:00.0 +0100 maven-compiler-plugin-3.8.1/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-compiler-plugin/plugin-help.xml 2019-11-25 17:47:55.264289561 +0100 @@ -0,0 +1,720 @@ + + @@ -721,9 +721,8 @@ + + + -diff -urEbwBN maven-compiler-plugin-3.8.0.orig/src/main/filtered-resources/META-INF/maven/plugin.xml maven-compiler-plugin-3.8.0/src/main/filtered-resources/META-INF/maven/plugin.xml maven-compiler-plugin-3.8.0/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.0 +0100 -+++ maven-compiler-plugin-3.8.0/src/main/filtered-resources/META-INF/maven/plugin.xml 2019-04-01 10:52:00.226118248 +0200 +--- maven-compiler-plugin-3.8.1/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.0 +0100 maven-compiler-plugin-3.8.1/src/main/filtered-resources/META-INF/maven/plugin.xml 2019-11-25 17:48:57.728635290 +0100 @@ -0,0 +1,1396 @@ + + @@ -1883,19 +1882,19 @@ + org.apache.maven + maven-model + jar -+ 3.5.4 ++ 3.6.2 + + + org.codehaus.plexus + plexus-classworlds + jar -+ 2.5.2 ++ 2.6.0 + + + org.codehaus.plexus + plexus-utils + jar -+ 3.1.0 ++ 3.2.1 + + + org.eclipse.sisu @@ -1925,13 +1924,13 @@ + org.apache.maven + maven-settings + jar -+ 3.5.4 ++ 3.6.2 + + + org.apache.maven.resolver + maven-resolver-util + jar -+ 1.1.1 ++ 1.4.1 + + + org.eclipse.sisu @@ -1958,16 +1957,16 @@ + any + + -+ com.google.guava -+ guava ++ com.google.inject ++ guice + jar -+ 20.0 ++ 4.2.1 + + -+ com.google.inject -+ guice ++ aopalliance ++ aopalliance + jar -+ 4.2.0 ++ 1.0 + + + cglib @@ -1976,22 +1975,28 @@ + 3.2.0 + + -+ aopalliance -+ aopalliance ++ com.google.guava ++ guava + jar -+ 1.0 ++ 19.0 + + + org.apache.maven + maven-resolver-provider + jar -+ 3.5.4 ++ 3.6.2 ++ ++ ++ org.slf4j ++ slf4j-api ++ jar ++ 1.7.25 + + + org.apache.maven.resolver + maven-resolver-api + jar -+ 1.1.1 ++ 1.4.1 + + + javax.inject @@ -2003,25 +2008,19 @@ + org.apache.maven.resolver +
commit maven-compiler-plugin for openSUSE:Factory
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
+
+- 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
