This is an automated email from the ASF dual-hosted git repository.
Bukama pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 83c4e723 Fix ITs for Maven 4 compat (#1325)
83c4e723 is described below
commit 83c4e723404549380c96a0d5d5aacd67deb66fc6
Author: Matthias Bünger <[email protected]>
AuthorDate: Thu Jul 16 06:56:49 2026 +0200
Fix ITs for Maven 4 compat (#1325)
---
.../dependency-sets/massembly-1008/verify.groovy | 45 ++++++++++++++--------
.../projects/dependency-sets/massembly-969/pom.xml | 2 +-
.../dependency-sets/massembly-969/verify.groovy | 25 ++++++------
.../massembly-291/test.properties | 2 +-
.../massembly-291/{verify.bsh => verify.groovy} | 4 +-
.../massembly-301/test.properties | 2 +-
.../massembly-301/{verify.bsh => verify.groovy} | 3 +-
7 files changed, 46 insertions(+), 37 deletions(-)
diff --git a/src/it/projects/dependency-sets/massembly-1008/verify.groovy
b/src/it/projects/dependency-sets/massembly-1008/verify.groovy
index 55d7b281..9f17c7c3 100644
--- a/src/it/projects/dependency-sets/massembly-1008/verify.groovy
+++ b/src/it/projects/dependency-sets/massembly-1008/verify.groovy
@@ -16,22 +16,37 @@
* specific language governing permissions and limitations
* under the License.
*/
+def expectedFilenames = null
-import java.io.*;
-
-def expectedFilenames = [
- "aopalliance-1.0.jar",
- "checker-qual-3.12.0.jar",
- "error_prone_annotations-2.7.1.jar",
- "failureaccess-1.0.1.jar",
- "guava-31.0.1-jre.jar",
- "guice-6.0.0.jar",
- "j2objc-annotations-1.3.jar",
- "jakarta.inject-api-2.0.1.jar",
- "javax.inject-1.jar",
- "jsr305-3.0.2.jar",
- "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
-]
+if (mavenVersion.startsWith('4.')) {
+ expectedFilenames = [
+ "aopalliance-1.0.jar",
+ "checker-qual-3.12.0.jar",
+ "error_prone_annotations-2.18.0.jar", // comes from guava 32.0.0-jre
dependency runtime-dependency (not the test one)
+ "failureaccess-1.0.1.jar",
+ "guava-31.0.1-jre.jar",
+ "guice-6.0.0.jar",
+ "j2objc-annotations-1.3.jar",
+ "jakarta.inject-api-2.0.1.jar",
+ "javax.inject-1.jar",
+ "jsr305-3.0.1.jar", // funny that this is lower than in Maven 3
+ "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
+ ]
+} else {
+ expectedFilenames = [
+ "aopalliance-1.0.jar",
+ "checker-qual-3.12.0.jar",
+ "error_prone_annotations-2.7.1.jar",
+ "failureaccess-1.0.1.jar",
+ "guava-31.0.1-jre.jar",
+ "guice-6.0.0.jar",
+ "j2objc-annotations-1.3.jar",
+ "jakarta.inject-api-2.0.1.jar",
+ "javax.inject-1.jar",
+ "jsr305-3.0.2.jar",
+ "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
+ ]
+}
File assemblyBasedir = new File( basedir, "target/massembly-1008-1-bin/" )
diff --git a/src/it/projects/dependency-sets/massembly-969/pom.xml
b/src/it/projects/dependency-sets/massembly-969/pom.xml
index 25cf68d0..3ab5acec 100644
--- a/src/it/projects/dependency-sets/massembly-969/pom.xml
+++ b/src/it/projects/dependency-sets/massembly-969/pom.xml
@@ -30,7 +30,7 @@ under the License.
<version>1</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <javafx.version>20</javafx.version>
+ <javafx.version>26</javafx.version>
</properties>
<dependencies>
<dependency>
diff --git a/src/it/projects/dependency-sets/massembly-969/verify.groovy
b/src/it/projects/dependency-sets/massembly-969/verify.groovy
index 9048df3e..7c88dc55 100644
--- a/src/it/projects/dependency-sets/massembly-969/verify.groovy
+++ b/src/it/projects/dependency-sets/massembly-969/verify.groovy
@@ -16,20 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-import java.io.*;
-
-def expectedFilenames = [ "javafx-base-20.jar",
- "javafx-controls-20-linux.jar",
- "javafx-media-20-linux.jar",
- "javafx-web-20.jar",
- "javafx-base-20-linux.jar",
- "javafx-graphics-20-linux.jar",
- "javafx-swing-20.jar",
- "javafx-web-20-linux.jar",
- "javafx-controls-20.jar",
- "javafx-media-20.jar",
- "javafx-swing-20-linux.jar"
+def expectedFilenames = [ "javafx-base-26.jar",
+ "javafx-controls-26-linux.jar",
+ "javafx-media-26-linux.jar",
+ "javafx-web-26.jar",
+ "javafx-base-26-linux.jar",
+ "javafx-graphics-26-linux.jar",
+ "javafx-swing-26.jar",
+ "javafx-web-26-linux.jar",
+ "javafx-controls-26.jar",
+ "javafx-media-26.jar",
+ "javafx-swing-26-linux.jar"
]
File assemblyBasedir = new File( basedir, "target/massembly-969-1-bin/" )
diff --git a/src/it/projects/mojo-configuration/massembly-291/test.properties
b/src/it/projects/mojo-configuration/massembly-291/test.properties
index 586ead7e..2cb4bcd5 100644
--- a/src/it/projects/mojo-configuration/massembly-291/test.properties
+++ b/src/it/projects/mojo-configuration/massembly-291/test.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-altDeploymentRepository=test::default::file://${project.build.directory}/deploy
+altDeploymentRepository=test::default::file:./deploy
diff --git a/src/it/projects/mojo-configuration/massembly-291/verify.bsh
b/src/it/projects/mojo-configuration/massembly-291/verify.groovy
similarity index 94%
rename from src/it/projects/mojo-configuration/massembly-291/verify.bsh
rename to src/it/projects/mojo-configuration/massembly-291/verify.groovy
index c487625b..f546db04 100644
--- a/src/it/projects/mojo-configuration/massembly-291/verify.bsh
+++ b/src/it/projects/mojo-configuration/massembly-291/verify.groovy
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
+String base = "./deploy/org/test/massembly-291/1/massembly-291-1";
-import java.io.*;
-
-String base = "target/deploy/org/test/massembly-291/1/massembly-291-1";
File pom = new File( basedir, base + ".pom" );
File zip = new File( basedir, base + ".zip" );
File tgz = new File( basedir, base + ".tar.gz" );
diff --git a/src/it/projects/mojo-configuration/massembly-301/test.properties
b/src/it/projects/mojo-configuration/massembly-301/test.properties
index 586ead7e..2cb4bcd5 100644
--- a/src/it/projects/mojo-configuration/massembly-301/test.properties
+++ b/src/it/projects/mojo-configuration/massembly-301/test.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-altDeploymentRepository=test::default::file://${project.build.directory}/deploy
+altDeploymentRepository=test::default::file:./deploy
diff --git a/src/it/projects/mojo-configuration/massembly-301/verify.bsh
b/src/it/projects/mojo-configuration/massembly-301/verify.groovy
similarity index 94%
rename from src/it/projects/mojo-configuration/massembly-301/verify.bsh
rename to src/it/projects/mojo-configuration/massembly-301/verify.groovy
index 0f2c8dff..450f2a77 100644
--- a/src/it/projects/mojo-configuration/massembly-301/verify.bsh
+++ b/src/it/projects/mojo-configuration/massembly-301/verify.groovy
@@ -17,9 +17,8 @@
* under the License.
*/
-import java.io.*;
+String base = "./deploy/org/test/massembly-301/1/massembly-301-1";
-String base = "target/deploy/org/test/massembly-301/1/massembly-301-1";
File jar = new File( basedir, base + ".jar" );
File zip = new File( basedir, base + ".zip" );
File tgz = new File( basedir, base + ".tar.gz" );
