From 33b57a248a3a7cf52a4fa85809fc6a186bd9f046 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 10 2019 07:36:55 +0000 Subject: import rh-maven36-maven-reporting-impl-3.0.0-5.2.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c84018 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-reporting-impl-3.0.0-source-release.zip diff --git a/.rh-maven36-maven-reporting-impl.metadata b/.rh-maven36-maven-reporting-impl.metadata new file mode 100644 index 0000000..c47b22b --- /dev/null +++ b/.rh-maven36-maven-reporting-impl.metadata @@ -0,0 +1 @@ +8061dad7d5a3518aa36f5304e9a618d346dc46cb SOURCES/maven-reporting-impl-3.0.0-source-release.zip diff --git a/SOURCES/0001-Remove-dependency-on-junit-addons.patch b/SOURCES/0001-Remove-dependency-on-junit-addons.patch new file mode 100644 index 0000000..1606c27 --- /dev/null +++ b/SOURCES/0001-Remove-dependency-on-junit-addons.patch @@ -0,0 +1,72 @@ +From 2f414c5566febf44beb77c43340eafccad1547e2 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +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 @@ + 3.8.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 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 {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.14.3 + diff --git a/SPECS/maven-reporting-impl.spec b/SPECS/maven-reporting-impl.spec new file mode 100644 index 0000000..4a56950 --- /dev/null +++ b/SPECS/maven-reporting-impl.spec @@ -0,0 +1,141 @@ +%{?scl:%scl_package maven-reporting-impl} +%{!?scl:%global pkg_name %{name}} + +Name: %{?scl_prefix}maven-reporting-impl +Version: 3.0.0 +Release: 5.2%{?dist} +Summary: Abstract classes to manage report generation +License: ASL 2.0 +URL: http://maven.apache.org/shared/%{pkg_name} +BuildArch: noarch + +Source0: http://repo1.maven.org/maven2/org/apache/maven/reporting/%{pkg_name}/%{version}/%{pkg_name}-%{version}-source-release.zip + +Patch0: 0001-Remove-dependency-on-junit-addons.patch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}mvn(junit:junit) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.doxia:doxia-core) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.doxia:doxia-decoration-model) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.doxia:doxia-sink-api) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.doxia:doxia-site-renderer) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven:maven-core) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven:maven-plugin-api) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.reporting:maven-reporting-api) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.shared:maven-shared-components:pom:) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.shared:maven-shared-utils) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-utils) + +%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 %{pkg_name} + + +%description javadoc +API documentation for %{pkg_name}. + +%prep +%setup -n %{pkg_name}-%{version} -q +%patch0 -p1 + +# integration tests try to download stuff from the internet +# and therefore they don't work in Koji +%pom_remove_plugin :maven-invoker-plugin + +%build +%mvn_build + +%install +%mvn_install + +%files -f .mfiles +%doc LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE + +%changelog +* Wed Sep 4 2019 Mikolaj Izdebski - 3.0.0-5.2 +- Mass rebuild 2019-09-04 + +* Tue Sep 3 2019 Java Maintainers - 3.0.0-5.1 +- Automated package import and SCL-ization + +* Fri May 24 2019 Mikolaj Izdebski - 3.0.0-5 +- Mass rebuild for javapackages-tools 201901 + +* Tue Jul 17 2018 Mikolaj Izdebski - 3.0.0-4 +- Remove legacy obsoletes/provides +- Remove dependency on junit-addons +- Remove build-dependency on maven-invoker-plugin + +* Fri Jul 13 2018 Fedora Release Engineering - 3.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Sep 12 2017 Mikolaj Izdebski - 3.0.0-1 +- Update to upstream version 3.0.0 + +* Wed Jul 26 2017 Fedora Release Engineering - 2.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jul 08 2015 Michal Srb - 2.4-1 +- Update to upstream version 2.4 +- Fix BR + +* Wed Jun 17 2015 Fedora Release Engineering - 2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Sep 16 2014 Mikolaj Izdebski - 2.3-1 +- Update to upstream version 2.3 + +* Mon Aug 4 2014 Mikolaj Izdebski - 2.2-11 +- Fix build-requires on parent POM +- Port to Doxia 1.6 + +* Sat Jun 07 2014 Fedora Release Engineering - 2.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 2.2-9 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Feb 19 2014 Mikolaj Izdebski - 2.2-8 +- Fix unowned directory + +* Sat Aug 03 2013 Fedora Release Engineering - 2.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Apr 8 2013 Mikolaj Izdebski - 2.2-6 +- Add missing BuildRequires + +* Mon Apr 8 2013 Mikolaj Izdebski - 2.2-5 +- Skip running tests outsides Fedora + +* Tue Feb 19 2013 Mikolaj Izdebski - 2.2-4 +- Build with xmvn + +* Wed Feb 06 2013 Java SIG - 2.2-3 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Tue Feb 05 2013 Michal Srb - 2.2-2 +- Migrate from maven-doxia to doxia subpackages + +* Fri Jan 11 2013 Tomas Radej - 2.2-1 +- Initial version