diff --git a/src/it/projects/basic-features/ExecutionRoot/verify.bsh b/src/it/projects/basic-features/ExecutionRoot/verify.groovy
similarity index 100%
rename from src/it/projects/basic-features/ExecutionRoot/verify.bsh
rename to src/it/projects/basic-features/ExecutionRoot/verify.groovy
diff --git a/src/it/projects/basic-features/add-classpath/verify.bsh b/src/it/projects/basic-features/add-classpath/verify.groovy
similarity index 95%
rename from src/it/projects/basic-features/add-classpath/verify.bsh
rename to src/it/projects/basic-features/add-classpath/verify.groovy
index c17bc6000..e141ee555 100644
--- a/src/it/projects/basic-features/add-classpath/verify.bsh
+++ b/src/it/projects/basic-features/add-classpath/verify.groovy
@@ -34,6 +34,4 @@ Attributes attrs = mf.getMainAttributes();
 
 String classPath = (String) attrs.get( Attributes.Name.CLASS_PATH );
 
-System.out.println( "Got Main-Class: " + mainClass );
-
 return  classPath.contains("plexus-utils");
diff --git a/src/it/projects/basic-features/file-copyIntoTopDir/verify.bsh b/src/it/projects/basic-features/file-copyIntoTopDir/verify.groovy
similarity index 100%
rename from src/it/projects/basic-features/file-copyIntoTopDir/verify.bsh
rename to src/it/projects/basic-features/file-copyIntoTopDir/verify.groovy
diff --git a/src/it/projects/basic-features/file-sameName/verify.bsh b/src/it/projects/basic-features/file-sameName/verify.groovy
similarity index 100%
rename from src/it/projects/basic-features/file-sameName/verify.bsh
rename to src/it/projects/basic-features/file-sameName/verify.groovy
diff --git a/src/it/projects/basic-features/formats-in-pom-win/verify.bsh b/src/it/projects/basic-features/formats-in-pom-win/verify.groovy
similarity index 100%
rename from src/it/projects/basic-features/formats-in-pom-win/verify.bsh
rename to src/it/projects/basic-features/formats-in-pom-win/verify.groovy
diff --git a/src/it/projects/basic-features/formats-zstd/verify.bsh b/src/it/projects/basic-features/formats-zstd/verify.groovy
similarity index 100%
rename from src/it/projects/basic-features/formats-zstd/verify.bsh
rename to src/it/projects/basic-features/formats-zstd/verify.groovy
diff --git a/src/it/projects/basic-features/formats/verify.bsh b/src/it/projects/basic-features/formats/verify.groovy
similarity index 100%
rename from src/it/projects/basic-features/formats/verify.bsh
rename to src/it/projects/basic-features/formats/verify.groovy
diff --git a/src/it/projects/basic-features/local-repo-interp/verify.bsh b/src/it/projects/basic-features/local-repo-interp/verify.groovy
similarity index 100%
rename from src/it/projects/basic-features/local-repo-interp/verify.bsh
rename to src/it/projects/basic-features/local-repo-interp/verify.groovy
diff --git a/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh b/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.groovy
similarity index 100%
rename from src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh
rename to src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.groovy
diff --git a/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh b/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.groovy
similarity index 100%
rename from src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh
rename to src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.groovy
diff --git a/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh b/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.groovy
similarity index 100%
rename from src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
rename to src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.groovy
diff --git a/src/it/projects/basic-features/relative-project-paths/verify.bsh b/src/it/projects/basic-features/relative-project-paths/verify.groovy
similarity index 100%
rename from src/it/projects/basic-features/relative-project-paths/verify.bsh
rename to src/it/projects/basic-features/relative-project-paths/verify.groovy
diff --git a/src/it/projects/basic-features/space & special char/verify.bsh b/src/it/projects/basic-features/space & special char/verify.groovy
similarity index 100%
rename from src/it/projects/basic-features/space & special char/verify.bsh
rename to src/it/projects/basic-features/space & special char/verify.groovy
diff --git a/src/it/projects/bugs/massembly-190/verify.bsh b/src/it/projects/bugs/massembly-190/verify.groovy
similarity index 100%
rename from src/it/projects/bugs/massembly-190/verify.bsh
rename to src/it/projects/bugs/massembly-190/verify.groovy
diff --git a/src/it/projects/bugs/massembly-285/massembly-285-assembly/verify.bsh b/src/it/projects/bugs/massembly-285/massembly-285-assembly/verify.groovy
similarity index 90%
rename from src/it/projects/bugs/massembly-285/massembly-285-assembly/verify.bsh
rename to src/it/projects/bugs/massembly-285/massembly-285-assembly/verify.groovy
index 965402cdb..1d9d48631 100644
--- a/src/it/projects/bugs/massembly-285/massembly-285-assembly/verify.bsh
+++ b/src/it/projects/bugs/massembly-285/massembly-285-assembly/verify.groovy
@@ -23,4 +23,4 @@ import java.io.File;
  This is where you verify the results of the assembly build. You may need to check the existence of a file,
  or even peek within a jar file to determine whether the assembly did the right thing.
  */
