Skip to content

Commit f32d597

Browse files
authored
Deps: Parent POM 48 and align deps (#979)
There were (most probably) dependabot that made deps fall apart: Maven, Resolver and Sisu should be upped in lockstep.
1 parent df0f2a6 commit f32d597

2 files changed

Lines changed: 15 additions & 19 deletions

File tree

enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/ArtifactMatcher.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,16 @@ public String toString() {
189189
* @throws NullPointerException if any of the arguments is null
190190
*/
191191
public ArtifactMatcher(final Collection<String> excludeStrings, final Collection<String> includeStrings) {
192-
ofNullable(excludeStrings).ifPresent(excludes -> excludes.stream()
193-
.filter(StringUtils::isNotEmpty)
194-
.map(Pattern::new)
195-
.forEach(excludePatterns::add));
196-
ofNullable(includeStrings).ifPresent(includes -> includes.stream()
197-
.filter(StringUtils::isNotEmpty)
198-
.map(Pattern::new)
199-
.forEach(includePatterns::add));
192+
ofNullable(excludeStrings)
193+
.ifPresent(excludes -> excludes.stream()
194+
.filter(StringUtils::isNotEmpty)
195+
.map(Pattern::new)
196+
.forEach(excludePatterns::add));
197+
ofNullable(includeStrings)
198+
.ifPresent(includes -> includes.stream()
199+
.filter(StringUtils::isNotEmpty)
200+
.map(Pattern::new)
201+
.forEach(includePatterns::add));
200202
}
201203

202204
private boolean match(Function<Pattern, Boolean> matcher) {

pom.xml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.maven</groupId>
2525
<artifactId>maven-parent</artifactId>
26-
<version>47</version>
26+
<version>48</version>
2727
<relativePath />
2828
</parent>
2929
<groupId>org.apache.maven.enforcer</groupId>
@@ -83,11 +83,11 @@
8383
<mockito.version>4.11.0</mockito.version>
8484
<project.build.outputTimestamp>2025-09-28T21:22:14Z</project.build.outputTimestamp>
8585
<!-- the same as in Maven -->
86-
<resolver.version>1.9.25</resolver.version>
86+
<resolver.version>1.9.27</resolver.version>
8787

8888
<!-- plugins used in IT, not defined in parent -->
89-
<version.maven-pmd-plugin>3.21.0</version.maven-pmd-plugin>
90-
<version.maven-wrapper-plugin>3.2.0</version.maven-wrapper-plugin>
89+
<version.maven-pmd-plugin>3.28.0</version.maven-pmd-plugin>
90+
<version.maven-wrapper-plugin>3.3.4</version.maven-wrapper-plugin>
9191
</properties>
9292

9393
<dependencyManagement>
@@ -159,16 +159,10 @@
159159
<artifactId>maven-resolver-util</artifactId>
160160
<version>${resolver.version}</version>
161161
</dependency>
162-
<dependency>
163-
<groupId>org.eclipse.sisu</groupId>
164-
<artifactId>org.eclipse.sisu.plexus</artifactId>
165-
<version>0.9.0.M2</version>
166-
<scope>provided</scope>
167-
</dependency>
168162
<dependency>
169163
<groupId>org.codehaus.plexus</groupId>
170164
<artifactId>plexus-classworlds</artifactId>
171-
<version>2.5.2</version>
165+
<version>2.11.0</version>
172166
<scope>provided</scope>
173167
</dependency>
174168
<dependency>

0 commit comments

Comments
 (0)