Skip to content

Commit a7c62c6

Browse files
authored
upgrade to parent 39 (#88)
Signed-off-by: Olivier Lamy <[email protected]> Signed-off-by: Olivier Lamy <[email protected]>
1 parent fa257aa commit a7c62c6

File tree

8 files changed

+27
-20
lines changed

8 files changed

+27
-20
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<parent>
2323
<groupId>org.apache.maven.shared</groupId>
2424
<artifactId>maven-shared-components</artifactId>
25-
<version>38</version>
26-
<relativePath/>
25+
<version>39</version>
26+
<relativePath />
2727
</parent>
2828

2929
<artifactId>maven-script-interpreter</artifactId>

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@
1818
*/
1919
package org.apache.maven.shared.scriptinterpreter;
2020

21-
import bsh.Capabilities;
22-
import bsh.EvalError;
23-
import bsh.Interpreter;
24-
import bsh.TargetError;
2521
import java.io.File;
2622
import java.io.IOException;
2723
import java.io.PrintStream;
2824
import java.util.List;
2925
import java.util.Map;
3026

27+
import bsh.Capabilities;
28+
import bsh.EvalError;
29+
import bsh.Interpreter;
30+
import bsh.TargetError;
31+
3132
/**
3233
* Provides a facade to evaluate BeanShell scripts.
3334
*

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@
1818
*/
1919
package org.apache.maven.shared.scriptinterpreter;
2020

21-
import groovy.lang.Binding;
22-
import groovy.lang.GroovyShell;
2321
import java.io.File;
2422
import java.io.PrintStream;
2523
import java.net.URL;
2624
import java.util.List;
2725
import java.util.Map;
26+
27+
import groovy.lang.Binding;
28+
import groovy.lang.GroovyShell;
2829
import org.codehaus.groovy.control.CompilerConfiguration;
2930
import org.codehaus.groovy.tools.RootLoader;
3031

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.List;
2929
import java.util.Locale;
3030
import java.util.Map;
31+
3132
import org.apache.commons.io.FilenameUtils;
3233
import org.slf4j.Logger;
3334
import org.slf4j.LoggerFactory;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818
*/
1919
package org.apache.maven.shared.scriptinterpreter;
2020

21-
import static org.junit.jupiter.api.Assertions.assertEquals;
22-
2321
import java.io.ByteArrayOutputStream;
2422
import java.io.PrintStream;
2523
import java.util.HashMap;
2624
import java.util.Map;
25+
2726
import org.junit.jupiter.api.Test;
2827

28+
import static org.junit.jupiter.api.Assertions.assertEquals;
29+
2930
/**
3031
* Tests the BeanShell interpreter facade.
3132
*

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,16 @@
1818
*/
1919
package org.apache.maven.shared.scriptinterpreter;
2020

21-
import static org.junit.jupiter.api.Assertions.assertEquals;
22-
import static org.junit.jupiter.api.Assertions.assertNull;
23-
import static org.junit.jupiter.api.Assertions.assertTrue;
24-
2521
import java.io.File;
2622
import java.io.IOException;
2723
import java.nio.file.Files;
24+
2825
import org.junit.jupiter.api.Test;
2926

27+
import static org.junit.jupiter.api.Assertions.assertEquals;
28+
import static org.junit.jupiter.api.Assertions.assertNull;
29+
import static org.junit.jupiter.api.Assertions.assertTrue;
30+
3031
/**
3132
* FileLoggerTest
3233
*/

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,18 @@
1818
*/
1919
package org.apache.maven.shared.scriptinterpreter;
2020

21-
import static org.junit.jupiter.api.Assertions.assertEquals;
22-
2321
import java.io.ByteArrayOutputStream;
2422
import java.io.File;
2523
import java.io.PrintStream;
2624
import java.util.Collections;
2725
import java.util.HashMap;
2826
import java.util.List;
2927
import java.util.Map;
28+
3029
import org.junit.jupiter.api.Test;
3130

31+
import static org.junit.jupiter.api.Assertions.assertEquals;
32+
3233
/**
3334
* Tests the Groovy interpreter facade.
3435
*

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@
1818
*/
1919
package org.apache.maven.shared.scriptinterpreter;
2020

21-
import static org.junit.jupiter.api.Assertions.assertEquals;
22-
import static org.junit.jupiter.api.Assertions.assertNotNull;
23-
import static org.junit.jupiter.api.Assertions.assertTrue;
24-
2521
import java.io.File;
2622
import java.nio.file.Files;
2723
import java.util.HashMap;
2824
import java.util.Map;
25+
2926
import org.junit.jupiter.api.Test;
3027

28+
import static org.junit.jupiter.api.Assertions.assertEquals;
29+
import static org.junit.jupiter.api.Assertions.assertNotNull;
30+
import static org.junit.jupiter.api.Assertions.assertTrue;
31+
3132
/**
3233
* @author Olivier Lamy
3334
*/

0 commit comments

Comments
 (0)