diff --git a/0001-Remove-dependency-on-junit-addons.patch b/0001-Remove-dependency-on-junit-addons.patch index edb0d2f..72e7e2f 100644 --- a/0001-Remove-dependency-on-junit-addons.patch +++ b/0001-Remove-dependency-on-junit-addons.patch @@ -1,7 +1,20 @@ ---- 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 @@ - 4.13.1 +From b087582c8bbe88ac8fd3a59c129d4bd7953a720f Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 9 Feb 2022 14:37:18 -0700 +Subject: [PATCH] Remove dependency on junit-addons + +--- + pom.xml | 6 ------ + .../maven/reporting/AbstractMavenReportRenderer.java | 2 +- + .../reporting/AbstractMavenReportRendererTest.java | 10 ++-------- + 3 files changed, 3 insertions(+), 15 deletions(-) + +diff --git a/pom.xml b/pom.xml +index d46a817..6b6295c 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -151,12 +151,6 @@ + 4.13.2 test - @@ -13,9 +26,11 @@ ---- 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 @@ +diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java +index 4c9a07c..4693e1d 100644 +--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java ++++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java +@@ -599,7 +599,7 @@ public abstract class AbstractMavenRepor * @param text a text with or without the pattern {text, url} * @return a map of text/href */ @@ -24,9 +39,11 @@ { 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 @@ +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; @@ -36,7 +53,7 @@ /** * Test case for some public method in AbstractMavenReportRenderer. -@@ -32,13 +33,6 @@ +@@ -32,13 +33,6 @@ import junitx.util.PrivateAccessor; public class AbstractMavenReportRendererTest extends TestCase { @@ -50,3 +67,5 @@ private static void checkPattern( String pattern, String[] expectedResult ) throws Throwable { List result = applyPattern( pattern ); +-- +2.34.1 diff --git a/maven-reporting-impl-3.1.0-source-release.zip b/maven-reporting-impl-3.1.0-source-release.zip deleted file mode 100644 index 09efe23..0000000 --- a/maven-reporting-impl-3.1.0-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e81e170d9666aa4e6880b23ba20c16de046387fa31726de837003ecd4b039d2b -size 47021 diff --git a/maven-reporting-impl-3.2.0-source-release.zip b/maven-reporting-impl-3.2.0-source-release.zip new file mode 100644 index 0000000..9953b83 --- /dev/null +++ b/maven-reporting-impl-3.2.0-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6513b8e90e051504f44029e723fa0fe6bdce26b9b5cbb4d7f4bd36606c5b3ae +size 47349 diff --git a/maven-reporting-impl-build.xml b/maven-reporting-impl-build.xml index 9bf6c6c..798e843 100644 --- a/maven-reporting-impl-build.xml +++ b/maven-reporting-impl-build.xml @@ -11,14 +11,15 @@ - + - + - + + + +- Upgrade to version 3.2.0 + * Improvement: + + MSHARED-1099 - Render with a skin when report is run in + standalone mode + * Dependency upgrades: + + MSHARED-1120 - Upgrade Maven Reporting API to 3.1.1 + + MSHARED-1121 - Upgrade plugins and components in project and + ITs +- Modified patch: + * 0001-Remove-dependency-on-junit-addons.patch + + rediff + ------------------------------------------------------------------- Wed Sep 6 22:31:19 UTC 2023 - Fridrich Strba diff --git a/maven-reporting-impl.spec b/maven-reporting-impl.spec index ca3826c..4b2b9cd 100644 --- a/maven-reporting-impl.spec +++ b/maven-reporting-impl.spec @@ -17,7 +17,7 @@ Name: maven-reporting-impl -Version: 3.1.0 +Version: 3.2.0 Release: 0 Summary: Abstract classes to manage report generation License: Apache-2.0 @@ -37,7 +37,7 @@ BuildRequires: maven-doxia-sink-api BuildRequires: maven-doxia-sitetools BuildRequires: maven-lib BuildRequires: maven-plugin-annotations -BuildRequires: maven-reporting-api +BuildRequires: maven-reporting-api >= 3.1.1 BuildRequires: maven-shared-utils BuildRequires: plexus-utils BuildRequires: unzip @@ -63,8 +63,6 @@ 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 @@ -72,22 +70,25 @@ cp %{SOURCE1} build.xml %build mkdir -p lib build-jar-repository -s lib \ - maven-doxia/doxia-core \ - maven-doxia/doxia-logging-api \ - maven-doxia/doxia-module-xhtml \ - maven-doxia/doxia-module-xhtml5 \ - maven-doxia/doxia-sink-api \ - maven-doxia-sitetools/doxia-decoration-model \ - maven-doxia-sitetools/doxia-site-renderer \ - maven/maven-core \ - maven/maven-plugin-api \ - maven-plugin-tools/maven-plugin-annotations \ - maven-reporting-api/maven-reporting-api \ - maven-shared-utils/maven-shared-utils \ - plexus/utils + maven-doxia/doxia-core \ + maven-doxia/doxia-logging-api \ + maven-doxia/doxia-module-xhtml \ + maven-doxia/doxia-module-xhtml5 \ + maven-doxia/doxia-sink-api \ + maven-doxia-sitetools/doxia-decoration-model \ + maven-doxia-sitetools/doxia-integration-tools \ + maven-doxia-sitetools/doxia-site-renderer \ + maven/maven-artifact \ + maven/maven-compat \ + maven/maven-core \ + maven/maven-plugin-api \ + maven-plugin-tools/maven-plugin-annotations \ + maven-reporting-api/maven-reporting-api \ + maven-shared-utils/maven-shared-utils \ + plexus/utils %{ant} \ - jar javadoc + jar javadoc %install # jar