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:47:25 UTC
(maven-shade-plugin) 02/02: Port the IT scripts from BeanShell to Groovy
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-shade-plugin.git
commit 5bc727a7b1b43249d6a04aad8509c309a889138e
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Sep 20 13:59:30 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/projects/MSHADE-313_minimized-services/verify.groovy | 8 ++++----
src/it/projects/MSHADE-316/verify.groovy | 8 ++++----
.../MSHADE-36-inject-dep-reduced-pom-in-final/verify.groovy | 8 ++++----
src/it/projects/MSHADE-373/verify.groovy | 4 ++--
.../projects/MSHADE-400_self-minimized-services/verify.groovy | 8 ++++----
src/it/projects/artifact-includes-excludes/verify.groovy | 8 ++++----
src/it/projects/attach-after-lifecycle-fork/verify.groovy | 4 ++--
src/it/projects/extrajar/verify.groovy | 4 ++--
src/it/projects/filter-artifact-contents/verify.groovy | 8 ++++----
.../implicit-inclusion-of-project-artifact/verify.groovy | 4 ++--
src/it/projects/mini-jar-jdk11+/verify.groovy | 10 +++++-----
src/it/projects/mini-jar-package-info/verify.groovy | 7 +++----
src/it/projects/mini-jar-respect-includes/verify.groovy | 8 ++++----
src/it/projects/mini-jar/verify.groovy | 8 ++++----
src/it/projects/non-runtime-scope-excluded/verify.groovy | 8 ++++----
src/it/projects/pom-packaging/verify.groovy | 7 +++----
src/it/projects/project-with-reactors-included/verify.groovy | 4 ++--
src/it/projects/reloc-and-mini/verify.groovy | 8 ++++----
src/it/projects/reloc-includes-excludes/verify.groovy | 8 ++++----
.../verify.groovy | 2 +-
src/it/projects/xml-transformer-ignores-dtd/verify.groovy | 4 ++--
21 files changed, 68 insertions(+), 70 deletions(-)
diff --git a/src/it/projects/MSHADE-313_minimized-services/verify.groovy b/src/it/projects/MSHADE-313_minimized-services/verify.groovy
index 2529359c..8d5c1c35 100644
--- a/src/it/projects/MSHADE-313_minimized-services/verify.groovy
+++ b/src/it/projects/MSHADE-313_minimized-services/verify.groovy
@@ -20,7 +20,7 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"Main.class",
"META-INF/services/SomeServiceInterface",
"SomeServiceInterface.class",
@@ -30,17 +30,17 @@ String[] wanted =
"DependencyServiceInterface.class",
"DependencyServiceClass.class",
"DependencyReferencedClass.class"
-};
+];
String[] unwanted =
-{
+[
// Unused SPI config files are not removed
//"META-INF/services/UnusedServiceInterface",
"UnusedServiceInterface.class",
"UnusedServiceClass.class",
"SomeUnreferencedClass.class",
"DependencyUnreferencedClass.class"
-};
+];
JarFile jarFile = new JarFile( new File( basedir, "test/target/test-1.0.jar" ) );
diff --git a/src/it/projects/MSHADE-316/verify.groovy b/src/it/projects/MSHADE-316/verify.groovy
index 1e570685..fe528a51 100644
--- a/src/it/projects/MSHADE-316/verify.groovy
+++ b/src/it/projects/MSHADE-316/verify.groovy
@@ -20,18 +20,18 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"Main.class",
"SomeUsedClass.class",
"x/y/z/SomeExemptedClass.class",
"x/y/z/AnotherExemptedClass.class",
"x/y/z/SomeDependencyOfExemptedClass.class"
-};
+];
String[] unwanted =
-{
+[
"SomeUnusedClass.class"
-};
+];
JarFile jarFile = new JarFile( new File( basedir, "test/target/test-1.0.jar" ) );
diff --git a/src/it/projects/MSHADE-36-inject-dep-reduced-pom-in-final/verify.groovy b/src/it/projects/MSHADE-36-inject-dep-reduced-pom-in-final/verify.groovy
index 10a3e158..4ce2f80f 100644
--- a/src/it/projects/MSHADE-36-inject-dep-reduced-pom-in-final/verify.groovy
+++ b/src/it/projects/MSHADE-36-inject-dep-reduced-pom-in-final/verify.groovy
@@ -23,17 +23,17 @@ import java.util.Arrays;
import org.codehaus.plexus.util.*;
String[] wanted =
-{
+[
"com/example/Main.class",
"junit/runner/logo.gif",
"com/example/shaded/org/codehaus/plexus/util/StringUtils.class",
-};
+];
String[] unwanted =
-{
+[
"junit/textui/TestRunner.class",
"org/codehaus/plexus/util/StringUtils.class",
-};
+];
JarFile jarFile = null;
try
diff --git a/src/it/projects/MSHADE-373/verify.groovy b/src/it/projects/MSHADE-373/verify.groovy
index 7b2dd882..29afa23e 100644
--- a/src/it/projects/MSHADE-373/verify.groovy
+++ b/src/it/projects/MSHADE-373/verify.groovy
@@ -21,7 +21,7 @@ import java.util.jar.*;
// NOTE: We deliberately use JarInputStream and not JarFile here!
Manifest extractManifest(name) {
- file = new File( basedir, "target/" + name );
+ def file = new File( basedir, "target/" + name );
if ( !file.exists() )
{
throw new IllegalStateException( "No file '" + file + "'" );
@@ -33,7 +33,7 @@ Manifest extractManifest(name) {
}
void assertsEntries( name, expectedTestEntry, expectedOriginalEntry, expectedCustomEntry ) {
- attributes = extractManifest( name ).getMainAttributes();
+ def attributes = extractManifest( name ).getMainAttributes();
if ( !Objects.equals( expectedTestEntry, attributes.getValue( "Test-Entry" ) ) )
{
diff --git a/src/it/projects/MSHADE-400_self-minimized-services/verify.groovy b/src/it/projects/MSHADE-400_self-minimized-services/verify.groovy
index 2708621c..5e7ed8c8 100644
--- a/src/it/projects/MSHADE-400_self-minimized-services/verify.groovy
+++ b/src/it/projects/MSHADE-400_self-minimized-services/verify.groovy
@@ -20,16 +20,16 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"META-INF/services/org.acme.UsedService",
"org/acme/Application.class",
"org/acme/UsedClass.class",
"org/acme/UsedService.class",
"org/acme/UsedServiceUsedImpl.class"
-};
+];
String[] unwanted =
-{
+[
// Unused SPI config files are not removed
//"META-INF/services/org.acme.UnusedService",
"org/acme/UsedServiceUnusedImpl.class",
@@ -37,7 +37,7 @@ String[] unwanted =
"org/acme/UnusedService.class",
"org/acme/UnusedServiceImplA.class",
"org/acme/UnusedServiceImplB.class"
-};
+];
JarFile jarFile = new JarFile( new File( basedir, "target/module-with-services-1.0.jar" ) );
diff --git a/src/it/projects/artifact-includes-excludes/verify.groovy b/src/it/projects/artifact-includes-excludes/verify.groovy
index bb38d871..5853e761 100644
--- a/src/it/projects/artifact-includes-excludes/verify.groovy
+++ b/src/it/projects/artifact-includes-excludes/verify.groovy
@@ -21,15 +21,15 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"a.properties",
-};
+];
String[] unwanted =
-{
+[
"b.properties",
"junit/framework/TestCase.class",
-};
+];
JarFile jarFile = new JarFile( new File( basedir, "target/test-1.0.jar" ) );
diff --git a/src/it/projects/attach-after-lifecycle-fork/verify.groovy b/src/it/projects/attach-after-lifecycle-fork/verify.groovy
index 00092be7..1e778f4f 100644
--- a/src/it/projects/attach-after-lifecycle-fork/verify.groovy
+++ b/src/it/projects/attach-after-lifecycle-fork/verify.groovy
@@ -20,10 +20,10 @@ import java.io.*;
import java.util.*;
String[] paths =
-{
+[
"org/apache/maven/its/shade/aalf/test/1.0/test-1.0-shade.jar",
"org/apache/maven/its/shade/aalf/test/1.0/test-1.0-sources.jar",
-};
+];
for ( String path : paths )
{
diff --git a/src/it/projects/extrajar/verify.groovy b/src/it/projects/extrajar/verify.groovy
index b7d1db37..5a2e7e76 100644
--- a/src/it/projects/extrajar/verify.groovy
+++ b/src/it/projects/extrajar/verify.groovy
@@ -21,10 +21,10 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"org/slf4j/Logger.class",
"org/slf4j/impl/SimpleLogger.class"
-};
+];
JarFile jarFile = new JarFile( new File( basedir, "target/test-1.0-shaded.jar" ) );
diff --git a/src/it/projects/filter-artifact-contents/verify.groovy b/src/it/projects/filter-artifact-contents/verify.groovy
index 7dbdcc38..30c1a740 100644
--- a/src/it/projects/filter-artifact-contents/verify.groovy
+++ b/src/it/projects/filter-artifact-contents/verify.groovy
@@ -20,22 +20,22 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"a.properties",
"org/apache/a.properties",
"org/apache/maven/a.properties",
"b.properties",
"org/apache/maven/b.properties",
-};
+];
String[] unwanted =
-{
+[
"META-INF/maven/org.apache.maven.its.shade.fac/a/pom.properties",
"org/a.properties",
"org/b.properties",
"org/apache/b.properties",
"org/apache/maven/b/b.properties",
-};
+];
JarFile jarFile = new JarFile( new File( basedir, "target/test-1.0.jar" ) );
diff --git a/src/it/projects/implicit-inclusion-of-project-artifact/verify.groovy b/src/it/projects/implicit-inclusion-of-project-artifact/verify.groovy
index 5b3538a2..c2c3acda 100644
--- a/src/it/projects/implicit-inclusion-of-project-artifact/verify.groovy
+++ b/src/it/projects/implicit-inclusion-of-project-artifact/verify.groovy
@@ -20,9 +20,9 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"Passed.class",
-};
+];
JarFile jarFile = new JarFile( new File( basedir, "target/test-1.0.jar" ) );
diff --git a/src/it/projects/mini-jar-jdk11+/verify.groovy b/src/it/projects/mini-jar-jdk11+/verify.groovy
index ea670dd2..e5fdd528 100644
--- a/src/it/projects/mini-jar-jdk11+/verify.groovy
+++ b/src/it/projects/mini-jar-jdk11+/verify.groovy
@@ -21,17 +21,17 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"Main.class",
- "Main$Nested.class",
+ "Main\$Nested.class",
"junit/framework/TestCase.class",
"junit/swingui/icons/error.gif",
-};
+];
String[] unwanted =
-{
+[
"junit/swingui/TestRunner.class",
-};
+];
JarFile jarFile = new JarFile( new File( basedir, "target/testmini-1.0.jar" ) );
diff --git a/src/it/projects/mini-jar-package-info/verify.groovy b/src/it/projects/mini-jar-package-info/verify.groovy
index be41cb2d..6d22ceea 100644
--- a/src/it/projects/mini-jar-package-info/verify.groovy
+++ b/src/it/projects/mini-jar-package-info/verify.groovy
@@ -20,15 +20,14 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"org/apache/maven/it/pi/Main.class",
"org/apache/maven/it/pi/HaveOneClass.class",
"org/apache/maven/it/pi/package-info.class",
-};
+];
String[] unwanted =
-{
-};
+[] as String[];
JarFile jarFile = new JarFile( new File( basedir, "test/target/test-1.jar" ) );
diff --git a/src/it/projects/mini-jar-respect-includes/verify.groovy b/src/it/projects/mini-jar-respect-includes/verify.groovy
index 8a33e53b..9eb87bf6 100644
--- a/src/it/projects/mini-jar-respect-includes/verify.groovy
+++ b/src/it/projects/mini-jar-respect-includes/verify.groovy
@@ -20,19 +20,19 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"Main.class",
"junit/framework/TestCase.class",
"junit/runner/logo.gif",
"junit/framework/Assert.class",
"org/jdom2/Document.class"
-};
+];
String[] unwanted =
-{
+[
"junit/textui/TestRunner.class",
"org/objectweb/asm/Type.class"
-};
+];
JarFile jarFile = new JarFile( new File( basedir, "target/test-1.0.jar" ) );
diff --git a/src/it/projects/mini-jar/verify.groovy b/src/it/projects/mini-jar/verify.groovy
index f1d5ab41..97ad5152 100644
--- a/src/it/projects/mini-jar/verify.groovy
+++ b/src/it/projects/mini-jar/verify.groovy
@@ -21,16 +21,16 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"Main.class",
"junit/framework/TestCase.class",
"junit/swingui/icons/error.gif",
-};
+];
String[] unwanted =
-{
+[
"junit/swingui/TestRunner.class",
-};
+];
JarFile jarFile = new JarFile( new File( basedir, "target/test-1.0.jar" ) );
diff --git a/src/it/projects/non-runtime-scope-excluded/verify.groovy b/src/it/projects/non-runtime-scope-excluded/verify.groovy
index fd17d56b..049e1ce0 100644
--- a/src/it/projects/non-runtime-scope-excluded/verify.groovy
+++ b/src/it/projects/non-runtime-scope-excluded/verify.groovy
@@ -20,17 +20,17 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"compile.properties",
"runtime.properties",
-};
+];
String[] unwanted =
-{
+[
"system.properties",
"provided.properties",
"test.properties",
-};
+];
JarFile jarFile = new JarFile( new File( basedir, "target/it-1.0.jar" ) );
diff --git a/src/it/projects/pom-packaging/verify.groovy b/src/it/projects/pom-packaging/verify.groovy
index 09f78f5e..a93b3318 100644
--- a/src/it/projects/pom-packaging/verify.groovy
+++ b/src/it/projects/pom-packaging/verify.groovy
@@ -20,13 +20,12 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"junit/framework/TestCase.class",
-};
+];
String[] unwanted =
-{
-};
+[] as String[];
JarFile jarFile = new JarFile( new File( basedir, "target/shaded.jar" ) );
diff --git a/src/it/projects/project-with-reactors-included/verify.groovy b/src/it/projects/project-with-reactors-included/verify.groovy
index 819eb804..d8e73ad3 100644
--- a/src/it/projects/project-with-reactors-included/verify.groovy
+++ b/src/it/projects/project-with-reactors-included/verify.groovy
@@ -23,11 +23,11 @@ import java.util.jar.*;
import org.codehaus.plexus.util.*;
String[] wanted =
-{
+[
"org/apache/maven/plugins/shade/its/one/AppOne.class",
"org/apache/maven/plugins/shade/its/one/App.class",
"org/apache/maven/plugins/shade/its/two/App.class"
-};
+];
JarFile jarFile = new JarFile( new File( basedir, "two/target/two-1.0-SNAPSHOT.jar" ) );
diff --git a/src/it/projects/reloc-and-mini/verify.groovy b/src/it/projects/reloc-and-mini/verify.groovy
index ae85d02a..49cab81c 100644
--- a/src/it/projects/reloc-and-mini/verify.groovy
+++ b/src/it/projects/reloc-and-mini/verify.groovy
@@ -20,14 +20,14 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"a/junit/framework/TestResult.class",
-};
+];
String[] unwanted =
-{
+[
"junit/framework/TestResult.class",
-};
+];
JarFile jarFile = new JarFile( new File( basedir, "target/test-1.0.jar" ) );
diff --git a/src/it/projects/reloc-includes-excludes/verify.groovy b/src/it/projects/reloc-includes-excludes/verify.groovy
index e1dadeb8..071f7c74 100644
--- a/src/it/projects/reloc-includes-excludes/verify.groovy
+++ b/src/it/projects/reloc-includes-excludes/verify.groovy
@@ -20,20 +20,20 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"a/ResultPrinter.class",
"junit/textui/TestRunner.class",
"b/Test.class",
"b/TestCase.class",
"junit/framework/Assert.class",
-};
+];
String[] unwanted =
-{
+[
"junit/textui/ResultPrinter.class",
"junit/framework/Test.class",
"junit/framework/TestCase.class",
-};
+];
JarFile jarFile = new JarFile( new File( basedir, "target/test-1.0.jar" ) );
diff --git a/src/it/projects/services-resource-transformer-with-reloc-includes-excludes/verify.groovy b/src/it/projects/services-resource-transformer-with-reloc-includes-excludes/verify.groovy
index 755ff5f9..d43110f4 100644
--- a/src/it/projects/services-resource-transformer-with-reloc-includes-excludes/verify.groovy
+++ b/src/it/projects/services-resource-transformer-with-reloc-includes-excludes/verify.groovy
@@ -28,7 +28,7 @@ String service = IOUtil.toString( jarFile.getInputStream( jarEntry ), "UTF-8" );
jarFile.close();
String[] services = service.split( "(\r\n)|(\r)|(\n)" );
-String[] expected = { "org.apache.maven.its.shade.One", "shaded.org.apache.maven.its.shade.Two" };
+String[] expected = [ "org.apache.maven.its.shade.One", "shaded.org.apache.maven.its.shade.Two" ];
Arrays.sort(services);
Arrays.sort(expected);
diff --git a/src/it/projects/xml-transformer-ignores-dtd/verify.groovy b/src/it/projects/xml-transformer-ignores-dtd/verify.groovy
index 1ea58c72..9a2ec628 100644
--- a/src/it/projects/xml-transformer-ignores-dtd/verify.groovy
+++ b/src/it/projects/xml-transformer-ignores-dtd/verify.groovy
@@ -20,9 +20,9 @@ import java.io.*;
import java.util.jar.*;
String[] wanted =
-{
+[
"test.xml",
-};
+];
JarFile jarFile = new JarFile( new File( basedir, "target/test-1.0.jar" ) );