commit
1eeaa945a5
72
0001-Remove-dependency-on-junit-addons.patch
Normal file
72
0001-Remove-dependency-on-junit-addons.patch
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
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
|
||||||
|
|
||||||
BIN
maven-reporting-impl-3.0.0-source-release.zip
Normal file
BIN
maven-reporting-impl-3.0.0-source-release.zip
Normal file
Binary file not shown.
49
maven-reporting-impl.spec
Normal file
49
maven-reporting-impl.spec
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
Name: maven-reporting-impl
|
||||||
|
Version: 3.0.0
|
||||||
|
Release: 5
|
||||||
|
Summary: Abstract classes to manage report generation
|
||||||
|
License: ASL 2.0
|
||||||
|
URL: http://maven.apache.org/shared/maven-reporting-impl/
|
||||||
|
Source0: http://repo1.maven.org/maven2/org/apache/maven/reporting/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||||
|
|
||||||
|
Patch0001: 0001-Remove-dependency-on-junit-addons.patch
|
||||||
|
|
||||||
|
BuildRequires: maven-local mvn(junit:junit) mvn(org.apache.maven.doxia:doxia-core) mvn(org.apache.maven.doxia:doxia-decoration-model)
|
||||||
|
BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) mvn(org.apache.maven.doxia:doxia-site-renderer)
|
||||||
|
BuildRequires: mvn(org.apache.maven:maven-core) mvn(org.apache.maven:maven-plugin-api) mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||||
|
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) mvn(org.apache.maven.shared:maven-shared-components:pom:)
|
||||||
|
BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) mvn(org.codehaus.plexus:plexus-utils)
|
||||||
|
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 goal invocation, as a maven-plugin-api's Mojo.
|
||||||
|
|
||||||
|
%package help
|
||||||
|
Summary: Help package for maven-reporting-impl
|
||||||
|
Provides: %{name}-javadoc = %{version}-%{release}
|
||||||
|
Obsoletes: %{name}-javadoc < %{version}-%{release}
|
||||||
|
|
||||||
|
%description help
|
||||||
|
This package contains the API help documentation for maven-reporting-impl.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -n %{name}-%{version} -p1
|
||||||
|
%pom_remove_plugin :maven-invoker-plugin
|
||||||
|
|
||||||
|
%build
|
||||||
|
%mvn_build
|
||||||
|
|
||||||
|
%install
|
||||||
|
%mvn_install
|
||||||
|
|
||||||
|
%files -f .mfiles
|
||||||
|
%doc LICENSE NOTICE
|
||||||
|
|
||||||
|
%files help -f .mfiles-javadoc
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Thu Dec 12 2019 lingsheng <lingsheng@huawei.com> - 3.0.0-5
|
||||||
|
- Package init
|
||||||
Loading…
x
Reference in New Issue
Block a user