Merge upstream branch 'master' into cc

Notable changes:
- NUTCH-2887 Migrate to JUnit 5 Jupiter
- no dependencies on JUnit 4 left

Author: sebastian-nagel

ivy/ivy.xml

@@ -149,6 +149,9 @@
 		<dependency org="org.apache.mrunit" name="mrunit" rev="1.1.0" conf="test->default">
 			<artifact name="mrunit" ns0:classifier="hadoop2" />
 			<exclude org="log4j" module="log4j" />
+			<exclude org="junit" module="junit" />
+			<exclude org="org.powermock" module="powermock-module-junit4" />
+			<exclude org="com.google.guava" name="guava" />
 		</dependency>
 
 		<!-- Jetty used to serve test pages for unit tests, but is also provided as dependency of Hadoop -->

src/plugin/parse-js/src/test/org/apache/nutch/parse/js/TestJSParseFilter.java

@@ -16,8 +16,8 @@
  */
 package org.apache.nutch.parse.js;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -95,20 +95,23 @@ public void testJavaScriptOutlinkExtraction()
     for (int i = 0; i < filenames.length; i++) {
       Outlink[] outlinks = getOutlinks(filenames[i]);
       if (filenames[i].endsWith("parse_pure_js_test.js")) {
-        assertEquals("number of outlinks in .js test file should be X", 2,
-            outlinks.length);
-        assertEquals("http://search.lucidimagination.com/p:nutch", outlinks[0].getToUrl());
+        assertEquals(2, outlinks.length,
+            "number of outlinks in .js test file should be X");
+        assertEquals("http://search.lucidimagination.com/p:nutch",
+            outlinks[0].getToUrl());
         assertEquals("http://search-lucene.com/nutch", outlinks[1].getToUrl());
       } else {
-        assertTrue("number of outlinks in .html file should be at least 2", outlinks.length >= 2);
+        assertTrue(outlinks.length >= 2,
+            "number of outlinks in .html file should be at least 2");
         Set<String> outlinkSet = new TreeSet<>();
         for (Outlink o : outlinks) {
           outlinkSet.add(o.getToUrl());
         }
-        assertTrue("http://search.lucidimagination.com/p:nutch not in outlinks",
-            outlinkSet.contains("http://search.lucidimagination.com/p:nutch"));
-        assertTrue("http://search-lucene.com/nutch not in outlinks",
-            outlinkSet.contains("http://search-lucene.com/nutch"));
+        assertTrue(
+            outlinkSet.contains("http://search.lucidimagination.com/p:nutch"),
+            "http://search.lucidimagination.com/p:nutch not in outlinks");
+        assertTrue(outlinkSet.contains("http://search-lucene.com/nutch"),
+            "http://search-lucene.com/nutch not in outlinks");
       }
     }
   }

src/test/org/apache/nutch/protocol/AbstractHttpProtocolPluginTest.java

@@ -17,7 +17,7 @@
 package org.apache.nutch.protocol;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -286,10 +286,10 @@ protected ProtocolOutput fetchPage(int port, String page, int expectedCode,
       httpStatusCode = Integer.parseInt(crawlDatum.getMetaData()
           .get(Nutch.PROTOCOL_STATUS_CODE_KEY).toString());
     }
-    assertEquals("HTTP Status Code for " + url, expectedCode, httpStatusCode);
+    assertEquals(expectedCode, httpStatusCode, "HTTP Status Code for " + url);
     if (httpStatusCode == 200 && expectedContentType != null) {
       Content content = protocolOutput.getContent();
-      assertEquals("ContentType " + url, "text/html", content.getContentType());
+      assertEquals("text/html", content.getContentType(), "ContentType " + url);
     }
     return protocolOutput;
   }