From 52d2eb49f66b582a9cfcb42afea224d0a3293203429e3c87d94fb0400dccdafb Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 10 Mar 2022 16:11:56 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-reporting-impl?expand=0&rev=6

---
 0001-Remove-dependency-on-junit-addons.patch  | 124 ++++++++----------
 maven-reporting-impl-3.0.0-source-release.zip |   3 -
 maven-reporting-impl-3.1.0-source-release.zip |   3 +
 maven-reporting-impl-build.xml                |   6 +-
 maven-reporting-impl.spec                     |   8 +-
 5 files changed, 63 insertions(+), 81 deletions(-)
 delete mode 100644 maven-reporting-impl-3.0.0-source-release.zip
 create mode 100644 maven-reporting-impl-3.1.0-source-release.zip

diff --git a/0001-Remove-dependency-on-junit-addons.patch b/0001-Remove-dependency-on-junit-addons.patch
index c1fb584..edb0d2f 100644
--- a/0001-Remove-dependency-on-junit-addons.patch
+++ b/0001-Remove-dependency-on-junit-addons.patch
@@ -1,72 +1,52 @@
-From 2f414c5566febf44beb77c43340eafccad1547e2 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Tue, 17 Jul 2018 11:57:16 +0200
-Subject: [PATCH] Remove dependency on junit-addons
-
----
- pom.xml                                                        |  6 ------
- .../apache/maven/reporting/AbstractMavenReportRenderer.java    |  2 +-
- .../maven/reporting/AbstractMavenReportRendererTest.java       | 10 ++--------
- 3 files changed, 3 insertions(+), 15 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 239742e..dc75ecd 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -135,12 +135,6 @@
-       <version>3.8.2</version>
-       <scope>test</scope>
-     </dependency>
--    <dependency>
--      <groupId>junit-addons</groupId>
--      <artifactId>junit-addons</artifactId>
--      <version>1.4</version>
--      <scope>test</scope>
--    </dependency>
-   </dependencies>
- 
-   <build>
-diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
-index 6f954ae..c11acd3 100644
---- a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
-+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
-@@ -597,7 +597,7 @@ public abstract class AbstractMavenReportRenderer
-      * @param text a text with or without the pattern <code>{text, url}</code>
-      * @return a map of text/href
-      */
--    private static List<String> applyPattern( String text )
-+    static List<String> applyPattern( String text )
-     {
-         if ( StringUtils.isEmpty( text ) )
-         {
-diff --git a/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java b/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
-index cdb9299..e8dce8f 100644
---- a/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
-+++ b/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
-@@ -24,7 +24,8 @@ import java.util.List;
- 
- import junit.framework.Assert;
- import junit.framework.TestCase;
--import junitx.util.PrivateAccessor;
-+
-+import static org.apache.maven.reporting.AbstractMavenReportRenderer.applyPattern;
- 
- /**
-  * Test case for some public method in AbstractMavenReportRenderer.
-@@ -32,13 +33,6 @@ import junitx.util.PrivateAccessor;
- public class AbstractMavenReportRendererTest
-     extends TestCase
- {
--    private static List<String> applyPattern( String pattern )
--        throws Throwable
--    {
--        return (List<String>) PrivateAccessor.invoke( AbstractMavenReportRenderer.class, "applyPattern",
--                                              new Class[] { String.class }, new Object[] { pattern } );
--    }
--
-     private static void checkPattern( String pattern, String[] expectedResult ) throws Throwable
-     {
-         List<String> result = applyPattern( pattern );
--- 
-2.14.3
-
+--- maven-reporting-impl-3.1.0/pom.xml	2022-03-10 17:08:29.894389771 +0100
++++ maven-reporting-impl-3.1.0/pom.xml	2022-03-10 17:09:12.654649105 +0100
+@@ -140,12 +140,6 @@
+       <version>4.13.1</version>
+       <scope>test</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>junit-addons</groupId>
+-      <artifactId>junit-addons</artifactId>
+-      <version>1.4</version>
+-      <scope>test</scope>
+-    </dependency>
+   </dependencies>
+ 
+   <build>
+--- maven-reporting-impl-3.1.0/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java	2022-03-10 17:08:29.894389771 +0100
++++ maven-reporting-impl-3.1.0/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java	2022-03-10 17:09:12.654649105 +0100
+@@ -599,7 +599,7 @@
+      * @param text a text with or without the pattern <code>{text, url}</code>
+      * @return a map of text/href
+      */
+-    private static List<String> applyPattern( String text )
++    static List<String> applyPattern( String text )
+     {
+         if ( StringUtils.isEmpty( text ) )
+         {
+--- maven-reporting-impl-3.1.0/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java	2022-03-10 17:08:29.898389795 +0100
++++ maven-reporting-impl-3.1.0/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java	2022-03-10 17:09:12.654649105 +0100
+@@ -24,7 +24,8 @@
+ 
+ import junit.framework.Assert;
+ import junit.framework.TestCase;
+-import junitx.util.PrivateAccessor;
++
++import static org.apache.maven.reporting.AbstractMavenReportRenderer.applyPattern;
+ 
+ /**
+  * Test case for some public method in AbstractMavenReportRenderer.
+@@ -32,13 +33,6 @@
+ public class AbstractMavenReportRendererTest
+     extends TestCase
+ {
+-    private static List<String> applyPattern( String pattern )
+-        throws Throwable
+-    {
+-        return (List<String>) PrivateAccessor.invoke( AbstractMavenReportRenderer.class, "applyPattern",
+-                                              new Class[] { String.class }, new Object[] { pattern } );
+-    }
+-
+     private static void checkPattern( String pattern, String[] expectedResult ) throws Throwable
+     {
+         List<String> result = applyPattern( pattern );
diff --git a/maven-reporting-impl-3.0.0-source-release.zip b/maven-reporting-impl-3.0.0-source-release.zip
deleted file mode 100644
index 5c59810..0000000
--- a/maven-reporting-impl-3.0.0-source-release.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d9fab3ffa5271f569262b1fdc752d64021854a5f9be163293add5c51b32f0c2
-size 43634
diff --git a/maven-reporting-impl-3.1.0-source-release.zip b/maven-reporting-impl-3.1.0-source-release.zip
new file mode 100644
index 0000000..09efe23
--- /dev/null
+++ b/maven-reporting-impl-3.1.0-source-release.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e81e170d9666aa4e6880b23ba20c16de046387fa31726de837003ecd4b039d2b
+size 47021
diff --git a/maven-reporting-impl-build.xml b/maven-reporting-impl-build.xml
index ea73464..ab66fa1 100644
--- a/maven-reporting-impl-build.xml
+++ b/maven-reporting-impl-build.xml
@@ -11,14 +11,14 @@
   <property name="project.groupId" value="org.apache.maven.reporting"/>
   <property name="project.artifactId" value="maven-reporting-impl"/>
   <property name="project.name" value="Apache Maven Reporting Implementation"/>
-  <property name="project.version" value="3.0.0"/>
+  <property name="project.version" value="3.1.0"/>
 
-  <property name="spec.version" value="3.0"/>
+  <property name="spec.version" value="3.1"/>
 
   <property name="project.organization.name"
             value="The Apache Software Foundation"/>
 
-  <property name="compiler.source" value="1.6"/>
+  <property name="compiler.source" value="1.7"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName"
diff --git a/maven-reporting-impl.spec b/maven-reporting-impl.spec
index 565fd95..012404a 100644
--- a/maven-reporting-impl.spec
+++ b/maven-reporting-impl.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package maven-reporting-impl
 #
-# Copyright (c) 2020 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
@@ -18,13 +18,13 @@
 
 %bcond_with tests
 Name:           maven-reporting-impl
-Version:        3.0.0
+Version:        3.1.0
 Release:        0
 Summary:        Abstract classes to manage report generation
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            http://maven.apache.org/shared/%{name}
-Source0:        http://repo1.maven.org/maven2/org/apache/maven/reporting/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Source0:        https://dlcdn.apache.org/maven/reporting/%{name}-%{version}-source-release.zip
 Source1:        %{name}-build.xml
 Patch0:         0001-Remove-dependency-on-junit-addons.patch
 BuildRequires:  ant
@@ -70,6 +70,8 @@ API documentation for %{name}.
 cp %{SOURCE1} build.xml
 %patch0 -p1
 
+%pom_remove_parent
+
 # integration tests try to download stuff from the internet
 # and therefore they don't work in Build Service
 %pom_remove_plugin :maven-invoker-plugin

From 5eab69e5edae4588517524cc8609dd1f24b1389b541054f4700891098acc3287 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 11 Mar 2022 07:03:58 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-reporting-impl?expand=0&rev=7

---
 maven-reporting-impl.changes | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/maven-reporting-impl.changes b/maven-reporting-impl.changes
index 16e91c4..54b2c8d 100644
--- a/maven-reporting-impl.changes
+++ b/maven-reporting-impl.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Mar 11 07:02:31 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 3.1.0
+  * API sync with maven-reporting-api 3.1.0
+- Modified patch:
+  * 0001-Remove-dependency-on-junit-addons.patch
+    + rediff
+
 -------------------------------------------------------------------
 Wed Mar 11 11:43:42 UTC 2020 - Fridrich Strba <fstrba@suse.com>