Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-compiler-plugin for
openSUSE:Factory checked in at 2022-03-10 22:45:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-compiler-plugin (Old)
and /work/SRC/openSUSE:Factory/.maven-compiler-plugin.new.2349 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-compiler-plugin"
Thu Mar 10 22:45:29 2022 rev:5 rq:960733 version:3.8.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-compiler-plugin/maven-compiler-plugin.changes
2019-12-02 11:38:27.254462107 +0100
+++
/work/SRC/openSUSE:Factory/.maven-compiler-plugin.new.2349/maven-compiler-plugin.changes
2022-03-11 11:47:28.186858263 +0100
@@ -1,0 +2,10 @@
+Thu Mar 10 11:31:51 UTC 2022 - Fridrich Strba <[email protected]>
+
+- Modified patch:
+ * 00-plexus-languages-1.0.patch -> 0001-plexus-languages-1.0.patch
+ + Sync with patch used by Fedora
+- Added patch:
+ * 0002-MCOMPILER-359-Fix-for-NPE.patch
+ + Fix null pointer exception in tests compilation
+
+-------------------------------------------------------------------
Old:
----
00-plexus-languages-1.0.patch
New:
----
0001-plexus-languages-1.0.patch
0002-MCOMPILER-359-Fix-for-NPE.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-compiler-plugin.spec ++++++
--- /var/tmp/diff_new_pack.0XTi7t/_old 2022-03-11 11:47:28.578857873 +0100
+++ /var/tmp/diff_new_pack.0XTi7t/_new 2022-03-11 11:47:28.582857869 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package maven-compiler-plugin
+# spec file
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,7 +32,9 @@
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
+Patch1: 0001-plexus-languages-1.0.patch
+Patch2: 0002-MCOMPILER-359-Fix-for-NPE.patch
+
BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: maven-lib
@@ -87,6 +89,7 @@
%patch0 -p1
%endif
%patch1 -p1
+%patch2 -p1
%pom_remove_dep :::test
++++++ 00-plexus-languages-1.0.patch -> 0001-plexus-languages-1.0.patch ++++++
---
/work/SRC/openSUSE:Factory/maven-compiler-plugin/00-plexus-languages-1.0.patch
2019-11-26 16:56:11.664170578 +0100
+++
/work/SRC/openSUSE:Factory/.maven-compiler-plugin.new.2349/0001-plexus-languages-1.0.patch
2022-03-11 11:47:28.170858278 +0100
@@ -1,3 +1,12 @@
+From fd5749e9b8d47cf350527c4831a4ee53cefc60aa Mon Sep 17 00:00:00 2001
+From: Mat Booth <[email protected]>
+Date: Mon, 20 Jul 2020 22:51:52 +0100
+Subject: [PATCH 1/2] plexus languages 1.0
+
+---
+ .../java/org/apache/maven/plugin/compiler/CompilerMojo.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
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
@@ -11,3 +20,6 @@
/**
* Compiles application sources
+--
+2.26.2
+
++++++ 0002-MCOMPILER-359-Fix-for-NPE.patch ++++++
>From 8ef296b291e7ef1e1e4ab4fa4b520a80bde48a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= <[email protected]>
Date: Tue, 17 Dec 2019 19:05:57 +0100
Subject: [PATCH 2/2] MCOMPILER-359: Fix for NPE
---
.../java/org/apache/maven/plugin/compiler/TestCompilerMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
index f8b9ba1..203dd07 100644
--- a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
+++ b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
@@ -250,7 +250,7 @@ public class TestCompilerMojo
for ( Entry<String, Exception> pathException :
result.getPathExceptions().entrySet() )
{
- Throwable cause = pathException.getValue().getCause();
+ Throwable cause = pathException.getValue();
while ( cause.getCause() != null )
{
cause = cause.getCause();
--
2.26.2
