[MSHARED-1002] Require Java 8

pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
-    <version>34</version>
+    <version>36</version>
     <relativePath />
   </parent>
 
@@ -54,17 +54,30 @@
   </distributionManagement>
 
   <properties>
-    <javaVersion>7</javaVersion>
+    <javaVersion>8</javaVersion>
     <project.build.outputTimestamp>2020-10-15T00:00:05Z</project.build.outputTimestamp>
     <slf4j.version>1.7.36</slf4j.version>
+    <surefire.version>3.0.0-M6</surefire.version>
     <checkstyle.violation.ignore>None</checkstyle.violation.ignore>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.6</version>
+      <version>2.11.0</version>
     </dependency>
 
     <dependency>
@@ -93,35 +106,11 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
 
   </dependencies>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <!-- remove with next parent upgrade -->
-        <plugin>
-          <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.2.2</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.0.0-M3</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.4.0</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.12.0</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>

src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java

@@ -110,7 +110,7 @@ public void setGlobalVariable( String name, Object value )
      */
     public void setClassPath( List<String> classPath )
     {
-        this.classPath = ( classPath != null ) ? new ArrayList<>( classPath ) : new ArrayList<String>();
+        this.classPath = ( classPath != null ) ? new ArrayList<>( classPath ) : new ArrayList<>();
     }
 
     /**

src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java

@@ -19,14 +19,14 @@
  * under the License.
  */
 
-import org.junit.Test;
-
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Tests the BeanShell interpreter facade.

src/test/java/org/apache/maven/shared/scriptinterpreter/FileLoggerTest.java

@@ -19,15 +19,15 @@
  * under the License.
  */
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * FileLoggerTest

src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java

@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Tests the Groovy interpreter facade.

src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java

@@ -19,16 +19,16 @@
  * under the License.
  */
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Olivier Lamy

src/test/java/org/apache/maven/shared/scriptinterpreter/TestMirrorHandler.java

@@ -29,7 +29,7 @@ class TestMirrorHandler implements FileLoggerMirrorHandler
 
     private StringBuilder loggedMessage;
 
-    public TestMirrorHandler() throws IOException
+    public TestMirrorHandler()
     {
         loggedMessage = new StringBuilder();
     }