commit d19ab4ad2a0922afa55cb403555649da491bc15d Author: Adrian Schröter Date: Mon Feb 19 15:45:53 2024 +0100 Sync from SUSE:ALP:Source:Standard:1.0 maven-reporting-impl revision 45762fde14d56c520e62b74b50c2ca5b diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..fecc750 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/0001-Remove-dependency-on-junit-addons.patch b/0001-Remove-dependency-on-junit-addons.patch new file mode 100644 index 0000000..fbf1701 --- /dev/null +++ b/0001-Remove-dependency-on-junit-addons.patch @@ -0,0 +1,71 @@ +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 + +- +- junit-addons +- junit-addons +- 1.4 +- test +- + + + +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 + */ +- private static List applyPattern( String text ) ++ static List 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 applyPattern( String pattern ) +- throws Throwable +- { +- return (List) PrivateAccessor.invoke( AbstractMavenReportRenderer.class, "applyPattern", +- new Class[] { String.class }, new Object[] { pattern } ); +- } +- + private static void checkPattern( String pattern, String[] expectedResult ) throws Throwable + { + List result = applyPattern( pattern ); +-- +2.34.1 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..102dbae --- /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 new file mode 100644 index 0000000..645a0a3 --- /dev/null +++ b/maven-reporting-impl-build.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/maven-reporting-impl.changes b/maven-reporting-impl.changes new file mode 100644 index 0000000..a6ac1a3 --- /dev/null +++ b/maven-reporting-impl.changes @@ -0,0 +1,39 @@ +------------------------------------------------------------------- +Sun Sep 24 01:58:46 UTC 2023 - Fridrich Strba + +- 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 + +- Remove unnecessary dependency on xmvn tools and parent pom + +------------------------------------------------------------------- +Fri Mar 11 07:02:31 UTC 2022 - Fridrich Strba + +- 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 + +- Fix build against newer doxia that requires html5 module + +------------------------------------------------------------------- +Fri Mar 29 13:44:55 UTC 2019 - Fridrich Strba + +- Initial packaging of maven-reporting-impl 3.0.0 +- Generate and customize ant build.xml file diff --git a/maven-reporting-impl.spec b/maven-reporting-impl.spec new file mode 100644 index 0000000..46e7f63 --- /dev/null +++ b/maven-reporting-impl.spec @@ -0,0 +1,113 @@ +# +# spec file for package maven-reporting-impl +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: maven-reporting-impl +Version: 3.2.0 +Release: 0 +Summary: Abstract classes to manage report generation +License: Apache-2.0 +Group: Development/Libraries/Java +URL: https://maven.apache.org/shared/%{name} +Source0: http://archive.apache.org/dist/maven/reporting/%{name}-%{version}-source-release.zip +Source1: %{name}-build.xml +Patch0: 0001-Remove-dependency-on-junit-addons.patch +BuildRequires: ant +BuildRequires: fdupes +BuildRequires: javapackages-local >= 6 +BuildRequires: maven-doxia-core +BuildRequires: maven-doxia-logging-api +BuildRequires: maven-doxia-module-xhtml +BuildRequires: maven-doxia-module-xhtml5 +BuildRequires: maven-doxia-sink-api +BuildRequires: maven-doxia-sitetools +BuildRequires: maven-lib +BuildRequires: maven-plugin-annotations +BuildRequires: maven-reporting-api >= 3.1.1 +BuildRequires: maven-shared-utils +BuildRequires: plexus-utils +BuildRequires: unzip +BuildArch: noarch + +%description +Abstract classes to manage report generation, which can be run both: + +* as part of a site generation (as a maven-reporting-api's MavenReport), +* or as a direct standalone invocation (as a maven-plugin-api's Mojo). + +This is a replacement package for maven-shared-reporting-impl + +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation/HTML + +%description javadoc +API documentation for %{name}. + +%prep +%setup -q +cp %{SOURCE1} build.xml +%patch0 -p1 + +# integration tests try to download stuff from the internet +# and therefore they don't work in Build Service +%pom_remove_plugin :maven-invoker-plugin + +%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-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 + +%install +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license LICENSE NOTICE + +%files javadoc +%{_javadocdir}/%{name} +%license LICENSE NOTICE + +%changelog