You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/11/03 23:15:31 UTC
[maven-doxia-converter] 03/09: [DOXIATOOLS-63] Upgrade JUnit
4.13-rc-1
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
commit 59989f828553cb7393e8c6f0a936b224a7fc1682
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Nov 3 13:21:44 2019 +0100
[DOXIATOOLS-63] Upgrade JUnit 4.13-rc-1
---
pom.xml | 6 +++---
src/main/assembly/jar.xml | 2 --
src/main/java/org/apache/maven/doxia/DefaultConverter.java | 4 ++--
src/test/java/org/apache/maven/doxia/ConverterTest.java | 8 ++------
4 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2838a23..5c1636c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,9 +170,9 @@ under the License.
<!-- Test -->
<dependency>
- <groupId>junit-addons</groupId>
- <artifactId>junit-addons</artifactId>
- <version>1.4</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13-rc-1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/main/assembly/jar.xml b/src/main/assembly/jar.xml
index 6f2edda..b882505 100644
--- a/src/main/assembly/jar.xml
+++ b/src/main/assembly/jar.xml
@@ -30,8 +30,6 @@ under the License.
<unpack>true</unpack>
<scope>runtime</scope>
<excludes>
- <exclude>junit:junit</exclude>
- <exclude>junit-addons:junit-addons</exclude>
<exclude>javax.servlet:servlet-api</exclude>
<exclude>org.apache.maven.doxia:doxia-converter</exclude>
</excludes>
diff --git a/src/main/java/org/apache/maven/doxia/DefaultConverter.java b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
index 99698cf..d63458b 100644
--- a/src/main/java/org/apache/maven/doxia/DefaultConverter.java
+++ b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
@@ -531,7 +531,7 @@ public class DefaultConverter
* @see {@link XmlStreamReader#getEncoding()} for xml files
* @see {@link CharsetDetector#detect()} for text files
*/
- private static String autoDetectEncoding( File f )
+ static String autoDetectEncoding( File f )
{
if ( !f.isFile() )
{
@@ -578,7 +578,7 @@ public class DefaultConverter
* @throws IllegalArgumentException if f is not a file.
* @throws UnsupportedOperationException if could not detect the Doxia format.
*/
- private static String autoDetectFormat( File f, String encoding )
+ static String autoDetectFormat( File f, String encoding )
{
if ( !f.isFile() )
{
diff --git a/src/test/java/org/apache/maven/doxia/ConverterTest.java b/src/test/java/org/apache/maven/doxia/ConverterTest.java
index 065f30a..f4000e3 100644
--- a/src/test/java/org/apache/maven/doxia/ConverterTest.java
+++ b/src/test/java/org/apache/maven/doxia/ConverterTest.java
@@ -27,8 +27,6 @@ import java.io.FileWriter;
import java.io.OutputStream;
import java.io.StringWriter;
-import junitx.util.PrivateAccessor;
-
import org.apache.maven.doxia.wrapper.InputFileWrapper;
import org.apache.maven.doxia.wrapper.InputReaderWrapper;
import org.apache.maven.doxia.wrapper.OutputFileWrapper;
@@ -652,8 +650,7 @@ public class ConverterTest
private String autoDetectEncoding( File f )
throws Throwable
{
- return (String) PrivateAccessor.invoke( DefaultConverter.class, "autoDetectEncoding",
- new Class[] { File.class }, new Object[] { f } );
+ return DefaultConverter.autoDetectEncoding( f );
}
private String autoDetectEncoding( String filename )
@@ -681,8 +678,7 @@ public class ConverterTest
private String autoDetectFormat( File f, String encoding )
throws Throwable
{
- return (String) PrivateAccessor.invoke( DefaultConverter.class, "autoDetectFormat", new Class[] { File.class,
- String.class }, new Object[] { f, encoding } );
+ return DefaultConverter.autoDetectFormat( f, encoding );
}
private String autoDetectFormat( String filename, String encoding )