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-assembly-plugin.git
commit c9ddf678a2fdb53632d9395c2581bc0228102a93 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Thu Nov 5 01:03:26 2026 +0000 Match the multiple-wildcard dependencies without versions and note the aggregator gap --- .../custom-handler-withFileEntries/verify.groovy | 2 ++ .../mid-artifactId-wildcard-massembly570/verify.groovy | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.groovy b/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.groovy index 8a0238ab..4e4df655 100644 --- a/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.groovy +++ b/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.groovy @@ -17,6 +17,8 @@ * under the License. */ +// The aggregated content of file.txt is not asserted: the aggregate is written before the fileSet entries are +// added, see https://github.com/apache/maven-assembly-plugin/issues/1024 // "bin" lists both files as <file> entries, "bin-mixed" lists one as <file> and the other as <fileSet> for ( String assemblyId : [ "bin", "bin-mixed" ] ) { diff --git a/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/verify.groovy b/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/verify.groovy index 5b2ff3e9..4075c14d 100644 --- a/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/verify.groovy +++ b/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/verify.groovy @@ -25,9 +25,10 @@ assert cleanPluginJar.exists() : 'Missing maven-clean-plugin (should be included def jarPluginJar = new File( dir, "maven-jar-plugin-3.0.0.jar") assert jarPluginJar.exists() : 'Missing maven-jar-plugin (should be included via wildcard pattern).' -// MASSEMBLY-241: several wildcard includes in one dependencySet (second descriptor, assembly id "multiple") +// MASSEMBLY-241: several wildcard includes in one dependencySet (second descriptor, assembly id "multiple"), +// matched without the dependency versions File multipleDir = new File( basedir, "target/mid-artifactId-wildcard-massembly570-1-multiple/maven-libs" ) -def wagonProviderJar = new File( multipleDir, 'wagon-provider-api-1.0-beta-4.jar' ) -assert wagonProviderJar.exists() : 'Wagon provider jar is missing (should be included via include wildcard pattern).' -def reportingImplJar = new File( multipleDir, 'maven-reporting-impl-3.0.0.jar' ) -assert reportingImplJar.exists() : 'Reporting implementation jar is missing (should be included via include wildcard pattern).' +assert multipleDir.isDirectory() : "Missing assembly directory " + multipleDir +def names = multipleDir.list().collect { it.replaceAll( /-\d[\w.\-]*\.jar$/, ".jar" ) } +assert names.contains( "wagon-provider-api.jar" ) : "Wagon provider jar is missing (should be included via include wildcard pattern): " + names +assert names.contains( "maven-reporting-impl.jar" ) : "Reporting implementation jar is missing (should be included via include wildcard pattern): " + names
