From 98c2857719de3aa8217b14186df4fcab70734f2f Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sat, 23 Apr 2022 23:23:11 +0200 Subject: [PATCH] [MSHARED-1002] Require Java 8 --- pom.xml | 47 +++++++------------ .../scriptinterpreter/ScriptRunner.java | 2 +- .../BeanShellScriptInterpreterTest.java | 6 +-- .../scriptinterpreter/FileLoggerTest.java | 8 ++-- .../GroovyScriptInterpreterTest.java | 4 +- .../scriptinterpreter/ScriptRunnerTest.java | 8 ++-- .../scriptinterpreter/TestMirrorHandler.java | 2 +- 7 files changed, 33 insertions(+), 44 deletions(-) diff --git a/pom.xml b/pom.xml index ae9caa4..cb8a759 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.maven.shared maven-shared-components - 34 + 36 @@ -54,17 +54,30 @@ - 7 + 8 2020-10-15T00:00:05Z 1.7.36 + 3.0.0-M6 None + + + + org.junit + junit-bom + 5.8.2 + pom + import + + + + commons-io commons-io - 2.6 + 2.11.0 @@ -93,35 +106,11 @@ - junit - junit - 4.13.2 + org.junit.jupiter + junit-jupiter test - - - - - - maven-project-info-reports-plugin - 3.2.2 - - - maven-enforcer-plugin - 3.0.0-M3 - - - maven-javadoc-plugin - 3.4.0 - - - maven-site-plugin - 3.12.0 - - - - diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java index c282a04..df52a8b 100644 --- a/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java +++ b/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 classPath ) { - this.classPath = ( classPath != null ) ? new ArrayList<>( classPath ) : new ArrayList(); + this.classPath = ( classPath != null ) ? new ArrayList<>( classPath ) : new ArrayList<>(); } /** diff --git a/src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java b/src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java index 89c947d..4477b28 100644 --- a/src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java +++ b/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. diff --git a/src/test/java/org/apache/maven/shared/scriptinterpreter/FileLoggerTest.java b/src/test/java/org/apache/maven/shared/scriptinterpreter/FileLoggerTest.java index c5813ff..8943456 100644 --- a/src/test/java/org/apache/maven/shared/scriptinterpreter/FileLoggerTest.java +++ b/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 diff --git a/src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java b/src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java index fa47c72..0e8d1a3 100644 --- a/src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java +++ b/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. diff --git a/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java b/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java index 07df376..4e6dc54 100644 --- a/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java +++ b/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 diff --git a/src/test/java/org/apache/maven/shared/scriptinterpreter/TestMirrorHandler.java b/src/test/java/org/apache/maven/shared/scriptinterpreter/TestMirrorHandler.java index e818d5b..611f85c 100644 --- a/src/test/java/org/apache/maven/shared/scriptinterpreter/TestMirrorHandler.java +++ b/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(); }