This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch parent-48-and-align in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit 1b2a2a35ece2038ceaff34f8e4ea977ffe9a2b47 Author: Tamas Cservenak <[email protected]> AuthorDate: Thu May 14 11:13:49 2026 +0200 Deps: Parent POM 48 and align deps There were (most probably) dependabot that made deps fall apart: Maven, Resolver and Sisu should be upped in lockstep. --- .../maven/enforcer/rules/utils/ArtifactMatcher.java | 18 ++++++++++-------- pom.xml | 12 ++++++------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/ArtifactMatcher.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/ArtifactMatcher.java index fd4e204d..99b62ec1 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/ArtifactMatcher.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/ArtifactMatcher.java @@ -189,14 +189,16 @@ public final class ArtifactMatcher { * @throws NullPointerException if any of the arguments is null */ public ArtifactMatcher(final Collection<String> excludeStrings, final Collection<String> includeStrings) { - ofNullable(excludeStrings).ifPresent(excludes -> excludes.stream() - .filter(StringUtils::isNotEmpty) - .map(Pattern::new) - .forEach(excludePatterns::add)); - ofNullable(includeStrings).ifPresent(includes -> includes.stream() - .filter(StringUtils::isNotEmpty) - .map(Pattern::new) - .forEach(includePatterns::add)); + ofNullable(excludeStrings) + .ifPresent(excludes -> excludes.stream() + .filter(StringUtils::isNotEmpty) + .map(Pattern::new) + .forEach(excludePatterns::add)); + ofNullable(includeStrings) + .ifPresent(includes -> includes.stream() + .filter(StringUtils::isNotEmpty) + .map(Pattern::new) + .forEach(includePatterns::add)); } private boolean match(Function<Pattern, Boolean> matcher) { diff --git a/pom.xml b/pom.xml index 84cdc7ea..72626b64 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>47</version> + <version>48</version> <relativePath /> </parent> <groupId>org.apache.maven.enforcer</groupId> @@ -83,11 +83,11 @@ <mockito.version>4.11.0</mockito.version> <project.build.outputTimestamp>2025-09-28T21:22:14Z</project.build.outputTimestamp> <!-- the same as in Maven --> - <resolver.version>1.9.25</resolver.version> + <resolver.version>1.9.27</resolver.version> <!-- plugins used in IT, not defined in parent --> - <version.maven-pmd-plugin>3.21.0</version.maven-pmd-plugin> - <version.maven-wrapper-plugin>3.2.0</version.maven-wrapper-plugin> + <version.maven-pmd-plugin>3.28.0</version.maven-pmd-plugin> + <version.maven-wrapper-plugin>3.3.4</version.maven-wrapper-plugin> </properties> <dependencyManagement> @@ -162,13 +162,13 @@ <dependency> <groupId>org.eclipse.sisu</groupId> <artifactId>org.eclipse.sisu.plexus</artifactId> - <version>0.9.0.M2</version> + <version>1.0.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-classworlds</artifactId> - <version>2.5.2</version> + <version>2.11.0</version> <scope>provided</scope> </dependency> <dependency>
