Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven for openSUSE:Factory checked in at 2026-05-21 18:27:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven (Old) and /work/SRC/openSUSE:Factory/.maven.new.2084 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven" Thu May 21 18:27:23 2026 rev:38 rq:1354259 version:3.9.16 Changes: -------- --- /work/SRC/openSUSE:Factory/maven/maven.changes 2026-05-12 19:27:17.128621892 +0200 +++ /work/SRC/openSUSE:Factory/.maven.new.2084/maven.changes 2026-05-21 18:29:04.230828406 +0200 @@ -1,0 +2,16 @@ +Mon May 18 09:39:09 UTC 2026 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 3.9.16 + * Bug Fixes + + Trim threadConfiguration to accept input surrounded with + spaces + + Backport: Maven 3.10.x fixed plugin resolution + * Dependency updates + + Bump org.codehaus.plexus:plexus-classworlds from 2.9.0 to + 2.11.0 + + [3.9.x] Bump to parent POM 48 + + Bump commons-io:commons-io from 2.21.0 to 2.22.0 + + Bump com.google.guava:guava from 33.5.0-jre to 33.6.0-jre + + Bump actions/cache from 5.0.4 to 5.0.5 + +------------------------------------------------------------------- Old: ---- apache-maven-3.9.15-src.tar.gz New: ---- apache-maven-3.9.16-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven.spec ++++++ --- /var/tmp/diff_new_pack.FOFmil/_old 2026-05-21 18:29:05.102864230 +0200 +++ /var/tmp/diff_new_pack.FOFmil/_new 2026-05-21 18:29:05.102864230 +0200 @@ -20,7 +20,7 @@ %global homedir %{_datadir}/%{name}%{?maven_version_suffix} %global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix} Name: maven -Version: 3.9.15 +Version: 3.9.16 Release: 0 Summary: Java project management and project comprehension tool # maven itself is ASL 2.0 ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.FOFmil/_old 2026-05-21 18:29:05.166866860 +0200 +++ /var/tmp/diff_new_pack.FOFmil/_new 2026-05-21 18:29:05.170867025 +0200 @@ -1,6 +1,6 @@ -mtime: 1778506159 -commit: b6924cfedaf07a3e1a2b2d512eb0ac8e4ddbcc21297a500b28589d82131bc5ed +mtime: 1779097350 +commit: 225f742bcea19c3bc2b41985977e74ef5a9d91912f68bfe6e34d60ca3461854c url: https://src.opensuse.org/java-packages/maven -revision: b6924cfedaf07a3e1a2b2d512eb0ac8e4ddbcc21297a500b28589d82131bc5ed +revision: 225f742bcea19c3bc2b41985977e74ef5a9d91912f68bfe6e34d60ca3461854c projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ apache-maven-3.9.15-src.tar.gz -> apache-maven-3.9.16-src.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/.github/workflows/maven.yml new/apache-maven-3.9.16/.github/workflows/maven.yml --- old/apache-maven-3.9.15/.github/workflows/maven.yml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/.github/workflows/maven.yml 2026-05-13 23:36:05.000000000 +0200 @@ -117,7 +117,7 @@ - name: Set up cache for ~/.m2/repository - uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4 + uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 with: path: ~/.m2/repository key: it-m2-repo-${{ matrix.os }}-${{ hashFiles('maven-integration-testing/**/pom.xml') }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/DEPENDENCIES new/apache-maven-3.9.16/DEPENDENCIES --- old/apache-maven-3.9.15/DEPENDENCIES 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/DEPENDENCIES 2026-05-13 23:36:05.000000000 +0200 @@ -14,10 +14,10 @@ - Gson (https://github.com/google/gson) com.google.code.gson:gson:jar:2.13.2 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Guava InternalFutureFailureAccess and InternalFutures (https://github.com/google/guava/) com.google.guava:failureaccess:jar:1.0.3 + - Guava InternalFutureFailureAccess and InternalFutures (https://github.com/google/guava/failureaccess) com.google.guava:failureaccess:jar:1.0.3 License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - Guava: Google Core Libraries for Java (https://github.com/google/guava) com.google.guava:guava:bundle:33.5.0-jre + - Guava: Google Core Libraries for Java (https://github.com/google/guava) com.google.guava:guava:bundle:33.6.0-jre License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - javax.inject (http://code.google.com/p/atinject/) javax.inject:javax.inject:jar:1 @@ -32,7 +32,7 @@ - Plexus Cipher: encryption/decryption Component (https://codehaus-plexus.github.io/plexus-cipher/) org.codehaus.plexus:plexus-cipher:jar:2.0 License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - Plexus Classworlds (https://codehaus-plexus.github.io/plexus-classworlds/) org.codehaus.plexus:plexus-classworlds:bundle:2.9.0 + - Plexus Classworlds (https://codehaus-plexus.github.io/plexus-classworlds/) org.codehaus.plexus:plexus-classworlds:bundle:2.11.0 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - Plexus :: Component Annotations (deprecated) (https://codehaus-plexus.github.io/plexus-containers/plexus-component-annotations/) org.codehaus.plexus:plexus-component-annotations:jar:2.2.0 @@ -68,7 +68,7 @@ From: 'Google, Inc.' (http://www.google.com) - - Google Guice - Core Library (https://github.com/google/guice/) com.google.inject:guice:jar:5.1.0 + - Google Guice - Core Library (https://github.com/google/guice/guice) com.google.inject:guice:jar:5.1.0 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -104,43 +104,43 @@ - Apache Commons Codec (https://commons.apache.org/proper/commons-codec/) commons-codec:commons-codec:jar:1.21.0 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Maven Artifact (https://maven.apache.org/ref/3.9.15/maven-artifact/) org.apache.maven:maven-artifact:jar:3.9.15 + - Maven Artifact (https://maven.apache.org/ref/3.9.16/maven-artifact/) org.apache.maven:maven-artifact:jar:3.9.16 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Maven Builder Support (https://maven.apache.org/ref/3.9.15/maven-builder-support/) org.apache.maven:maven-builder-support:jar:3.9.15 + - Maven Builder Support (https://maven.apache.org/ref/3.9.16/maven-builder-support/) org.apache.maven:maven-builder-support:jar:3.9.16 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Maven Compat (https://maven.apache.org/ref/3.9.15/maven-compat/) org.apache.maven:maven-compat:jar:3.9.15 + - Maven Compat (https://maven.apache.org/ref/3.9.16/maven-compat/) org.apache.maven:maven-compat:jar:3.9.16 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Maven Core (https://maven.apache.org/ref/3.9.15/maven-core/) org.apache.maven:maven-core:jar:3.9.15 + - Maven Core (https://maven.apache.org/ref/3.9.16/maven-core/) org.apache.maven:maven-core:jar:3.9.16 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Maven Embedder (https://maven.apache.org/ref/3.9.15/maven-embedder/) org.apache.maven:maven-embedder:jar:3.9.15 + - Maven Embedder (https://maven.apache.org/ref/3.9.16/maven-embedder/) org.apache.maven:maven-embedder:jar:3.9.16 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Maven Model (https://maven.apache.org/ref/3.9.15/maven-model/) org.apache.maven:maven-model:jar:3.9.15 + - Maven Model (https://maven.apache.org/ref/3.9.16/maven-model/) org.apache.maven:maven-model:jar:3.9.16 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Maven Model Builder (https://maven.apache.org/ref/3.9.15/maven-model-builder/) org.apache.maven:maven-model-builder:jar:3.9.15 + - Maven Model Builder (https://maven.apache.org/ref/3.9.16/maven-model-builder/) org.apache.maven:maven-model-builder:jar:3.9.16 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Maven Plugin API (https://maven.apache.org/ref/3.9.15/maven-plugin-api/) org.apache.maven:maven-plugin-api:jar:3.9.15 + - Maven Plugin API (https://maven.apache.org/ref/3.9.16/maven-plugin-api/) org.apache.maven:maven-plugin-api:jar:3.9.16 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Maven Repository Metadata Model (https://maven.apache.org/ref/3.9.15/maven-repository-metadata/) org.apache.maven:maven-repository-metadata:jar:3.9.15 + - Maven Repository Metadata Model (https://maven.apache.org/ref/3.9.16/maven-repository-metadata/) org.apache.maven:maven-repository-metadata:jar:3.9.16 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Maven Artifact Resolver Provider (https://maven.apache.org/ref/3.9.15/maven-resolver-provider/) org.apache.maven:maven-resolver-provider:jar:3.9.15 + - Maven Artifact Resolver Provider (https://maven.apache.org/ref/3.9.16/maven-resolver-provider/) org.apache.maven:maven-resolver-provider:jar:3.9.16 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Maven Settings (https://maven.apache.org/ref/3.9.15/maven-settings/) org.apache.maven:maven-settings:jar:3.9.15 + - Maven Settings (https://maven.apache.org/ref/3.9.16/maven-settings/) org.apache.maven:maven-settings:jar:3.9.16 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Maven Settings Builder (https://maven.apache.org/ref/3.9.15/maven-settings-builder/) org.apache.maven:maven-settings-builder:jar:3.9.15 + - Maven Settings Builder (https://maven.apache.org/ref/3.9.16/maven-settings-builder/) org.apache.maven:maven-settings-builder:jar:3.9.16 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Maven SLF4J Simple Provider (https://maven.apache.org/ref/3.9.15/maven-slf4j-provider/) org.apache.maven:maven-slf4j-provider:jar:3.9.15 + - Maven SLF4J Simple Provider (https://maven.apache.org/ref/3.9.16/maven-slf4j-provider/) org.apache.maven:maven-slf4j-provider:jar:3.9.16 License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - Maven Artifact Resolver API (https://maven.apache.org/resolver/maven-resolver-api/) org.apache.maven.resolver:maven-resolver-api:jar:1.9.27 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/apache-maven/pom.xml new/apache-maven-3.9.16/apache-maven/pom.xml --- old/apache-maven-3.9.15/apache-maven/pom.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/apache-maven/pom.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.9.15</version> + <version>3.9.16</version> </parent> <artifactId>apache-maven</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-artifact/pom.xml new/apache-maven-3.9.16/maven-artifact/pom.xml --- old/apache-maven-3.9.15/maven-artifact/pom.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-artifact/pom.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.9.15</version> + <version>3.9.16</version> </parent> <artifactId>maven-artifact</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-builder-support/pom.xml new/apache-maven-3.9.16/maven-builder-support/pom.xml --- old/apache-maven-3.9.15/maven-builder-support/pom.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-builder-support/pom.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.9.15</version> + <version>3.9.16</version> </parent> <artifactId>maven-builder-support</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-compat/pom.xml new/apache-maven-3.9.16/maven-compat/pom.xml --- old/apache-maven-3.9.15/maven-compat/pom.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-compat/pom.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.9.15</version> + <version>3.9.16</version> </parent> <artifactId>maven-compat</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-core/pom.xml new/apache-maven-3.9.16/maven-core/pom.xml --- old/apache-maven-3.9.15/maven-core/pom.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-core/pom.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.9.15</version> + <version>3.9.16</version> </parent> <artifactId>maven-core</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java new/apache-maven-3.9.16/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java --- old/apache-maven-3.9.15/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java 2026-05-13 23:36:05.000000000 +0200 @@ -20,8 +20,10 @@ import java.io.IOException; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -102,16 +104,20 @@ LinkedHashMap::new, Collectors.mapping(Plugin::getArtifactId, Collectors.toSet()))); request.getPluginGroups().forEach(g -> candidates.put(g, null)); - PluginPrefixResult result = resolveFromRepository(request, candidates); - - // If we haven't been able to resolve the plugin from the repository, - // as a last resort, we go through all declared plugins, load them + PluginPrefixResult result = null; + // First, we go through all declared plugins, load them // one by one, and try to find a matching prefix. - if (result == null && build != null) { - result = resolveFromProject(request, build.getPlugins()); - if (result == null && management != null) { - result = resolveFromProject(request, management.getPlugins()); - } + if (build != null) { + result = resolveFromProject( + request, + build.getPlugins(), + management != null ? management.getPlugins() : Collections.emptyList()); + } + + // Second, we go use G level metadata to discover prefix + // This order allows user managed clashing prefixes (they can declare them in POM) + if (result == null) { + result = resolveFromRepository(request, candidates); } if (result == null) { @@ -129,7 +135,30 @@ return result; } - private PluginPrefixResult resolveFromProject(PluginPrefixRequest request, List<Plugin> plugins) { + private PluginPrefixResult resolveFromProject( + PluginPrefixRequest request, List<Plugin> plugins, List<Plugin> pluginMgmt) { + if (plugins.isEmpty() && pluginMgmt.isEmpty()) { + return null; + } + PluginPrefixResult result = null; + // try optimistically; first if A contains prefix? + Set<Plugin> candidates = new LinkedHashSet<>(); + Stream.concat(plugins.stream(), pluginMgmt.stream()) + .filter(p -> p.getArtifactId().contains(request.getPrefix())) + .forEach(candidates::add); + if (!candidates.isEmpty()) { + result = doResolveFromProject(request, candidates); + } + // if no luck; try the rest + if (result == null) { + Set<Plugin> remainder = new LinkedHashSet<>(plugins); + remainder.removeAll(candidates); + result = doResolveFromProject(request, remainder); + } + return result; + } + + private PluginPrefixResult doResolveFromProject(PluginPrefixRequest request, Collection<Plugin> plugins) { for (Plugin plugin : plugins) { try { PluginDescriptor pluginDescriptor = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-embedder/pom.xml new/apache-maven-3.9.16/maven-embedder/pom.xml --- old/apache-maven-3.9.15/maven-embedder/pom.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-embedder/pom.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.9.15</version> + <version>3.9.16</version> </parent> <artifactId>maven-embedder</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java new/apache-maven-3.9.16/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java --- old/apache-maven-3.9.15/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java 2026-05-13 23:36:05.000000000 +0200 @@ -1453,7 +1453,8 @@ return request; } - int calculateDegreeOfConcurrency(String threadConfiguration) { + int calculateDegreeOfConcurrency(String originalThreadConfiguration) { + String threadConfiguration = originalThreadConfiguration.trim(); if (threadConfiguration.endsWith("C")) { threadConfiguration = threadConfiguration.substring(0, threadConfiguration.length() - 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java new/apache-maven-3.9.16/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java --- old/apache-maven-3.9.15/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java 2026-05-13 23:36:05.000000000 +0200 @@ -82,10 +82,18 @@ assertThrows(IllegalArgumentException.class, () -> cli.calculateDegreeOfConcurrency("2C2")); assertThrows(IllegalArgumentException.class, () -> cli.calculateDegreeOfConcurrency("CXXX")); assertThrows(IllegalArgumentException.class, () -> cli.calculateDegreeOfConcurrency("XXXC")); + assertThrows(IllegalArgumentException.class, () -> cli.calculateDegreeOfConcurrency("1c")); + assertThrows(IllegalArgumentException.class, () -> cli.calculateDegreeOfConcurrency(" 1c")); + assertThrows(IllegalArgumentException.class, () -> cli.calculateDegreeOfConcurrency("1c ")); + assertThrows(IllegalArgumentException.class, () -> cli.calculateDegreeOfConcurrency(" 1c ")); int cpus = Runtime.getRuntime().availableProcessors(); assertEquals((int) (cpus * 2.2), cli.calculateDegreeOfConcurrency("2.2C")); assertEquals(1, cli.calculateDegreeOfConcurrency("0.0001C")); + assertEquals(1 * cpus, cli.calculateDegreeOfConcurrency(" 1C")); + assertEquals(1 * cpus, cli.calculateDegreeOfConcurrency(" 1C ")); + assertEquals(1, cli.calculateDegreeOfConcurrency(" 1")); + assertEquals(1, cli.calculateDegreeOfConcurrency(" 1 ")); assertThrows(IllegalArgumentException.class, () -> cli.calculateDegreeOfConcurrency("-2.2C")); assertThrows(IllegalArgumentException.class, () -> cli.calculateDegreeOfConcurrency("0C")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-model/pom.xml new/apache-maven-3.9.16/maven-model/pom.xml --- old/apache-maven-3.9.15/maven-model/pom.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-model/pom.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.9.15</version> + <version>3.9.16</version> </parent> <artifactId>maven-model</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-model-builder/pom.xml new/apache-maven-3.9.16/maven-model-builder/pom.xml --- old/apache-maven-3.9.15/maven-model-builder/pom.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-model-builder/pom.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.9.15</version> + <version>3.9.16</version> </parent> <artifactId>maven-model-builder</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java new/apache-maven-3.9.16/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java --- old/apache-maven-3.9.15/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java 2026-05-13 23:36:05.000000000 +0200 @@ -485,8 +485,9 @@ nt.performFor(pa.getName(), "name", pa::setName); nt.performFor(pa.getValue(), "value", pa::setValue); }); - a.map(Activation::getJdk).ifPresent(ja -> new Interpolation(activation, interpolator::interpolate) - .performFor(ja, "jdk", activation::setJdk)); + a.map(Activation::getJdk) + .ifPresent(ja -> new Interpolation(activation, interpolator::interpolate) + .performFor(ja, "jdk", activation::setJdk)); } return interpolatedActivations; } @@ -794,9 +795,10 @@ // restore profiles with any activation to their value before full interpolation List<Profile> interpolatedProfiles = model.getProfiles(); - IntStream.range(0, interpolatedProfiles.size()).forEach(i -> interpolatedProfiles - .get(i) - .setActivation(originalProfiles.get(i).getActivation())); + IntStream.range(0, interpolatedProfiles.size()) + .forEach(i -> interpolatedProfiles + .get(i) + .setActivation(originalProfiles.get(i).getActivation())); return interpolatedModel; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-plugin-api/pom.xml new/apache-maven-3.9.16/maven-plugin-api/pom.xml --- old/apache-maven-3.9.15/maven-plugin-api/pom.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-plugin-api/pom.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.9.15</version> + <version>3.9.16</version> </parent> <artifactId>maven-plugin-api</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-repository-metadata/pom.xml new/apache-maven-3.9.16/maven-repository-metadata/pom.xml --- old/apache-maven-3.9.15/maven-repository-metadata/pom.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-repository-metadata/pom.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.9.15</version> + <version>3.9.16</version> </parent> <artifactId>maven-repository-metadata</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-resolver-provider/pom.xml new/apache-maven-3.9.16/maven-resolver-provider/pom.xml --- old/apache-maven-3.9.15/maven-resolver-provider/pom.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-resolver-provider/pom.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.9.15</version> + <version>3.9.16</version> </parent> <artifactId>maven-resolver-provider</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-settings/pom.xml new/apache-maven-3.9.16/maven-settings/pom.xml --- old/apache-maven-3.9.15/maven-settings/pom.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-settings/pom.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.9.15</version> + <version>3.9.16</version> </parent> <artifactId>maven-settings</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-settings-builder/pom.xml new/apache-maven-3.9.16/maven-settings-builder/pom.xml --- old/apache-maven-3.9.15/maven-settings-builder/pom.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-settings-builder/pom.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.9.15</version> + <version>3.9.16</version> </parent> <artifactId>maven-settings-builder</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/maven-slf4j-provider/pom.xml new/apache-maven-3.9.16/maven-slf4j-provider/pom.xml --- old/apache-maven-3.9.15/maven-slf4j-provider/pom.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/maven-slf4j-provider/pom.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.9.15</version> + <version>3.9.16</version> </parent> <artifactId>maven-slf4j-provider</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/pom.xml new/apache-maven-3.9.16/pom.xml --- old/apache-maven-3.9.15/pom.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/pom.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,12 +23,12 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>47</version> + <version>48</version> <relativePath /> </parent> <artifactId>maven</artifactId> - <version>3.9.15</version> + <version>3.9.16</version> <packaging>pom</packaging> <name>Apache Maven</name> @@ -104,7 +104,7 @@ <scm> <connection>scm:git:https://gitbox.apache.org/repos/asf/maven.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven.git</developerConnection> - <tag>maven-3.9.15</tag> + <tag>maven-3.9.16</tag> <url>https://github.com/apache/maven/tree/${project.scm.tag}</url> </scm> <issueManagement> @@ -127,9 +127,9 @@ <javaVersion>8</javaVersion> <version.sisu-maven-plugin>1.0.0</version.sisu-maven-plugin> <asmVersion>9.9.1</asmVersion> - <classWorldsVersion>2.9.0</classWorldsVersion> + <classWorldsVersion>2.11.0</classWorldsVersion> <commonsCliVersion>1.11.0</commonsCliVersion> - <commonsIoVersion>2.21.0</commonsIoVersion> + <commonsIoVersion>2.22.0</commonsIoVersion> <hamcrestVersion>3.0</hamcrestVersion> <mockitoVersion>4.11.0</mockitoVersion> <plexusVersion>2.2.0</plexusVersion> @@ -137,7 +137,7 @@ <!-- Blocked by 3.4.0+ changes, see MNG-7710, downgrade from parent 4.0.1 --> <version.plexus-utils>3.6.1</version.plexus-utils> <guiceVersion>5.1.0</guiceVersion> - <guavaVersion>33.5.0-jre</guavaVersion> + <guavaVersion>33.6.0-jre</guavaVersion> <guavafailureaccessVersion>1.0.3</guavafailureaccessVersion> <wagonVersion>3.5.3</wagonVersion> <securityDispatcherVersion>2.0</securityDispatcherVersion> @@ -155,7 +155,7 @@ <maven.site.path>ref/3-LATEST</maven.site.path> <checkstyle.violation.ignore>None</checkstyle.violation.ignore> <checkstyle.excludes>**/package-info.java</checkstyle.excludes> - <project.build.outputTimestamp>2026-04-13T21:03:32Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2026-05-13T21:36:05Z</project.build.outputTimestamp> </properties> <!--bootstrap-start-comment--> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-maven-3.9.15/src/site/site.xml new/apache-maven-3.9.16/src/site/site.xml --- old/apache-maven-3.9.15/src/site/site.xml 2026-04-13 23:03:32.000000000 +0200 +++ new/apache-maven-3.9.16/src/site/site.xml 2026-05-13 23:36:05.000000000 +0200 @@ -23,16 +23,6 @@ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd" name="Apache Maven"> - <bannerLeft href="https://www.apache.org/"> - <image src="https://maven.apache.org/images/apache-maven-project-light-theme.svg" width="489px" height="51px"/> - </bannerLeft> - - <bannerRight href="https://maven.apache.org/"> - <image src="https://maven.apache.org/images/logos/MavenLogoLeafSmall.png"/> - </bannerRight> - - <edit>${project.scm.url}</edit> - <body> <breadcrumbs> <item name="Ref" href="../" /> @@ -70,4 +60,4 @@ <menu inherit="bottom" ref="modules"/> <menu inherit="bottom" ref="reports"/> </body> -</site> \ No newline at end of file +</site> ++++++ apache-maven-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2026-04-20 06:58:51.208817612 +0200 +++ new/common.xml 2026-05-15 08:59:55.952210161 +0200 @@ -3,7 +3,7 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="3.9.15"/> + <property name="project.version" value="3.9.16"/> <property name="project.groupId" value="org.apache.maven"/> <property name="project.organization.name" value="The Apache Software Foundation"/> ++++++ build.specials.obscpio ++++++ ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-05-18 11:42:30.000000000 +0200 @@ -0,0 +1 @@ +.osc
