You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2022/12/15 00:09:19 UTC
[maven-script-interpreter] branch master updated: upgrade to parent 39 (#88)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-script-interpreter.git
The following commit(s) were added to refs/heads/master by this push:
new a7c62c6 upgrade to parent 39 (#88)
a7c62c6 is described below
commit a7c62c626fdeb96789f1f0a4a5175cfbd43f47bf
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Thu Dec 15 10:09:15 2022 +1000
upgrade to parent 39 (#88)
Signed-off-by: Olivier Lamy <ol...@apache.org>
Signed-off-by: Olivier Lamy <ol...@apache.org>
---
pom.xml | 4 ++--
.../shared/scriptinterpreter/BeanShellScriptInterpreter.java | 9 +++++----
.../maven/shared/scriptinterpreter/GroovyScriptInterpreter.java | 5 +++--
.../org/apache/maven/shared/scriptinterpreter/ScriptRunner.java | 1 +
.../shared/scriptinterpreter/BeanShellScriptInterpreterTest.java | 5 +++--
.../apache/maven/shared/scriptinterpreter/FileLoggerTest.java | 9 +++++----
.../shared/scriptinterpreter/GroovyScriptInterpreterTest.java | 5 +++--
.../apache/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 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>38</version>
- <relativePath/>
+ <version>39</version>
+ <relativePath />
</parent>
<artifactId>maven-script-interpreter</artifactId>
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.LinkedHashMap;
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.Collections;
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
*/