|
 |
6269b9 |
From 2f414c5566febf44beb77c43340eafccad1547e2 Mon Sep 17 00:00:00 2001
|
|
|
6269b9 |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
6269b9 |
Date: Tue, 17 Jul 2018 11:57:16 +0200
|
|
|
6269b9 |
Subject: [PATCH] Remove dependency on junit-addons
|
|
|
6269b9 |
|
|
|
6269b9 |
---
|
|
|
6269b9 |
pom.xml | 6 ------
|
|
|
6269b9 |
.../apache/maven/reporting/AbstractMavenReportRenderer.java | 2 +-
|
|
|
6269b9 |
.../maven/reporting/AbstractMavenReportRendererTest.java | 10 ++--------
|
|
|
6269b9 |
3 files changed, 3 insertions(+), 15 deletions(-)
|
|
|
6269b9 |
|
|
|
6269b9 |
diff --git a/pom.xml b/pom.xml
|
|
|
6269b9 |
index 239742e..dc75ecd 100644
|
|
|
6269b9 |
--- a/pom.xml
|
|
|
6269b9 |
+++ b/pom.xml
|
|
|
6269b9 |
@@ -135,12 +135,6 @@
|
|
|
6269b9 |
<version>3.8.2</version>
|
|
|
6269b9 |
<scope>test</scope>
|
|
|
6269b9 |
</dependency>
|
|
|
6269b9 |
- <dependency>
|
|
|
6269b9 |
- <groupId>junit-addons</groupId>
|
|
|
6269b9 |
- <artifactId>junit-addons</artifactId>
|
|
|
6269b9 |
- <version>1.4</version>
|
|
|
6269b9 |
- <scope>test</scope>
|
|
|
6269b9 |
- </dependency>
|
|
|
6269b9 |
</dependencies>
|
|
|
6269b9 |
|
|
|
6269b9 |
<build>
|
|
|
6269b9 |
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
|
|
|
6269b9 |
index 6f954ae..c11acd3 100644
|
|
|
6269b9 |
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
|
|
|
6269b9 |
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
|
|
|
6269b9 |
@@ -597,7 +597,7 @@ public abstract class AbstractMavenReportRenderer
|
|
|
6269b9 |
* @param text a text with or without the pattern {text, url}
|
|
|
6269b9 |
* @return a map of text/href
|
|
|
6269b9 |
*/
|
|
|
6269b9 |
- private static List<String> applyPattern( String text )
|
|
|
6269b9 |
+ static List<String> applyPattern( String text )
|
|
|
6269b9 |
{
|
|
|
6269b9 |
if ( StringUtils.isEmpty( text ) )
|
|
|
6269b9 |
{
|
|
|
6269b9 |
diff --git a/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java b/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
|
|
|
6269b9 |
index cdb9299..e8dce8f 100644
|
|
|
6269b9 |
--- a/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
|
|
|
6269b9 |
+++ b/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
|
|
|
6269b9 |
@@ -24,7 +24,8 @@ import java.util.List;
|
|
|
6269b9 |
|
|
|
6269b9 |
import junit.framework.Assert;
|
|
|
6269b9 |
import junit.framework.TestCase;
|
|
|
6269b9 |
-import junitx.util.PrivateAccessor;
|
|
|
6269b9 |
+
|
|
|
6269b9 |
+import static org.apache.maven.reporting.AbstractMavenReportRenderer.applyPattern;
|
|
|
6269b9 |
|
|
|
6269b9 |
/**
|
|
|
6269b9 |
* Test case for some public method in AbstractMavenReportRenderer.
|
|
|
6269b9 |
@@ -32,13 +33,6 @@ import junitx.util.PrivateAccessor;
|
|
|
6269b9 |
public class AbstractMavenReportRendererTest
|
|
|
6269b9 |
extends TestCase
|
|
|
6269b9 |
{
|
|
|
6269b9 |
- private static List<String> applyPattern( String pattern )
|
|
|
6269b9 |
- throws Throwable
|
|
|
6269b9 |
- {
|
|
|
6269b9 |
- return (List<String>) PrivateAccessor.invoke( AbstractMavenReportRenderer.class, "applyPattern",
|
|
|
6269b9 |
- new Class[] { String.class }, new Object[] { pattern } );
|
|
|
6269b9 |
- }
|
|
|
6269b9 |
-
|
|
|
6269b9 |
private static void checkPattern( String pattern, String[] expectedResult ) throws Throwable
|
|
|
6269b9 |
{
|
|
|
6269b9 |
List<String> result = applyPattern( pattern );
|
|
|
6269b9 |
--
|
|
|
6269b9 |
2.14.3
|
|
|
6269b9 |
|