From 9cb52dc028ee95ccee71e7d4277f0b4cfc4945d1 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 15 Dec 2022 10:01:36 +1000 Subject: [PATCH] upgrade to parent 39 Signed-off-by: Olivier Lamy --- pom.xml | 4 ++-- .../scriptinterpreter/BeanShellScriptInterpreter.java | 9 +++++---- .../scriptinterpreter/GroovyScriptInterpreter.java | 5 +++-- .../maven/shared/scriptinterpreter/ScriptRunner.java | 1 + .../BeanShellScriptInterpreterTest.java | 5 +++-- .../maven/shared/scriptinterpreter/FileLoggerTest.java | 9 +++++---- .../scriptinterpreter/GroovyScriptInterpreterTest.java | 5 +++-- .../maven/shared/scriptinterpreter/ScriptRunnerTest.java | 9 +++++---- 8 files changed, 27 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 7b46b7f..09d4c91 100644 --- a/pom.xml +++ b/pom.xml @@ -22,8 +22,8 @@ org.apache.maven.shared maven-shared-components - 38 - + 39 + maven-script-interpreter diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java index aeaecc9..6eb9de0 100644 --- a/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java +++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java @@ -18,16 +18,17 @@ */ package org.apache.maven.shared.scriptinterpreter; -import bsh.Capabilities; -import bsh.EvalError; -import bsh.Interpreter; -import bsh.TargetError; import java.io.File; import java.io.IOException; import java.io.PrintStream; import java.util.List; import java.util.Map; +import bsh.Capabilities; +import bsh.EvalError; +import bsh.Interpreter; +import bsh.TargetError; + /** * Provides a facade to evaluate BeanShell scripts. * diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java index 7094b24..f348e84 100644 --- a/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java +++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java @@ -18,13 +18,14 @@ */ package org.apache.maven.shared.scriptinterpreter; -import groovy.lang.Binding; -import groovy.lang.GroovyShell; import java.io.File; import java.io.PrintStream; import java.net.URL; import java.util.List; import java.util.Map; + +import groovy.lang.Binding; +import groovy.lang.GroovyShell; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.tools.RootLoader; 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 79fa656..485a7c1 100644 --- a/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java +++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java @@ -28,6 +28,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; + import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 eebd028..a19614f 100644 --- a/src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java +++ b/src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java @@ -18,14 +18,15 @@ */ package org.apache.maven.shared.scriptinterpreter; -import static org.junit.jupiter.api.Assertions.assertEquals; - import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.HashMap; import java.util.Map; + 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 0f9251d..2011437 100644 --- a/src/test/java/org/apache/maven/shared/scriptinterpreter/FileLoggerTest.java +++ b/src/test/java/org/apache/maven/shared/scriptinterpreter/FileLoggerTest.java @@ -18,15 +18,16 @@ */ package org.apache.maven.shared.scriptinterpreter; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.io.File; import java.io.IOException; import java.nio.file.Files; + import org.junit.jupiter.api.Test; +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 3627841..87f2b30 100644 --- a/src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java +++ b/src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java @@ -18,8 +18,6 @@ */ package org.apache.maven.shared.scriptinterpreter; -import static org.junit.jupiter.api.Assertions.assertEquals; - import java.io.ByteArrayOutputStream; import java.io.File; import java.io.PrintStream; @@ -27,8 +25,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.junit.jupiter.api.Test; +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 f23e968..b0d64b9 100644 --- a/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java +++ b/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java @@ -18,16 +18,17 @@ */ package org.apache.maven.shared.scriptinterpreter; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.io.File; import java.nio.file.Files; import java.util.HashMap; import java.util.Map; + import org.junit.jupiter.api.Test; +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 */