-return new File( basedir, "target/${artifactId}-${version}-bin.dir/lib/junit-jupiter-api.jar" ).exists();
+return new File( basedir, 'target/${artifactId}-${version}-bin.dir/lib/junit-jupiter-api.jar' ).exists();
diff --git a/src/it/projects/bugs/massembly-375/verify.bsh b/src/it/projects/bugs/massembly-375/verify.groovy
similarity index 100%
rename from src/it/projects/bugs/massembly-375/verify.bsh
rename to src/it/projects/bugs/massembly-375/verify.groovy
diff --git a/src/it/projects/bugs/massembly-583/verify.bsh b/src/it/projects/bugs/massembly-583/verify.groovy
similarity index 100%
rename from src/it/projects/bugs/massembly-583/verify.bsh
rename to src/it/projects/bugs/massembly-583/verify.groovy
diff --git a/src/it/projects/bugs/massembly-732/verify.bsh b/src/it/projects/bugs/massembly-732/verify.groovy
similarity index 100%
rename from src/it/projects/bugs/massembly-732/verify.bsh
rename to src/it/projects/bugs/massembly-732/verify.groovy
diff --git a/src/it/projects/bugs/massembly-733/verify.bsh b/src/it/projects/bugs/massembly-733/verify.groovy
similarity index 100%
rename from src/it/projects/bugs/massembly-733/verify.bsh
rename to src/it/projects/bugs/massembly-733/verify.groovy
diff --git a/src/it/projects/bugs/massembly-743/verify.bsh b/src/it/projects/bugs/massembly-743/verify.groovy
similarity index 100%
rename from src/it/projects/bugs/massembly-743/verify.bsh
rename to src/it/projects/bugs/massembly-743/verify.groovy
diff --git a/src/it/projects/container-descriptors/configured-handler/verify.bsh b/src/it/projects/container-descriptors/configured-handler/verify.groovy
similarity index 100%
rename from src/it/projects/container-descriptors/configured-handler/verify.bsh
rename to src/it/projects/container-descriptors/configured-handler/verify.groovy
diff --git a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.groovy
similarity index 100%
rename from src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh
rename to src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.groovy
diff --git a/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh b/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.groovy
similarity index 100%
rename from src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh
rename to src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.groovy
diff --git a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.groovy
similarity index 100%
rename from src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
rename to src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.groovy
diff --git a/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh b/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.groovy
similarity index 100%
rename from src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh
rename to src/it/projects/container-descriptors/metaInf-services-aggregation/verify.groovy
diff --git a/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.bsh b/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.groovy
similarity index 99%
rename from src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.bsh
rename to src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.groovy
index 81c1ff197..5f2cadcb1 100644
--- a/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.bsh
+++ b/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.groovy
@@ -77,7 +77,7 @@ try
   boolean found30 = false;
   boolean found40 = false;
 
