You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2022/04/24 00:14:39 UTC
[maven-script-interpreter] branch MSHARED-1068 updated (fefd996 -> 2301c51)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MSHARED-1068
in repository https://gitbox.apache.org/repos/asf/maven-script-interpreter.git
discard fefd996 [MSHARED-1068] Upgrade Groovy to 4.0.2
omit 7dc2e54 [MSHARED-1002] Require Java 8
add cd6e66d Bump maven-site-plugin from 3.10.0 to 3.12.0
add bb5681b Bump maven-javadoc-plugin from 3.3.1 to 3.4.0
add 33c0c29 Bump maven-project-info-reports-plugin from 3.1.2 to 3.2.2
add 2c2264b Bump slf4j.version from 1.7.32 to 1.7.36
new f60db45 [MSHARED-1002] Require Java 8
new 2301c51 [MSHARED-1068] Upgrade Groovy to 4.0.2
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (fefd996)
\
N -- N -- N refs/heads/MSHARED-1068 (2301c51)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven-script-interpreter] 01/02: [MSHARED-1002] Require Java 8
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-1068
in repository https://gitbox.apache.org/repos/asf/maven-script-interpreter.git
commit f60db45b789afd52d91f328ce770fa43cc3cc74a
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Apr 23 23:23:11 2022 +0200
[MSHARED-1002] Require Java 8
---
pom.xml | 47 +++++++++-------------
.../maven/shared/scriptinterpreter/FileLogger.java | 4 +-
.../shared/scriptinterpreter/ScriptRunner.java | 2 +-
.../BeanShellScriptInterpreterTest.java | 6 +--
.../shared/scriptinterpreter/FileLoggerTest.java | 8 ++--
.../GroovyScriptInterpreterTest.java | 4 +-
.../shared/scriptinterpreter/ScriptRunnerTest.java | 8 ++--
.../scriptinterpreter/TestMirrorHandler.java | 2 +-
8 files changed, 35 insertions(+), 46 deletions(-)
diff --git a/pom.xml b/pom.xml
index ae9caa4..cb8a759 100644
--- a/pom.xml
+++ b/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>
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java
index ee5f851..a874104 100644
--- a/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java
+++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java
@@ -20,10 +20,10 @@ package org.apache.maven.shared.scriptinterpreter;
*/
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
+import java.nio.file.Files;
/**
* <p>FileLogger class.</p>
@@ -69,7 +69,7 @@ public class FileLogger implements ExecutionLogger, AutoCloseable
if ( outputFile != null )
{
outputFile.getParentFile().mkdirs();
- outputStream = new FileOutputStream( outputFile );
+ outputStream = Files.newOutputStream( outputFile.toPath() );
}
else
{
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 class ScriptRunner
*/
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<>();
}
/**
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 @@ package org.apache.maven.shared.scriptinterpreter;
* 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 @@ package org.apache.maven.shared.scriptinterpreter;
* 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 @@ package org.apache.maven.shared.scriptinterpreter;
* 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.HashMap;
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 @@ package org.apache.maven.shared.scriptinterpreter;
* 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();
}
[maven-script-interpreter] 02/02: [MSHARED-1068] Upgrade Groovy to 4.0.2
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-1068
in repository https://gitbox.apache.org/repos/asf/maven-script-interpreter.git
commit 2301c513e939cfdd9b1a616e642929df799a413d
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Apr 23 23:47:06 2022 +0200
[MSHARED-1068] Upgrade Groovy to 4.0.2
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index cb8a759..9bffe4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,9 +81,9 @@
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
- <version>2.4.21</version>
+ <version>4.0.2</version>
</dependency>
<dependency>