rpms/maven-reporting-impl
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove dependency on junit-addons

Browse Source
This commit is contained in:
Mikolaj Izdebski 2018-07-17 11:58:04 +02:00
parent d01ab7731c
commit c5b2a0d2de
2 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
0001-Remove-dependency-on-junit-addons.patch Normal file
View 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

5
maven-reporting-impl.spec
View File

@ -8,8 +8,9 @@ BuildArch: noarch
Source0: http://repo1.maven.org/maven2/org/apache/maven/reporting/%{name}/%{version}/%{name}-%{version}-source-release.zip
Patch0: 0001-Remove-dependency-on-junit-addons.patch
BuildRequires: maven-local
BuildRequires: mvn(junit-addons:junit-addons)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.maven.doxia:doxia-core)
BuildRequires: mvn(org.apache.maven.doxia:doxia-decoration-model)
@ -40,6 +41,7 @@ API documentation for %{name}.
%prep
%setup -q
%patch0 -p1
%build
# integration tests try to download stuff from the internet
@ -58,6 +60,7 @@ API documentation for %{name}.
%changelog
* Tue Jul 17 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0-4
- Remove legacy obsoletes/provides
- Remove dependency on junit-addons
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild