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 2026/09/20 12:48:43 UTC
(maven-clean-plugin) branch maven-clean-plugin-3.x updated (7e74a20 -> 11672af)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch maven-clean-plugin-3.x
in repository https://gitbox.apache.org/repos/asf/maven-clean-plugin.git
from 7e74a20 Bump org.slf4j:slf4j-simple from 2.0.18 to 2.0.19 (#338)
new 17f6b0c Rename the BeanShell IT scripts ahead of porting them
new 11672af Port the IT scripts from BeanShell to Groovy
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:
src/it/dangling-symlinks/{setup.bsh => setup.groovy} | 0
src/it/dangling-symlinks/{verify.bsh => verify.groovy} | 0
src/it/default/{setup.bsh => setup.groovy} | 0
src/it/default/{verify.bsh => verify.groovy} | 0
src/it/exclude-default-dirs/{verify.bsh => verify.groovy} | 8 ++++----
.../file-sets-absolute-paths/{verify.bsh => verify.groovy} | 4 ++--
.../{verify.bsh => verify.groovy} | 8 ++++----
.../file-sets-relative-paths/{verify.bsh => verify.groovy} | 8 ++++----
src/it/only-test-clean/{setup.bsh => setup.groovy} | 0
src/it/only-test-clean/{verify.bsh => verify.groovy} | 0
src/it/read-only/{setup.bsh => setup.groovy} | 2 +-
src/it/read-only/{verify.bsh => verify.groovy} | 0
src/it/special-characters/{setup.bsh => setup.groovy} | 0
src/it/special-characters/{verify.bsh => verify.groovy} | 0
src/it/symlink-dont-follow/{setup.bsh => setup.groovy} | 12 ++++++------
src/it/symlink-dont-follow/{verify.bsh => verify.groovy} | 8 ++++----
16 files changed, 25 insertions(+), 25 deletions(-)
rename src/it/dangling-symlinks/{setup.bsh => setup.groovy} (100%)
rename src/it/dangling-symlinks/{verify.bsh => verify.groovy} (100%)
rename src/it/default/{setup.bsh => setup.groovy} (100%)
rename src/it/default/{verify.bsh => verify.groovy} (100%)
rename src/it/exclude-default-dirs/{verify.bsh => verify.groovy} (96%)
rename src/it/file-sets-absolute-paths/{verify.bsh => verify.groovy} (97%)
rename src/it/file-sets-includes-excludes/{verify.bsh => verify.groovy} (97%)
rename src/it/file-sets-relative-paths/{verify.bsh => verify.groovy} (96%)
rename src/it/only-test-clean/{setup.bsh => setup.groovy} (100%)
rename src/it/only-test-clean/{verify.bsh => verify.groovy} (100%)
rename src/it/read-only/{setup.bsh => setup.groovy} (97%)
rename src/it/read-only/{verify.bsh => verify.groovy} (100%)
rename src/it/special-characters/{setup.bsh => setup.groovy} (100%)
rename src/it/special-characters/{verify.bsh => verify.groovy} (100%)
rename src/it/symlink-dont-follow/{setup.bsh => setup.groovy} (90%)
rename src/it/symlink-dont-follow/{verify.bsh => verify.groovy} (96%)
(maven-clean-plugin) 02/02: Port the IT scripts from BeanShell to Groovy
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch maven-clean-plugin-3.x
in repository https://gitbox.apache.org/repos/asf/maven-clean-plugin.git
commit 11672af7a71d04fba1fd2c3b2857a632201ad759
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Sep 20 14:09:32 2026 +0200
Port the IT scripts from BeanShell to Groovy
BeanShell is being retired across Maven (apache/maven#13207); the scripts keep the same checks.
---
src/it/exclude-default-dirs/verify.groovy | 8 ++++----
src/it/file-sets-absolute-paths/verify.groovy | 4 ++--
src/it/file-sets-includes-excludes/verify.groovy | 8 ++++----
src/it/file-sets-relative-paths/verify.groovy | 8 ++++----
src/it/read-only/setup.groovy | 2 +-
src/it/symlink-dont-follow/setup.groovy | 12 ++++++------
src/it/symlink-dont-follow/verify.groovy | 8 ++++----
7 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/it/exclude-default-dirs/verify.groovy b/src/it/exclude-default-dirs/verify.groovy
index 073ca98..979af19 100644
--- a/src/it/exclude-default-dirs/verify.groovy
+++ b/src/it/exclude-default-dirs/verify.groovy
@@ -24,7 +24,7 @@ import java.util.regex.*;
try
{
- String[] expected = {
+ String[] expected = [
"target",
"target/test-1.0-SNAPSHOT.jar",
"target/classes",
@@ -33,7 +33,7 @@ try
"target/test-classes/test.properties",
"target/site",
"target/site/index.html",
- };
+ ];
for ( String path : expected )
{
File file = new File( basedir, path );
@@ -45,9 +45,9 @@ try
}
}
- String[] unexpected = {
+ String[] unexpected = [
"delete-me",
- };
+ ];
for ( String path : unexpected )
{
File file = new File( basedir, path );
diff --git a/src/it/file-sets-absolute-paths/verify.groovy b/src/it/file-sets-absolute-paths/verify.groovy
index 606e777..fb7c62c 100644
--- a/src/it/file-sets-absolute-paths/verify.groovy
+++ b/src/it/file-sets-absolute-paths/verify.groovy
@@ -24,9 +24,9 @@ import java.util.regex.*;
try
{
- String[] unexpected = {
+ String[] unexpected = [
"delete-me",
- };
+ ];
for ( String path : unexpected )
{
File file = new File( basedir, path );
diff --git a/src/it/file-sets-includes-excludes/verify.groovy b/src/it/file-sets-includes-excludes/verify.groovy
index 1965ff7..5f71ed6 100644
--- a/src/it/file-sets-includes-excludes/verify.groovy
+++ b/src/it/file-sets-includes-excludes/verify.groovy
@@ -24,7 +24,7 @@ import java.util.regex.*;
try
{
- String[] expected = {
+ String[] expected = [
"dir0/excluded.txt",
"dir0/sub0/excluded.txt",
"dir0/sub1",
@@ -44,7 +44,7 @@ try
"dir3/sub2/excluded.txt",
"dir4/excluded/file.txt",
- };
+ ];
for ( String path : expected )
{
File file = new File( new File( basedir, "dirs" ), path );
@@ -56,7 +56,7 @@ try
}
}
- String[] unexpected = {
+ String[] unexpected = [
"dir0/included.txt",
"dir0/sub0/included.txt",
"dir0/sub1/included.txt",
@@ -75,7 +75,7 @@ try
"dir4/file.txt",
"dir4/included/file.txt",
- };
+ ];
for ( String path : unexpected )
{
File file = new File( new File( basedir, "dirs" ), path );
diff --git a/src/it/file-sets-relative-paths/verify.groovy b/src/it/file-sets-relative-paths/verify.groovy
index 1afa3a2..cdee852 100644
--- a/src/it/file-sets-relative-paths/verify.groovy
+++ b/src/it/file-sets-relative-paths/verify.groovy
@@ -24,10 +24,10 @@ import java.util.regex.*;
try
{
- String[] expected = {
+ String[] expected = [
"temp-stuff/test.txt",
"deploy/test.txt",
- };
+ ];
for ( String path : expected )
{
File file = new File( basedir, path );
@@ -39,13 +39,13 @@ try
}
}
- String[] unexpected = {
+ String[] unexpected = [
"target",
"child-a/target",
"child-a/temp-stuff",
"child-b/target",
"child-b/deploy",
- };
+ ];
for ( String path : unexpected )
{
File file = new File( basedir, path );
diff --git a/src/it/read-only/setup.groovy b/src/it/read-only/setup.groovy
index 799b411..a98d21e 100644
--- a/src/it/read-only/setup.groovy
+++ b/src/it/read-only/setup.groovy
@@ -23,7 +23,7 @@ if (!new File(basedir, "target/read-only-dir/read-only.properties").setWritable(
System.out.println("Cannot change file permission.");
return false;
}
-if (File.separatorChar == '/') {
+if (File.separatorChar == '/' as char) {
// Directory permission can be changed only on Unix, not on Windows.
if (!new File(basedir, "target/read-only-dir").setWritable(false)) {
System.out.println("Cannot change directory permission.");
diff --git a/src/it/symlink-dont-follow/setup.groovy b/src/it/symlink-dont-follow/setup.groovy
index b6b56cd..6aec108 100644
--- a/src/it/symlink-dont-follow/setup.groovy
+++ b/src/it/symlink-dont-follow/setup.groovy
@@ -25,12 +25,12 @@ import java.util.regex.*;
import org.apache.maven.plugins.clean.*;
String[][] pairs =
-{
- { "ext/file.txt", "target/link.txt" },
- { "ext/dir", "target/link" },
- { "ext/file.txt", "target2/link.txt" },
- { "ext/dir", "target2/link" },
-};
+[
+ [ "ext/file.txt", "target/link.txt" ],
+ [ "ext/dir", "target/link" ],
+ [ "ext/file.txt", "target2/link.txt" ],
+ [ "ext/dir", "target2/link" ],
+];
for ( String[] pair : pairs )
{
diff --git a/src/it/symlink-dont-follow/verify.groovy b/src/it/symlink-dont-follow/verify.groovy
index d8e4c7a..e912d6b 100644
--- a/src/it/symlink-dont-follow/verify.groovy
+++ b/src/it/symlink-dont-follow/verify.groovy
@@ -22,11 +22,11 @@ import java.util.*;
import java.util.jar.*;
import java.util.regex.*;
-String[] expected = {
+String[] expected = [
"ext",
"ext/file.txt",
"ext/dir/file.txt",
-};
+];
for ( String path : expected )
{
@@ -39,14 +39,14 @@ for ( String path : expected )
}
}
-String[] unexpected = {
+String[] unexpected = [
"target/link.txt",
"target/link",
"target",
"target2/link.txt",
"target2/link",
"target2",
-};
+];
for ( String path : unexpected )
{
(maven-clean-plugin) 01/02: Rename the BeanShell IT scripts ahead of porting them
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch maven-clean-plugin-3.x
in repository https://gitbox.apache.org/repos/asf/maven-clean-plugin.git
commit 17f6b0c9043dd2513d627e9ee432fed67d11027e
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Sep 20 14:06:55 2026 +0200
Rename the BeanShell IT scripts ahead of porting them
---
src/it/dangling-symlinks/{setup.bsh => setup.groovy} | 0
src/it/dangling-symlinks/{verify.bsh => verify.groovy} | 0
src/it/default/{setup.bsh => setup.groovy} | 0
src/it/default/{verify.bsh => verify.groovy} | 0
src/it/exclude-default-dirs/{verify.bsh => verify.groovy} | 0
src/it/file-sets-absolute-paths/{verify.bsh => verify.groovy} | 0
src/it/file-sets-includes-excludes/{verify.bsh => verify.groovy} | 0
src/it/file-sets-relative-paths/{verify.bsh => verify.groovy} | 0
src/it/only-test-clean/{setup.bsh => setup.groovy} | 0
src/it/only-test-clean/{verify.bsh => verify.groovy} | 0
src/it/read-only/{setup.bsh => setup.groovy} | 0
src/it/read-only/{verify.bsh => verify.groovy} | 0
src/it/special-characters/{setup.bsh => setup.groovy} | 0
src/it/special-characters/{verify.bsh => verify.groovy} | 0
src/it/symlink-dont-follow/{setup.bsh => setup.groovy} | 0
src/it/symlink-dont-follow/{verify.bsh => verify.groovy} | 0
16 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/src/it/dangling-symlinks/setup.bsh b/src/it/dangling-symlinks/setup.groovy
similarity index 100%
rename from src/it/dangling-symlinks/setup.bsh
rename to src/it/dangling-symlinks/setup.groovy
diff --git a/src/it/dangling-symlinks/verify.bsh b/src/it/dangling-symlinks/verify.groovy
similarity index 100%
rename from src/it/dangling-symlinks/verify.bsh
rename to src/it/dangling-symlinks/verify.groovy
diff --git a/src/it/default/setup.bsh b/src/it/default/setup.groovy
similarity index 100%
rename from src/it/default/setup.bsh
rename to src/it/default/setup.groovy
diff --git a/src/it/default/verify.bsh b/src/it/default/verify.groovy
similarity index 100%
rename from src/it/default/verify.bsh
rename to src/it/default/verify.groovy
diff --git a/src/it/exclude-default-dirs/verify.bsh b/src/it/exclude-default-dirs/verify.groovy
similarity index 100%
rename from src/it/exclude-default-dirs/verify.bsh
rename to src/it/exclude-default-dirs/verify.groovy
diff --git a/src/it/file-sets-absolute-paths/verify.bsh b/src/it/file-sets-absolute-paths/verify.groovy
similarity index 100%
rename from src/it/file-sets-absolute-paths/verify.bsh
rename to src/it/file-sets-absolute-paths/verify.groovy
diff --git a/src/it/file-sets-includes-excludes/verify.bsh b/src/it/file-sets-includes-excludes/verify.groovy
similarity index 100%
rename from src/it/file-sets-includes-excludes/verify.bsh
rename to src/it/file-sets-includes-excludes/verify.groovy
diff --git a/src/it/file-sets-relative-paths/verify.bsh b/src/it/file-sets-relative-paths/verify.groovy
similarity index 100%
rename from src/it/file-sets-relative-paths/verify.bsh
rename to src/it/file-sets-relative-paths/verify.groovy
diff --git a/src/it/only-test-clean/setup.bsh b/src/it/only-test-clean/setup.groovy
similarity index 100%
rename from src/it/only-test-clean/setup.bsh
rename to src/it/only-test-clean/setup.groovy
diff --git a/src/it/only-test-clean/verify.bsh b/src/it/only-test-clean/verify.groovy
similarity index 100%
rename from src/it/only-test-clean/verify.bsh
rename to src/it/only-test-clean/verify.groovy
diff --git a/src/it/read-only/setup.bsh b/src/it/read-only/setup.groovy
similarity index 100%
rename from src/it/read-only/setup.bsh
rename to src/it/read-only/setup.groovy
diff --git a/src/it/read-only/verify.bsh b/src/it/read-only/verify.groovy
similarity index 100%
rename from src/it/read-only/verify.bsh
rename to src/it/read-only/verify.groovy
diff --git a/src/it/special-characters/setup.bsh b/src/it/special-characters/setup.groovy
similarity index 100%
rename from src/it/special-characters/setup.bsh
rename to src/it/special-characters/setup.groovy
diff --git a/src/it/special-characters/verify.bsh b/src/it/special-characters/verify.groovy
similarity index 100%
rename from src/it/special-characters/verify.bsh
rename to src/it/special-characters/verify.groovy
diff --git a/src/it/symlink-dont-follow/setup.bsh b/src/it/symlink-dont-follow/setup.groovy
similarity index 100%
rename from src/it/symlink-dont-follow/setup.bsh
rename to src/it/symlink-dont-follow/setup.groovy
diff --git a/src/it/symlink-dont-follow/verify.bsh b/src/it/symlink-dont-follow/verify.groovy
similarity index 100%
rename from src/it/symlink-dont-follow/verify.bsh
rename to src/it/symlink-dont-follow/verify.groovy