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 13:36:11 UTC
(maven-resources-plugin) branch master updated (dcdcee9 -> 6344104)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resources-plugin.git
from dcdcee9 configure ATR project
new 6bf5673 Rename the BeanShell IT scripts ahead of porting them
new 6344104 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/MRESOURCES-106/{verify.bsh => verify.groovy} | 0
src/it/MRESOURCES-20/{verify.bsh => verify.groovy} | 4 ++--
src/it/MRESOURCES-77/{verify.bsh => verify.groovy} | 0
src/it/binaries-filtering/{verify.bsh => verify.groovy} | 2 +-
src/it/copy-resources-it/{verify.bsh => verify.groovy} | 2 +-
src/it/custom-delimiter/{verify.bsh => verify.groovy} | 0
src/it/escapeInterpolation/{verify.bsh => verify.groovy} | 10 +++++-----
src/it/filter-test-resources/{verify.bsh => verify.groovy} | 0
src/it/filter/{verify.bsh => verify.groovy} | 0
src/it/include-git-ignore/{setup.bsh => setup.groovy} | 0
src/it/include-git-ignore/{verify.bsh => verify.groovy} | 0
src/it/includeEmptyDirs/{verify.bsh => verify.groovy} | 0
src/it/profile-override/{prebuild.bsh => prebuild.groovy} | 0
src/it/profile-override/{verify.bsh => verify.groovy} | 0
14 files changed, 9 insertions(+), 9 deletions(-)
rename src/it/MRESOURCES-106/{verify.bsh => verify.groovy} (100%)
rename src/it/MRESOURCES-20/{verify.bsh => verify.groovy} (91%)
rename src/it/MRESOURCES-77/{verify.bsh => verify.groovy} (100%)
rename src/it/binaries-filtering/{verify.bsh => verify.groovy} (97%)
rename src/it/copy-resources-it/{verify.bsh => verify.groovy} (96%)
rename src/it/custom-delimiter/{verify.bsh => verify.groovy} (100%)
rename src/it/escapeInterpolation/{verify.bsh => verify.groovy} (93%)
rename src/it/filter-test-resources/{verify.bsh => verify.groovy} (100%)
rename src/it/filter/{verify.bsh => verify.groovy} (100%)
rename src/it/include-git-ignore/{setup.bsh => setup.groovy} (100%)
rename src/it/include-git-ignore/{verify.bsh => verify.groovy} (100%)
rename src/it/includeEmptyDirs/{verify.bsh => verify.groovy} (100%)
rename src/it/profile-override/{prebuild.bsh => prebuild.groovy} (100%)
rename src/it/profile-override/{verify.bsh => verify.groovy} (100%)
(maven-resources-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 master
in repository https://gitbox.apache.org/repos/asf/maven-resources-plugin.git
commit 6bf567347cacb6a49eb8ce0a72c9b0c216f04987
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Sep 20 14:52:12 2026 +0200
Rename the BeanShell IT scripts ahead of porting them
---
src/it/MRESOURCES-106/{verify.bsh => verify.groovy} | 0
src/it/MRESOURCES-20/{verify.bsh => verify.groovy} | 0
src/it/MRESOURCES-77/{verify.bsh => verify.groovy} | 0
src/it/binaries-filtering/{verify.bsh => verify.groovy} | 0
src/it/copy-resources-it/{verify.bsh => verify.groovy} | 0
src/it/custom-delimiter/{verify.bsh => verify.groovy} | 0
src/it/escapeInterpolation/{verify.bsh => verify.groovy} | 0
src/it/filter-test-resources/{verify.bsh => verify.groovy} | 0
src/it/filter/{verify.bsh => verify.groovy} | 0
src/it/include-git-ignore/{setup.bsh => setup.groovy} | 0
src/it/include-git-ignore/{verify.bsh => verify.groovy} | 0
src/it/includeEmptyDirs/{verify.bsh => verify.groovy} | 0
src/it/profile-override/{prebuild.bsh => prebuild.groovy} | 0
src/it/profile-override/{verify.bsh => verify.groovy} | 0
14 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/src/it/MRESOURCES-106/verify.bsh b/src/it/MRESOURCES-106/verify.groovy
similarity index 100%
rename from src/it/MRESOURCES-106/verify.bsh
rename to src/it/MRESOURCES-106/verify.groovy
diff --git a/src/it/MRESOURCES-20/verify.bsh b/src/it/MRESOURCES-20/verify.groovy
similarity index 100%
rename from src/it/MRESOURCES-20/verify.bsh
rename to src/it/MRESOURCES-20/verify.groovy
diff --git a/src/it/MRESOURCES-77/verify.bsh b/src/it/MRESOURCES-77/verify.groovy
similarity index 100%
rename from src/it/MRESOURCES-77/verify.bsh
rename to src/it/MRESOURCES-77/verify.groovy
diff --git a/src/it/binaries-filtering/verify.bsh b/src/it/binaries-filtering/verify.groovy
similarity index 100%
rename from src/it/binaries-filtering/verify.bsh
rename to src/it/binaries-filtering/verify.groovy
diff --git a/src/it/copy-resources-it/verify.bsh b/src/it/copy-resources-it/verify.groovy
similarity index 100%
rename from src/it/copy-resources-it/verify.bsh
rename to src/it/copy-resources-it/verify.groovy
diff --git a/src/it/custom-delimiter/verify.bsh b/src/it/custom-delimiter/verify.groovy
similarity index 100%
rename from src/it/custom-delimiter/verify.bsh
rename to src/it/custom-delimiter/verify.groovy
diff --git a/src/it/escapeInterpolation/verify.bsh b/src/it/escapeInterpolation/verify.groovy
similarity index 100%
rename from src/it/escapeInterpolation/verify.bsh
rename to src/it/escapeInterpolation/verify.groovy
diff --git a/src/it/filter-test-resources/verify.bsh b/src/it/filter-test-resources/verify.groovy
similarity index 100%
rename from src/it/filter-test-resources/verify.bsh
rename to src/it/filter-test-resources/verify.groovy
diff --git a/src/it/filter/verify.bsh b/src/it/filter/verify.groovy
similarity index 100%
rename from src/it/filter/verify.bsh
rename to src/it/filter/verify.groovy
diff --git a/src/it/include-git-ignore/setup.bsh b/src/it/include-git-ignore/setup.groovy
similarity index 100%
rename from src/it/include-git-ignore/setup.bsh
rename to src/it/include-git-ignore/setup.groovy
diff --git a/src/it/include-git-ignore/verify.bsh b/src/it/include-git-ignore/verify.groovy
similarity index 100%
rename from src/it/include-git-ignore/verify.bsh
rename to src/it/include-git-ignore/verify.groovy
diff --git a/src/it/includeEmptyDirs/verify.bsh b/src/it/includeEmptyDirs/verify.groovy
similarity index 100%
rename from src/it/includeEmptyDirs/verify.bsh
rename to src/it/includeEmptyDirs/verify.groovy
diff --git a/src/it/profile-override/prebuild.bsh b/src/it/profile-override/prebuild.groovy
similarity index 100%
rename from src/it/profile-override/prebuild.bsh
rename to src/it/profile-override/prebuild.groovy
diff --git a/src/it/profile-override/verify.bsh b/src/it/profile-override/verify.groovy
similarity index 100%
rename from src/it/profile-override/verify.bsh
rename to src/it/profile-override/verify.groovy
(maven-resources-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 master
in repository https://gitbox.apache.org/repos/asf/maven-resources-plugin.git
commit 6344104b7639c19e485f528786ed1d4bf2967c52
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Sep 20 14:52:44 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/MRESOURCES-20/verify.groovy | 4 ++--
src/it/binaries-filtering/verify.groovy | 2 +-
src/it/copy-resources-it/verify.groovy | 2 +-
src/it/escapeInterpolation/verify.groovy | 10 +++++-----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/it/MRESOURCES-20/verify.groovy b/src/it/MRESOURCES-20/verify.groovy
index 61695b7..fb4f1e0 100644
--- a/src/it/MRESOURCES-20/verify.groovy
+++ b/src/it/MRESOURCES-20/verify.groovy
@@ -42,10 +42,10 @@ try
String paramContent = FileUtils.fileRead( someResource );
- int indexOf = paramContent.indexOf( "fileValue=${foo.file}" );
+ int indexOf = paramContent.indexOf( 'fileValue=${foo.file}' );
if ( indexOf < 0 )
{
- System.err.println( "SomeResource.txt not contains fileValue=${foo.file}" );
+ System.err.println( 'SomeResource.txt not contains fileValue=${foo.file}' );
return false;
}
}
diff --git a/src/it/binaries-filtering/verify.groovy b/src/it/binaries-filtering/verify.groovy
index 646826a..3ba9324 100644
--- a/src/it/binaries-filtering/verify.groovy
+++ b/src/it/binaries-filtering/verify.groovy
@@ -23,7 +23,7 @@ import org.codehaus.plexus.util.*;
boolean result = true;
-filesAreIdentical( File expected, File current )
+boolean filesAreIdentical( File expected, File current )
throws IOException
{
if ( expected.length() != current.length() )
diff --git a/src/it/copy-resources-it/verify.groovy b/src/it/copy-resources-it/verify.groovy
index cb111b0..f6f9a84 100644
--- a/src/it/copy-resources-it/verify.groovy
+++ b/src/it/copy-resources-it/verify.groovy
@@ -49,7 +49,7 @@ try
return false;
}
- int indexOf = paramContent.indexOf( "version=1.0.1-SNAPSHOT" );
+ indexOf = paramContent.indexOf( "version=1.0.1-SNAPSHOT" );
if ( indexOf < 0 )
{
System.err.println( "configuration.properties not contains version=1.0.1-SNAPSHOT" );
diff --git a/src/it/escapeInterpolation/verify.groovy b/src/it/escapeInterpolation/verify.groovy
index fa19ea8..4d72c10 100644
--- a/src/it/escapeInterpolation/verify.groovy
+++ b/src/it/escapeInterpolation/verify.groovy
@@ -108,10 +108,10 @@ try
}
//escapeString=${project.version}
- indexOf = paramContent.indexOf( "escapeString=${project.artifactId}" );
+ indexOf = paramContent.indexOf( 'escapeString=${project.artifactId}' );
if ( indexOf < 0 )
{
- System.err.println( "/classes/SomeResource.txt not contains escapeString=${project.version}" );
+ System.err.println( '/classes/SomeResource.txt not contains escapeString=${project.version}' );
System.out.println (" content " + paramContent );
return false;
}
@@ -131,7 +131,7 @@ try
paramContent = FileUtils.fileRead( someResource );
//test:direct resolution project.version=1.0-SNAPSHOT
- int indexOf = paramContent.indexOf( "test:direct resolution project.version=1.0-SNAPSHOT" );
+ indexOf = paramContent.indexOf( "test:direct resolution project.version=1.0-SNAPSHOT" );
if ( indexOf < 0 )
{
System.err.println( "/test-classes/SomeResource.txt not contains test:direct resolution project.version=1.0-SNAPSHOT" );
@@ -180,10 +180,10 @@ try
}
//escapeString=${project.version}
- indexOf = paramContent.indexOf( "escapeString=${project.version}" );
+ indexOf = paramContent.indexOf( 'escapeString=${project.version}' );
if ( indexOf < 0 )
{
- System.err.println( "/test-classes/SomeResource.txt not contains escapeString=${project.version}" );
+ System.err.println( '/test-classes/SomeResource.txt not contains escapeString=${project.version}' );
return false;
}