commit 59989f828553cb7393e8c6f0a936b224a7fc1682
author Sylwester Lachiewicz <slachiewicz@apache.org> Sun Nov 03 13:21:44 2019 +0100
committer Sylwester Lachiewicz <slachiewicz@apache.org> Mon Nov 04 00:05:13 2019 +0100
tree 3f68100e9bfd57f80d0b087f370c8227cb2187e0
parent f18f91aa8e82463dd68bf452d330c406fd646683

[DOXIATOOLS-63] Upgrade JUnit 4.13-rc-1

pom.xml

diff --git a/pom.xml b/pom.xml
index 2838a23..5c1636c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,9 +170,9 @@
 
     <!-- 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>

src/main/assembly/jar.xml

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 @@
       <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>

src/main/java/org/apache/maven/doxia/DefaultConverter.java

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 @@
      * @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 @@
      * @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() )
         {

src/test/java/org/apache/maven/doxia/ConverterTest.java

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.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 @@
     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 @@
     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 )