From fd5ea6863f576a028befdc6b566d1b9ef26c0c42 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 20 Sep 2026 14:14:26 +0200 Subject: [PATCH 1/2] Rename the BeanShell IT scripts ahead of porting them --- src/it/3rd-party-jar-with-extras/{verify.bsh => verify.groovy} | 0 src/it/3rd-party-jar-without-pom/{verify.bsh => verify.groovy} | 0 src/it/3rd-party-pom-with-extras/{verify.bsh => verify.groovy} | 0 src/it/MDEPLOY-212/{verify.bsh => verify.groovy} | 0 src/it/MDEPLOY-213/{verify.bsh => verify.groovy} | 0 .../{verify.bsh => verify.groovy} | 0 .../alt-deploy-repo-with-dist-mgmt/{verify.bsh => verify.groovy} | 0 .../{verify.bsh => verify.groovy} | 0 src/it/attach-release-jar/{verify.bsh => verify.groovy} | 0 src/it/deploy-attached-sources/{verify.bsh => verify.groovy} | 0 src/it/deploy-default-packaging/{verify.bsh => verify.groovy} | 0 src/it/external-release-jar/{verify.bsh => verify.groovy} | 0 src/it/mdeploy-45-test/{verify.bsh => verify.groovy} | 0 src/it/no-main-artifact-snapshot/{setup.bsh => setup.groovy} | 0 src/it/no-main-artifact-snapshot/{verify.bsh => verify.groovy} | 0 src/it/non-default-pom/{verify.bsh => verify.groovy} | 0 src/it/release-jar/{verify.bsh => verify.groovy} | 0 src/it/release-pom/{verify.bsh => verify.groovy} | 0 src/it/skip-release-jar/{verify.bsh => verify.groovy} | 0 src/it/skip-snapshot-jar/{verify.bsh => verify.groovy} | 0 src/it/snapshot-jar/{verify.bsh => verify.groovy} | 0 src/it/snapshot-pom/{verify.bsh => verify.groovy} | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename src/it/3rd-party-jar-with-extras/{verify.bsh => verify.groovy} (100%) rename src/it/3rd-party-jar-without-pom/{verify.bsh => verify.groovy} (100%) rename src/it/3rd-party-pom-with-extras/{verify.bsh => verify.groovy} (100%) rename src/it/MDEPLOY-212/{verify.bsh => verify.groovy} (100%) rename src/it/MDEPLOY-213/{verify.bsh => verify.groovy} (100%) rename src/it/alt-deploy-repo-with-dist-mgmt-snapshot/{verify.bsh => verify.groovy} (100%) rename src/it/alt-deploy-repo-with-dist-mgmt/{verify.bsh => verify.groovy} (100%) rename src/it/alt-deploy-repo-without-dist-mgmt/{verify.bsh => verify.groovy} (100%) rename src/it/attach-release-jar/{verify.bsh => verify.groovy} (100%) rename src/it/deploy-attached-sources/{verify.bsh => verify.groovy} (100%) rename src/it/deploy-default-packaging/{verify.bsh => verify.groovy} (100%) rename src/it/external-release-jar/{verify.bsh => verify.groovy} (100%) rename src/it/mdeploy-45-test/{verify.bsh => verify.groovy} (100%) rename src/it/no-main-artifact-snapshot/{setup.bsh => setup.groovy} (100%) rename src/it/no-main-artifact-snapshot/{verify.bsh => verify.groovy} (100%) rename src/it/non-default-pom/{verify.bsh => verify.groovy} (100%) rename src/it/release-jar/{verify.bsh => verify.groovy} (100%) rename src/it/release-pom/{verify.bsh => verify.groovy} (100%) rename src/it/skip-release-jar/{verify.bsh => verify.groovy} (100%) rename src/it/skip-snapshot-jar/{verify.bsh => verify.groovy} (100%) rename src/it/snapshot-jar/{verify.bsh => verify.groovy} (100%) rename src/it/snapshot-pom/{verify.bsh => verify.groovy} (100%) diff --git a/src/it/3rd-party-jar-with-extras/verify.bsh b/src/it/3rd-party-jar-with-extras/verify.groovy similarity index 100% rename from src/it/3rd-party-jar-with-extras/verify.bsh rename to src/it/3rd-party-jar-with-extras/verify.groovy diff --git a/src/it/3rd-party-jar-without-pom/verify.bsh b/src/it/3rd-party-jar-without-pom/verify.groovy similarity index 100% rename from src/it/3rd-party-jar-without-pom/verify.bsh rename to src/it/3rd-party-jar-without-pom/verify.groovy diff --git a/src/it/3rd-party-pom-with-extras/verify.bsh b/src/it/3rd-party-pom-with-extras/verify.groovy similarity index 100% rename from src/it/3rd-party-pom-with-extras/verify.bsh rename to src/it/3rd-party-pom-with-extras/verify.groovy diff --git a/src/it/MDEPLOY-212/verify.bsh b/src/it/MDEPLOY-212/verify.groovy similarity index 100% rename from src/it/MDEPLOY-212/verify.bsh rename to src/it/MDEPLOY-212/verify.groovy diff --git a/src/it/MDEPLOY-213/verify.bsh b/src/it/MDEPLOY-213/verify.groovy similarity index 100% rename from src/it/MDEPLOY-213/verify.bsh rename to src/it/MDEPLOY-213/verify.groovy diff --git a/src/it/alt-deploy-repo-with-dist-mgmt-snapshot/verify.bsh b/src/it/alt-deploy-repo-with-dist-mgmt-snapshot/verify.groovy similarity index 100% rename from src/it/alt-deploy-repo-with-dist-mgmt-snapshot/verify.bsh rename to src/it/alt-deploy-repo-with-dist-mgmt-snapshot/verify.groovy diff --git a/src/it/alt-deploy-repo-with-dist-mgmt/verify.bsh b/src/it/alt-deploy-repo-with-dist-mgmt/verify.groovy similarity index 100% rename from src/it/alt-deploy-repo-with-dist-mgmt/verify.bsh rename to src/it/alt-deploy-repo-with-dist-mgmt/verify.groovy diff --git a/src/it/alt-deploy-repo-without-dist-mgmt/verify.bsh b/src/it/alt-deploy-repo-without-dist-mgmt/verify.groovy similarity index 100% rename from src/it/alt-deploy-repo-without-dist-mgmt/verify.bsh rename to src/it/alt-deploy-repo-without-dist-mgmt/verify.groovy diff --git a/src/it/attach-release-jar/verify.bsh b/src/it/attach-release-jar/verify.groovy similarity index 100% rename from src/it/attach-release-jar/verify.bsh rename to src/it/attach-release-jar/verify.groovy diff --git a/src/it/deploy-attached-sources/verify.bsh b/src/it/deploy-attached-sources/verify.groovy similarity index 100% rename from src/it/deploy-attached-sources/verify.bsh rename to src/it/deploy-attached-sources/verify.groovy diff --git a/src/it/deploy-default-packaging/verify.bsh b/src/it/deploy-default-packaging/verify.groovy similarity index 100% rename from src/it/deploy-default-packaging/verify.bsh rename to src/it/deploy-default-packaging/verify.groovy diff --git a/src/it/external-release-jar/verify.bsh b/src/it/external-release-jar/verify.groovy similarity index 100% rename from src/it/external-release-jar/verify.bsh rename to src/it/external-release-jar/verify.groovy diff --git a/src/it/mdeploy-45-test/verify.bsh b/src/it/mdeploy-45-test/verify.groovy similarity index 100% rename from src/it/mdeploy-45-test/verify.bsh rename to src/it/mdeploy-45-test/verify.groovy diff --git a/src/it/no-main-artifact-snapshot/setup.bsh b/src/it/no-main-artifact-snapshot/setup.groovy similarity index 100% rename from src/it/no-main-artifact-snapshot/setup.bsh rename to src/it/no-main-artifact-snapshot/setup.groovy diff --git a/src/it/no-main-artifact-snapshot/verify.bsh b/src/it/no-main-artifact-snapshot/verify.groovy similarity index 100% rename from src/it/no-main-artifact-snapshot/verify.bsh rename to src/it/no-main-artifact-snapshot/verify.groovy diff --git a/src/it/non-default-pom/verify.bsh b/src/it/non-default-pom/verify.groovy similarity index 100% rename from src/it/non-default-pom/verify.bsh rename to src/it/non-default-pom/verify.groovy diff --git a/src/it/release-jar/verify.bsh b/src/it/release-jar/verify.groovy similarity index 100% rename from src/it/release-jar/verify.bsh rename to src/it/release-jar/verify.groovy diff --git a/src/it/release-pom/verify.bsh b/src/it/release-pom/verify.groovy similarity index 100% rename from src/it/release-pom/verify.bsh rename to src/it/release-pom/verify.groovy diff --git a/src/it/skip-release-jar/verify.bsh b/src/it/skip-release-jar/verify.groovy similarity index 100% rename from src/it/skip-release-jar/verify.bsh rename to src/it/skip-release-jar/verify.groovy diff --git a/src/it/skip-snapshot-jar/verify.bsh b/src/it/skip-snapshot-jar/verify.groovy similarity index 100% rename from src/it/skip-snapshot-jar/verify.bsh rename to src/it/skip-snapshot-jar/verify.groovy diff --git a/src/it/snapshot-jar/verify.bsh b/src/it/snapshot-jar/verify.groovy similarity index 100% rename from src/it/snapshot-jar/verify.bsh rename to src/it/snapshot-jar/verify.groovy diff --git a/src/it/snapshot-pom/verify.bsh b/src/it/snapshot-pom/verify.groovy similarity index 100% rename from src/it/snapshot-pom/verify.bsh rename to src/it/snapshot-pom/verify.groovy From 3241885ec03e2326b663b69ed54c1913f3060398 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 20 Sep 2026 14:14:57 +0200 Subject: [PATCH 2/2] 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/3rd-party-jar-with-extras/verify.groovy | 8 ++++---- src/it/3rd-party-jar-without-pom/verify.groovy | 8 ++++---- src/it/3rd-party-pom-with-extras/verify.groovy | 8 ++++---- src/it/MDEPLOY-212/verify.groovy | 8 ++++---- src/it/MDEPLOY-213/verify.groovy | 4 ++-- .../alt-deploy-repo-with-dist-mgmt-snapshot/verify.groovy | 8 ++++---- src/it/alt-deploy-repo-with-dist-mgmt/verify.groovy | 4 ++-- src/it/alt-deploy-repo-without-dist-mgmt/verify.groovy | 4 ++-- src/it/attach-release-jar/verify.groovy | 4 ++-- src/it/external-release-jar/verify.groovy | 4 ++-- src/it/non-default-pom/verify.groovy | 4 ++-- src/it/release-jar/verify.groovy | 4 ++-- src/it/release-pom/verify.groovy | 4 ++-- src/it/skip-release-jar/verify.groovy | 4 ++-- src/it/skip-snapshot-jar/verify.groovy | 4 ++-- src/it/snapshot-jar/verify.groovy | 4 ++-- src/it/snapshot-pom/verify.groovy | 4 ++-- 17 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/it/3rd-party-jar-with-extras/verify.groovy b/src/it/3rd-party-jar-with-extras/verify.groovy index 348e5f34..605ecb03 100644 --- a/src/it/3rd-party-jar-with-extras/verify.groovy +++ b/src/it/3rd-party-jar-with-extras/verify.groovy @@ -21,13 +21,13 @@ import java.io.*; import java.util.*; String[] paths = -{ +[ "org/apache/maven/its/deploy/tpjwop1/test/maven-metadata.xml", "org/apache/maven/its/deploy/tpjwop1/test/1.0/test-1.0.jar", "org/apache/maven/its/deploy/tpjwop1/test/1.0/test-1.0.zip", "org/apache/maven/its/deploy/tpjwop1/test/1.0/test-1.0-src.tar.gz", "org/apache/maven/its/deploy/tpjwop1/test/1.0/test-1.0.tar.gz", -}; +]; for ( String path : paths ) { @@ -40,9 +40,9 @@ for ( String path : paths ) } String[] missing = -{ +[ "org/apache/maven/its/deploy/tpjwop1/test/1.0/test-1.0.pom", -}; +]; for ( String path : missing ) { diff --git a/src/it/3rd-party-jar-without-pom/verify.groovy b/src/it/3rd-party-jar-without-pom/verify.groovy index 36ec6964..3e2d2a3a 100644 --- a/src/it/3rd-party-jar-without-pom/verify.groovy +++ b/src/it/3rd-party-jar-without-pom/verify.groovy @@ -21,10 +21,10 @@ import java.io.*; import java.util.*; String[] paths = -{ +[ "org/apache/maven/its/deploy/tpjwop2/test/maven-metadata.xml", "org/apache/maven/its/deploy/tpjwop2/test/1.0/test-1.0.jar", -}; +]; for ( String path : paths ) { @@ -37,9 +37,9 @@ for ( String path : paths ) } String[] missing = -{ +[ "org/apache/maven/its/deploy/tpjwop2/test/1.0/test-1.0.pom", -}; +]; for ( String path : missing ) { diff --git a/src/it/3rd-party-pom-with-extras/verify.groovy b/src/it/3rd-party-pom-with-extras/verify.groovy index a477aa2a..3174da35 100644 --- a/src/it/3rd-party-pom-with-extras/verify.groovy +++ b/src/it/3rd-party-pom-with-extras/verify.groovy @@ -21,13 +21,13 @@ import java.io.*; import java.util.*; String[] paths = -{ +[ "org/apache/maven/its/deploy/tppwoc/test/maven-metadata.xml", "org/apache/maven/its/deploy/tppwoc/test/1.0/test-1.0.pom", "org/apache/maven/its/deploy/tppwoc/test/1.0/test-1.0.zip", "org/apache/maven/its/deploy/tppwoc/test/1.0/test-1.0-src.tar.gz", "org/apache/maven/its/deploy/tppwoc/test/1.0/test-1.0.tar.gz", -}; +]; for ( String path : paths ) { @@ -40,9 +40,9 @@ for ( String path : paths ) } String[] missing = -{ +[ "org/apache/maven/its/deploy/tppwoc/test/1.0/test-1.0.jar", -}; +]; for ( String path : missing ) { diff --git a/src/it/MDEPLOY-212/verify.groovy b/src/it/MDEPLOY-212/verify.groovy index f71e2520..88f84cd6 100644 --- a/src/it/MDEPLOY-212/verify.groovy +++ b/src/it/MDEPLOY-212/verify.groovy @@ -21,11 +21,11 @@ import java.io.*; import java.util.*; String[] paths = -{ +[ "org/apache/maven/its/mdeploy-212/test/1.0/test-1.0.pom", "org/apache/maven/its/mdeploy-212/test/1.0/test-1.0.tar.gz", "org/apache/maven/its/mdeploy-212/test/1.0/test-1.0-it.zip", -}; +]; for ( String path : paths ) { @@ -38,10 +38,10 @@ for ( String path : paths ) } String[] missing = -{ +[ "org/apache/maven/its/mdeploy-212/test/1.0/test-1.0.jar", "org/apache/maven/its/mdeploy-212/test/1.0/test-1.0-javadoc.jar", -}; +]; for ( String path : missing ) { diff --git a/src/it/MDEPLOY-213/verify.groovy b/src/it/MDEPLOY-213/verify.groovy index ae711422..d7c72232 100644 --- a/src/it/MDEPLOY-213/verify.groovy +++ b/src/it/MDEPLOY-213/verify.groovy @@ -21,13 +21,13 @@ import java.io.*; import java.util.*; String[] paths = -{ +[ "org/apache/maven/its/mdeploy-213/test/1.0/test-1.0.pom", "org/apache/maven/its/mdeploy-213/test/1.0/test-1.0.tar.gz", "org/apache/maven/its/mdeploy-213/test/1.0/test-1.0-it.zip", "org/apache/maven/its/mdeploy-213/test/1.0/test-1.0.jar", "org/apache/maven/its/mdeploy-213/test/1.0/test-1.0-javadoc.jar", -}; +]; for ( String path : paths ) { diff --git a/src/it/alt-deploy-repo-with-dist-mgmt-snapshot/verify.groovy b/src/it/alt-deploy-repo-with-dist-mgmt-snapshot/verify.groovy index ee174845..2e238205 100644 --- a/src/it/alt-deploy-repo-with-dist-mgmt-snapshot/verify.groovy +++ b/src/it/alt-deploy-repo-with-dist-mgmt-snapshot/verify.groovy @@ -21,14 +21,14 @@ import java.io.*; import java.util.*; String[] paths = -{ +[ "org/apache/maven/its/deploy/adrwdms/test/maven-metadata.xml", -}; +]; String[] paths_absent = -{ +[ "org/apache/maven/its/deploy/adrwdms/test/1.0/test-1.0-SNAPSHOT.pom", "org/apache/maven/its/deploy/adrwdms/test/1.0/test-1.0-SNAPSHOT.jar", -}; +]; for ( String path : paths ) { diff --git a/src/it/alt-deploy-repo-with-dist-mgmt/verify.groovy b/src/it/alt-deploy-repo-with-dist-mgmt/verify.groovy index c23ead98..fb80c5f7 100644 --- a/src/it/alt-deploy-repo-with-dist-mgmt/verify.groovy +++ b/src/it/alt-deploy-repo-with-dist-mgmt/verify.groovy @@ -21,11 +21,11 @@ import java.io.*; import java.util.*; String[] paths = -{ +[ "org/apache/maven/its/deploy/adrwdm/test/maven-metadata.xml", "org/apache/maven/its/deploy/adrwdm/test/1.0/test-1.0.pom", "org/apache/maven/its/deploy/adrwdm/test/1.0/test-1.0.jar", -}; +]; for ( String path : paths ) { diff --git a/src/it/alt-deploy-repo-without-dist-mgmt/verify.groovy b/src/it/alt-deploy-repo-without-dist-mgmt/verify.groovy index 4d40bfff..3c3e1d71 100644 --- a/src/it/alt-deploy-repo-without-dist-mgmt/verify.groovy +++ b/src/it/alt-deploy-repo-without-dist-mgmt/verify.groovy @@ -21,11 +21,11 @@ import java.io.*; import java.util.*; String[] paths = -{ +[ "org/apache/maven/its/deploy/adrwodm/test/maven-metadata.xml", "org/apache/maven/its/deploy/adrwodm/test/1.0/test-1.0.pom", "org/apache/maven/its/deploy/adrwodm/test/1.0/test-1.0.jar", -}; +]; for ( String path : paths ) { diff --git a/src/it/attach-release-jar/verify.groovy b/src/it/attach-release-jar/verify.groovy index e8846eec..15ae8162 100644 --- a/src/it/attach-release-jar/verify.groovy +++ b/src/it/attach-release-jar/verify.groovy @@ -21,12 +21,12 @@ import java.io.*; import java.util.*; String[] paths = -{ +[ "org/apache/maven/its/deploy/arj/test/maven-metadata.xml", "org/apache/maven/its/deploy/arj/test/1.0/test-1.0.pom", "org/apache/maven/its/deploy/arj/test/1.0/test-1.0.jar", "org/apache/maven/its/deploy/arj/test/1.0/test-1.0-sources.jar", -}; +]; for ( String path : paths ) { diff --git a/src/it/external-release-jar/verify.groovy b/src/it/external-release-jar/verify.groovy index 5ce81b9c..fb0153bd 100644 --- a/src/it/external-release-jar/verify.groovy +++ b/src/it/external-release-jar/verify.groovy @@ -21,11 +21,11 @@ import java.io.*; import java.util.*; String[] paths = -{ +[ "org/apache/maven/its/deploy/erj/test/maven-metadata.xml", "org/apache/maven/its/deploy/erj/test/1.0/test-1.0.pom", "org/apache/maven/its/deploy/erj/test/1.0/test-1.0.jar", -}; +]; for ( String path : paths ) { diff --git a/src/it/non-default-pom/verify.groovy b/src/it/non-default-pom/verify.groovy index 6810b283..fb55ef57 100644 --- a/src/it/non-default-pom/verify.groovy +++ b/src/it/non-default-pom/verify.groovy @@ -21,10 +21,10 @@ import java.io.*; import java.util.*; String[] paths = -{ +[ "org/apache/maven/its/deploy/ndp/test/maven-metadata.xml", "org/apache/maven/its/deploy/ndp/test/1.0/test-1.0.pom", -}; +]; for ( String path : paths ) { diff --git a/src/it/release-jar/verify.groovy b/src/it/release-jar/verify.groovy index e52b5d43..dc87b318 100644 --- a/src/it/release-jar/verify.groovy +++ b/src/it/release-jar/verify.groovy @@ -21,11 +21,11 @@ import java.io.*; import java.util.*; String[] paths = -{ +[ "org/apache/maven/its/deploy/rj/test/maven-metadata.xml", "org/apache/maven/its/deploy/rj/test/1.0/test-1.0.pom", "org/apache/maven/its/deploy/rj/test/1.0/test-1.0.jar", -}; +]; for ( String path : paths ) { diff --git a/src/it/release-pom/verify.groovy b/src/it/release-pom/verify.groovy index 9dc32929..0cfe9ba8 100644 --- a/src/it/release-pom/verify.groovy +++ b/src/it/release-pom/verify.groovy @@ -21,10 +21,10 @@ import java.io.*; import java.util.*; String[] paths = -{ +[ "org/apache/maven/its/deploy/rp/test/maven-metadata.xml", "org/apache/maven/its/deploy/rp/test/1.0/test-1.0.pom", -}; +]; for ( String path : paths ) { diff --git a/src/it/skip-release-jar/verify.groovy b/src/it/skip-release-jar/verify.groovy index 6fe57019..e858772a 100644 --- a/src/it/skip-release-jar/verify.groovy +++ b/src/it/skip-release-jar/verify.groovy @@ -21,11 +21,11 @@ import java.io.*; import java.util.*; String[] paths = -{ +[ "org/apache/maven/its/deploy/srj/test/maven-metadata.xml", "org/apache/maven/its/deploy/srj/test/1.0/test-1.0.pom", "org/apache/maven/its/deploy/srj/test/1.0/test-1.0.jar", -}; +]; for ( String path : paths ) { diff --git a/src/it/skip-snapshot-jar/verify.groovy b/src/it/skip-snapshot-jar/verify.groovy index 1c35d56b..5e99fbd6 100644 --- a/src/it/skip-snapshot-jar/verify.groovy +++ b/src/it/skip-snapshot-jar/verify.groovy @@ -21,11 +21,11 @@ import java.io.*; import java.util.*; String[] paths = -{ +[ "org/apache/maven/its/deploy/ssj/test/maven-metadata.xml", "org/apache/maven/its/deploy/ssj/test/1.0.0-SNAPSHOT/test-1.0.0-SNAPSHOT.pom", "org/apache/maven/its/deploy/ssj/test/1.0.0-SNAPSHOT/test-1.0.0-SNAPSHOT.jar", -}; +]; for ( String path : paths ) { diff --git a/src/it/snapshot-jar/verify.groovy b/src/it/snapshot-jar/verify.groovy index 405434a0..d9696f78 100644 --- a/src/it/snapshot-jar/verify.groovy +++ b/src/it/snapshot-jar/verify.groovy @@ -23,12 +23,12 @@ import java.util.*; import org.codehaus.plexus.util.*; String[] paths = -{ +[ "org/apache/maven/its/deploy/sj/test/maven-metadata.xml", "org/apache/maven/its/deploy/sj/test/1.0-SNAPSHOT/maven-metadata.xml", "org/apache/maven/its/deploy/sj/test/1.0-SNAPSHOT/test-1.0-*.pom", "org/apache/maven/its/deploy/sj/test/1.0-SNAPSHOT/test-1.0-*.jar", -}; +]; File repoDir = new File( basedir, "target/repo" ); diff --git a/src/it/snapshot-pom/verify.groovy b/src/it/snapshot-pom/verify.groovy index ae883e90..36a1acb4 100644 --- a/src/it/snapshot-pom/verify.groovy +++ b/src/it/snapshot-pom/verify.groovy @@ -23,11 +23,11 @@ import java.util.*; import org.codehaus.plexus.util.*; String[] paths = -{ +[ "org/apache/maven/its/deploy/sp/test/maven-metadata.xml", "org/apache/maven/its/deploy/sp/test/1.0-SNAPSHOT/maven-metadata.xml", "org/apache/maven/its/deploy/sp/test/1.0-SNAPSHOT/test-1.0-*.pom", -}; +]; File repoDir = new File( basedir, "target/repo" );