-  String line = null;
+  line = null;
   while( ( line = br.readLine() ) != null )
   {
     if ( line.endsWith( "spring-aop-3.0.xsd" ) )
diff --git a/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.bsh b/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.groovy
similarity index 98%
rename from src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.bsh
rename to src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.groovy
index b2f0e5091..26f193028 100644
--- a/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.bsh
+++ b/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.groovy
@@ -20,12 +20,12 @@
 import java.io.*;
 
 File dir = new File( basedir, "target/dep-transfilter-wildcard-massembly544-1-bin/maven-libs" );
-File[] files = {
+File[] files = [
   new File( dir, "wagon-webdav-jackrabbit-1.0-beta-4.jar" ),
   new File( dir, "xercesMinimal-1.9.6.2.jar" ),
   new File( dir, "maven-reporting-api-2.0.4.jar" ),
   new File( dir, "doxia-sink-api-1.0-alpha-7.jar" )
-};
+];
 
 boolean result = true;
 for( int i = 0; i<files.length; i++ )
diff --git a/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh b/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh
rename to src/it/projects/dependency-sets/dep-with-transitive-filter/verify.groovy
diff --git a/src/it/projects/dependency-sets/depMgmt-override/verify.bsh b/src/it/projects/dependency-sets/depMgmt-override/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/depMgmt-override/verify.bsh
rename to src/it/projects/dependency-sets/depMgmt-override/verify.groovy
diff --git a/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.bsh b/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.bsh
rename to src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.groovy
diff --git a/src/it/projects/dependency-sets/depSet-byDepVersion/verify.bsh b/src/it/projects/dependency-sets/depSet-byDepVersion/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/depSet-byDepVersion/verify.bsh
rename to src/it/projects/dependency-sets/depSet-byDepVersion/verify.groovy
diff --git a/src/it/projects/dependency-sets/depSet-runtimeScope/verify.bsh b/src/it/projects/dependency-sets/depSet-runtimeScope/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/depSet-runtimeScope/verify.bsh
rename to src/it/projects/dependency-sets/depSet-runtimeScope/verify.groovy
diff --git a/src/it/projects/dependency-sets/depSet-transFromProfile/verify.bsh b/src/it/projects/dependency-sets/depSet-transFromProfile/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/depSet-transFromProfile/verify.bsh
rename to src/it/projects/dependency-sets/depSet-transFromProfile/verify.groovy
diff --git a/src/it/projects/dependency-sets/depSet-unpacked-rdonly/verify.bsh b/src/it/projects/dependency-sets/depSet-unpacked-rdonly/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/depSet-unpacked-rdonly/verify.bsh
rename to src/it/projects/dependency-sets/depSet-unpacked-rdonly/verify.groovy
diff --git a/src/it/projects/dependency-sets/dependencySet-matchScope/verify.bsh b/src/it/projects/dependency-sets/dependencySet-matchScope/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/dependencySet-matchScope/verify.bsh
rename to src/it/projects/dependency-sets/dependencySet-matchScope/verify.groovy
diff --git a/src/it/projects/dependency-sets/dependencySet-nonTransitive/verify.bsh b/src/it/projects/dependency-sets/dependencySet-nonTransitive/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/dependencySet-nonTransitive/verify.bsh
rename to src/it/projects/dependency-sets/dependencySet-nonTransitive/verify.groovy
diff --git a/src/it/projects/dependency-sets/dependencySet-notUnpacked/verify.bsh b/src/it/projects/dependency-sets/dependencySet-notUnpacked/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/dependencySet-notUnpacked/verify.bsh
rename to src/it/projects/dependency-sets/dependencySet-notUnpacked/verify.groovy
diff --git a/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.bsh b/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.groovy
similarity index 97%
rename from src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.bsh
rename to src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.groovy
index 00be9cf65..db95dff55 100644
--- a/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.bsh
+++ b/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.groovy
@@ -19,7 +19,7 @@
 
 import java.io.*;
 
-if ( basedir == void )
+if ( !binding.hasVariable( "basedir" ) )
 {
   basedir = new File( "." );
 }
diff --git a/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/verify.bsh b/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/dependencySet-unpacked-filtered/verify.bsh
rename to src/it/projects/dependency-sets/dependencySet-unpacked-filtered/verify.groovy
diff --git a/src/it/projects/dependency-sets/dependencySet-unpacked/verify.bsh b/src/it/projects/dependency-sets/dependencySet-unpacked/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/dependencySet-unpacked/verify.bsh
rename to src/it/projects/dependency-sets/dependencySet-unpacked/verify.groovy
diff --git a/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/verify.bsh b/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/verify.bsh
rename to src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/verify.groovy
diff --git a/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/verify.bsh b/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/verify.bsh
rename to src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/verify.groovy
diff --git a/src/it/projects/dependency-sets/dependencySet-withExecutedProject/verify.bsh b/src/it/projects/dependency-sets/dependencySet-withExecutedProject/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/dependencySet-withExecutedProject/verify.bsh
rename to src/it/projects/dependency-sets/dependencySet-withExecutedProject/verify.groovy
diff --git a/src/it/projects/dependency-sets/include-project-artifact/verify.bsh b/src/it/projects/dependency-sets/include-project-artifact/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/include-project-artifact/verify.bsh
rename to src/it/projects/dependency-sets/include-project-artifact/verify.groovy
diff --git a/src/it/projects/dependency-sets/include-project-attachments/verify.bsh b/src/it/projects/dependency-sets/include-project-attachments/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/include-project-attachments/verify.bsh
rename to src/it/projects/dependency-sets/include-project-attachments/verify.groovy
diff --git a/src/it/projects/dependency-sets/include-provided/verify.bsh b/src/it/projects/dependency-sets/include-provided/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/include-provided/verify.bsh
rename to src/it/projects/dependency-sets/include-provided/verify.groovy
diff --git a/src/it/projects/dependency-sets/including-pom-dependency/verify.bsh b/src/it/projects/dependency-sets/including-pom-dependency/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/including-pom-dependency/verify.bsh
rename to src/it/projects/dependency-sets/including-pom-dependency/verify.groovy
diff --git a/src/it/projects/dependency-sets/including-sar-dependency/verify.bsh b/src/it/projects/dependency-sets/including-sar-dependency/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/including-sar-dependency/verify.bsh
rename to src/it/projects/dependency-sets/including-sar-dependency/verify.groovy
diff --git a/src/it/projects/dependency-sets/massembly-201/verify.bsh b/src/it/projects/dependency-sets/massembly-201/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/massembly-201/verify.bsh
rename to src/it/projects/dependency-sets/massembly-201/verify.groovy
diff --git a/src/it/projects/dependency-sets/massembly-232/verify.bsh b/src/it/projects/dependency-sets/massembly-232/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/massembly-232/verify.bsh
rename to src/it/projects/dependency-sets/massembly-232/verify.groovy
diff --git a/src/it/projects/dependency-sets/massembly-235/verify.bsh b/src/it/projects/dependency-sets/massembly-235/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/massembly-235/verify.bsh
rename to src/it/projects/dependency-sets/massembly-235/verify.groovy
diff --git a/src/it/projects/dependency-sets/massembly-345/verify.bsh b/src/it/projects/dependency-sets/massembly-345/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/massembly-345/verify.bsh
rename to src/it/projects/dependency-sets/massembly-345/verify.groovy
diff --git a/src/it/projects/dependency-sets/massembly-395/verify.bsh b/src/it/projects/dependency-sets/massembly-395/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/massembly-395/verify.bsh
rename to src/it/projects/dependency-sets/massembly-395/verify.groovy
diff --git a/src/it/projects/dependency-sets/massembly-619/verify.bsh b/src/it/projects/dependency-sets/massembly-619/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/massembly-619/verify.bsh
rename to src/it/projects/dependency-sets/massembly-619/verify.groovy
diff --git a/src/it/projects/dependency-sets/massembly-675/verify.bsh b/src/it/projects/dependency-sets/massembly-675/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/massembly-675/verify.bsh
rename to src/it/projects/dependency-sets/massembly-675/verify.groovy
diff --git a/src/it/projects/dependency-sets/massembly-955/verify.bsh b/src/it/projects/dependency-sets/massembly-955/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/massembly-955/verify.bsh
rename to src/it/projects/dependency-sets/massembly-955/verify.groovy
diff --git a/src/it/projects/dependency-sets/massembly-99/verify.bsh b/src/it/projects/dependency-sets/massembly-99/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/massembly-99/verify.bsh
rename to src/it/projects/dependency-sets/massembly-99/verify.groovy
diff --git a/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh b/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh
rename to src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.groovy
diff --git a/src/it/projects/dependency-sets/unpack-deps-correct-dir/verify.bsh b/src/it/projects/dependency-sets/unpack-deps-correct-dir/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/unpack-deps-correct-dir/verify.bsh
rename to src/it/projects/dependency-sets/unpack-deps-correct-dir/verify.groovy
diff --git a/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh b/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.groovy
similarity index 100%
rename from src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh
rename to src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.groovy
diff --git a/src/it/projects/descriptor-refs/bin/jars-in-archive-root/verify.bsh b/src/it/projects/descriptor-refs/bin/jars-in-archive-root/verify.groovy
similarity index 100%
rename from src/it/projects/descriptor-refs/bin/jars-in-archive-root/verify.bsh
rename to src/it/projects/descriptor-refs/bin/jars-in-archive-root/verify.groovy
diff --git a/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh b/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.groovy
similarity index 100%
rename from src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh
rename to src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.groovy
diff --git a/src/it/projects/descriptor-refs/project/multimodule-sources-copied/verify.bsh b/src/it/projects/descriptor-refs/project/multimodule-sources-copied/verify.groovy
similarity index 100%
rename from src/it/projects/descriptor-refs/project/multimodule-sources-copied/verify.bsh
rename to src/it/projects/descriptor-refs/project/multimodule-sources-copied/verify.groovy
diff --git a/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh b/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.groovy
similarity index 100%
rename from src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh
rename to src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.groovy
diff --git a/src/it/projects/descriptor-refs/project/no-target-dir/verify.bsh b/src/it/projects/descriptor-refs/project/no-target-dir/verify.groovy
similarity index 100%
rename from src/it/projects/descriptor-refs/project/no-target-dir/verify.bsh
rename to src/it/projects/descriptor-refs/project/no-target-dir/verify.groovy
diff --git a/src/it/projects/descriptor-refs/project/sources-copied/verify.bsh b/src/it/projects/descriptor-refs/project/sources-copied/verify.groovy
similarity index 100%
rename from src/it/projects/descriptor-refs/project/sources-copied/verify.bsh
rename to src/it/projects/descriptor-refs/project/sources-copied/verify.groovy
diff --git a/src/it/projects/descriptor-refs/src/no-target-dir/verify.bsh b/src/it/projects/descriptor-refs/src/no-target-dir/verify.groovy
similarity index 100%
rename from src/it/projects/descriptor-refs/src/no-target-dir/verify.bsh
rename to src/it/projects/descriptor-refs/src/no-target-dir/verify.groovy
diff --git a/src/it/projects/descriptor-refs/src/src-dir-copied/verify.bsh b/src/it/projects/descriptor-refs/src/src-dir-copied/verify.groovy
similarity index 100%
rename from src/it/projects/descriptor-refs/src/src-dir-copied/verify.bsh
rename to src/it/projects/descriptor-refs/src/src-dir-copied/verify.groovy
diff --git a/src/it/projects/file-modes/file-set-fileMode/verify.bsh b/src/it/projects/file-modes/file-set-fileMode/verify.groovy
similarity index 100%
rename from src/it/projects/file-modes/file-set-fileMode/verify.bsh
rename to src/it/projects/file-modes/file-set-fileMode/verify.groovy
diff --git a/src/it/projects/file-modes/fileItem-fileMode/verify.bsh b/src/it/projects/file-modes/fileItem-fileMode/verify.groovy
similarity index 100%
rename from src/it/projects/file-modes/fileItem-fileMode/verify.bsh
rename to src/it/projects/file-modes/fileItem-fileMode/verify.groovy
diff --git a/src/it/projects/file-sets/default-directory-unspecified/verify.bsh b/src/it/projects/file-sets/default-directory-unspecified/verify.groovy
similarity index 100%
rename from src/it/projects/file-sets/default-directory-unspecified/verify.bsh
rename to src/it/projects/file-sets/default-directory-unspecified/verify.groovy
diff --git a/src/it/projects/file-sets/default-excludes-unspecified/verify.bsh b/src/it/projects/file-sets/default-excludes-unspecified/verify.groovy
similarity index 100%
rename from src/it/projects/file-sets/default-excludes-unspecified/verify.bsh
rename to src/it/projects/file-sets/default-excludes-unspecified/verify.groovy
diff --git a/src/it/projects/file-sets/dont-use-default-excludes/setup.bsh b/src/it/projects/file-sets/dont-use-default-excludes/setup.groovy
similarity index 100%
rename from src/it/projects/file-sets/dont-use-default-excludes/setup.bsh
rename to src/it/projects/file-sets/dont-use-default-excludes/setup.groovy
diff --git a/src/it/projects/file-sets/excludes-using-regex/verify.bsh b/src/it/projects/file-sets/excludes-using-regex/verify.groovy
similarity index 100%
rename from src/it/projects/file-sets/excludes-using-regex/verify.bsh
rename to src/it/projects/file-sets/excludes-using-regex/verify.groovy
diff --git a/src/it/projects/file-sets/excluding-svn-dirs/setup.bsh b/src/it/projects/file-sets/excluding-svn-dirs/setup.groovy
similarity index 100%
rename from src/it/projects/file-sets/excluding-svn-dirs/setup.bsh
rename to src/it/projects/file-sets/excluding-svn-dirs/setup.groovy
diff --git a/src/it/projects/file-sets/filtered-module-sources/verify.bsh b/src/it/projects/file-sets/filtered-module-sources/verify.groovy
similarity index 100%
rename from src/it/projects/file-sets/filtered-module-sources/verify.bsh
rename to src/it/projects/file-sets/filtered-module-sources/verify.groovy
diff --git a/src/it/projects/file-sets/filtered-multimodule/verify.bsh b/src/it/projects/file-sets/filtered-multimodule/verify.groovy
similarity index 100%
rename from src/it/projects/file-sets/filtered-multimodule/verify.bsh
rename to src/it/projects/file-sets/filtered-multimodule/verify.groovy
diff --git a/src/it/projects/file-sets/include-base-directory/verify.bsh b/src/it/projects/file-sets/include-base-directory/verify.groovy
similarity index 100%
rename from src/it/projects/file-sets/include-base-directory/verify.bsh
rename to src/it/projects/file-sets/include-base-directory/verify.groovy
diff --git a/src/it/projects/file-sets/include-parent-dir/verify.bsh b/src/it/projects/file-sets/include-parent-dir/verify.groovy
similarity index 100%
rename from src/it/projects/file-sets/include-parent-dir/verify.bsh
rename to src/it/projects/file-sets/include-parent-dir/verify.groovy
diff --git a/src/it/projects/file-sets/massembly-665/verify.bsh b/src/it/projects/file-sets/massembly-665/verify.groovy
similarity index 100%
rename from src/it/projects/file-sets/massembly-665/verify.bsh
rename to src/it/projects/file-sets/massembly-665/verify.groovy
diff --git a/src/it/projects/file-sets/use-default-excludes/verify.bsh b/src/it/projects/file-sets/use-default-excludes/verify.groovy
similarity index 100%
rename from src/it/projects/file-sets/use-default-excludes/verify.bsh
rename to src/it/projects/file-sets/use-default-excludes/verify.groovy
diff --git a/src/it/projects/files/filtered-sysprop/verify.bsh b/src/it/projects/files/filtered-sysprop/verify.groovy
similarity index 100%
rename from src/it/projects/files/filtered-sysprop/verify.bsh
rename to src/it/projects/files/filtered-sysprop/verify.groovy
diff --git a/src/it/projects/files/multimodule-relativePath/verify.bsh b/src/it/projects/files/multimodule-relativePath/verify.groovy
similarity index 100%
rename from src/it/projects/files/multimodule-relativePath/verify.bsh
rename to src/it/projects/files/multimodule-relativePath/verify.groovy
diff --git a/src/it/projects/filtering-feature/filter-comp-descriptor-path/verify.bsh b/src/it/projects/filtering-feature/filter-comp-descriptor-path/verify.groovy
similarity index 100%
rename from src/it/projects/filtering-feature/filter-comp-descriptor-path/verify.bsh
rename to src/it/projects/filtering-feature/filter-comp-descriptor-path/verify.groovy
diff --git a/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh b/src/it/projects/filtering-feature/filters-defined-in-build/verify.groovy
similarity index 97%
rename from src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh
rename to src/it/projects/filtering-feature/filters-defined-in-build/verify.groovy
index d029edff6..3cc5e52f1 100644
--- a/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh
+++ b/src/it/projects/filtering-feature/filters-defined-in-build/verify.groovy
@@ -33,7 +33,7 @@ try
         return false;
     }
     s = r.readLine();
-    if(!s.contains("escapedString=${project.artifactId}"))
+    if(!s.contains('escapedString=${project.artifactId}'))
     {
         System.out.println("file-1.properties did not escape filtering");
         return false;
diff --git a/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh b/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.groovy
similarity index 100%
rename from src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh
rename to src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.groovy
diff --git a/src/it/projects/filtering-feature/massembly-736/verify.bsh b/src/it/projects/filtering-feature/massembly-736/verify.groovy
similarity index 100%
rename from src/it/projects/filtering-feature/massembly-736/verify.bsh
rename to src/it/projects/filtering-feature/massembly-736/verify.groovy
diff --git a/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/verify.bsh b/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/verify.groovy
similarity index 100%
rename from src/it/projects/forking-tests/assembly-assembly-with-module-binaries/verify.bsh
rename to src/it/projects/forking-tests/assembly-assembly-with-module-binaries/verify.groovy
diff --git a/src/it/projects/forking-tests/assembly-attached-with-module-binaries/verify.bsh b/src/it/projects/forking-tests/assembly-attached-with-module-binaries/verify.groovy
similarity index 100%
rename from src/it/projects/forking-tests/assembly-attached-with-module-binaries/verify.bsh
rename to src/it/projects/forking-tests/assembly-attached-with-module-binaries/verify.groovy
diff --git a/src/it/projects/mojo-configuration/archiver-ignorePermissions/verify.bsh b/src/it/projects/mojo-configuration/archiver-ignorePermissions/verify.groovy
similarity index 100%
rename from src/it/projects/mojo-configuration/archiver-ignorePermissions/verify.bsh
rename to src/it/projects/mojo-configuration/archiver-ignorePermissions/verify.groovy
diff --git a/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh b/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.groovy
similarity index 100%
rename from src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh
rename to src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.groovy
diff --git a/src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/verify.bsh b/src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/verify.groovy
similarity index 96%
rename from src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/verify.bsh
rename to src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/verify.groovy
index f36f0d8fc..8d76d6eb2 100644
--- a/src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/verify.bsh
+++ b/src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/verify.groovy
@@ -34,6 +34,4 @@ Attributes attrs = mf.getMainAttributes();
 
 String foo = (String) attrs.get( new Attributes.Name( "foo" ) );
 
-System.out.println( "Got foo: " + mode );
-
 return "beer".equals( foo );
diff --git a/src/it/projects/mojo-configuration/manifest-with-customEntry/verify.bsh b/src/it/projects/mojo-configuration/manifest-with-customEntry/verify.groovy
similarity index 100%
rename from src/it/projects/mojo-configuration/manifest-with-customEntry/verify.bsh
rename to src/it/projects/mojo-configuration/manifest-with-customEntry/verify.groovy
diff --git a/src/it/projects/mojo-configuration/manifest-with-mainClass/verify.bsh b/src/it/projects/mojo-configuration/manifest-with-mainClass/verify.groovy
similarity index 100%
rename from src/it/projects/mojo-configuration/manifest-with-mainClass/verify.bsh
rename to src/it/projects/mojo-configuration/manifest-with-mainClass/verify.groovy
diff --git a/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/verify.bsh b/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/verify.groovy
similarity index 100%
rename from src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/verify.bsh
rename to src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/verify.groovy
diff --git a/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/verify.bsh b/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/verify.groovy
similarity index 100%
rename from src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/verify.bsh
rename to src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/verify.groovy
diff --git a/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh b/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.groovy
similarity index 100%
rename from src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh
rename to src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.groovy
diff --git a/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh b/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.groovy
similarity index 100%
rename from src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh
rename to src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.groovy
diff --git a/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh b/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.groovy
similarity index 100%
rename from src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh
rename to src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.groovy
diff --git a/src/it/projects/multimodule/massembly-298/verify.bsh b/src/it/projects/multimodule/massembly-298/verify.groovy
similarity index 100%
rename from src/it/projects/multimodule/massembly-298/verify.bsh
rename to src/it/projects/multimodule/massembly-298/verify.groovy
diff --git a/src/it/projects/multimodule/massembly-619/verify.bsh b/src/it/projects/multimodule/massembly-619/verify.groovy
similarity index 100%
rename from src/it/projects/multimodule/massembly-619/verify.bsh
rename to src/it/projects/multimodule/massembly-619/verify.groovy
diff --git a/src/it/projects/multimodule/multimodule-binariesNotSource/verify.bsh b/src/it/projects/multimodule/multimodule-binariesNotSource/verify.groovy
similarity index 100%
rename from src/it/projects/multimodule/multimodule-binariesNotSource/verify.bsh
rename to src/it/projects/multimodule/multimodule-binariesNotSource/verify.groovy
diff --git a/src/it/projects/multimodule/multimodule-filteredFileSet/child/verify.bsh b/src/it/projects/multimodule/multimodule-filteredFileSet/child/verify.groovy
similarity index 100%
rename from src/it/projects/multimodule/multimodule-filteredFileSet/child/verify.bsh
rename to src/it/projects/multimodule/multimodule-filteredFileSet/child/verify.groovy
diff --git a/src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh b/src/it/projects/multimodule/multimodule-filteredFileSet/verify.groovy
similarity index 100%
rename from src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh
rename to src/it/projects/multimodule/multimodule-filteredFileSet/verify.groovy
diff --git a/src/it/projects/multimodule/multimodule-modulePomPropInterp/verify.bsh b/src/it/projects/multimodule/multimodule-modulePomPropInterp/verify.groovy
similarity index 100%
rename from src/it/projects/multimodule/multimodule-modulePomPropInterp/verify.bsh
rename to src/it/projects/multimodule/multimodule-modulePomPropInterp/verify.groovy
diff --git a/src/it/projects/multimodule/multimodule-siblingParent/parent/verify.bsh b/src/it/projects/multimodule/multimodule-siblingParent/parent/verify.groovy
similarity index 100%
rename from src/it/projects/multimodule/multimodule-siblingParent/parent/verify.bsh
rename to src/it/projects/multimodule/multimodule-siblingParent/parent/verify.groovy
diff --git a/src/it/projects/multimodule/multimodule-sourceNotBinaries/verify.bsh b/src/it/projects/multimodule/multimodule-sourceNotBinaries/verify.groovy
similarity index 100%
rename from src/it/projects/multimodule/multimodule-sourceNotBinaries/verify.bsh
rename to src/it/projects/multimodule/multimodule-sourceNotBinaries/verify.groovy
diff --git a/src/it/projects/multimodule/multimodule-wholeReactorFromChild/verify.bsh b/src/it/projects/multimodule/multimodule-wholeReactorFromChild/verify.groovy
similarity index 100%
rename from src/it/projects/multimodule/multimodule-wholeReactorFromChild/verify.bsh
rename to src/it/projects/multimodule/multimodule-wholeReactorFromChild/verify.groovy