This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 551491afd Deps: Update parent POM 48 (#1866)
551491afd is described below
commit 551491afdc9983e1c3cc30fa886ce5dc71e12fd3
Author: Tamas Cservenak <[email protected]>
AuthorDate: Mon May 11 19:46:46 2026 +0200
Deps: Update parent POM 48 (#1866)
Apply reformatting, also minor updates for
* Jetty
* JUnit
---
.../GetDependencyHierarchyWithConflictsStrategies.java | 7 ++++---
.../impl/filter/DefaultRemoteRepositoryFilterManager.java | 12 ++++++------
.../impl/filter/GroupIdRemoteRepositoryFilterSource.java | 10 +++++++---
.../eclipse/aether/util/concurrency/SmartExecutorUtils.java | 4 ++--
pom.xml | 6 +++---
src/site/site.xml | 1 -
6 files changed, 22 insertions(+), 18 deletions(-)
diff --git
a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDependencyHierarchyWithConflictsStrategies.java
b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDependencyHierarchyWithConflictsStrategies.java
index 59ba857f0..4b64c093c 100644
---
a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDependencyHierarchyWithConflictsStrategies.java
+++
b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDependencyHierarchyWithConflictsStrategies.java
@@ -107,9 +107,10 @@ public class GetDependencyHierarchyWithConflictsStrategies
{
System.out.println("tree:");
result.getRoot().accept(new
DependencyGraphDumper(System.out::println));
- List<DependencyNode> selected =
- system.flattenDependencyNodes(session,
result.getRoot(), (node, parents) -> !node.getData()
-
.containsKey(ConflictResolver.NODE_DATA_WINNER));
+ List<DependencyNode> selected = system.flattenDependencyNodes(
+ session,
+ result.getRoot(),
+ (node, parents) ->
!node.getData().containsKey(ConflictResolver.NODE_DATA_WINNER));
System.out.println("cp:");
selected.forEach(System.out::println);
}
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/DefaultRemoteRepositoryFilterManager.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/DefaultRemoteRepositoryFilterManager.java
index 42f406416..9e12ec73b 100644
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/DefaultRemoteRepositoryFilterManager.java
+++
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/DefaultRemoteRepositoryFilterManager.java
@@ -90,16 +90,16 @@ public final class DefaultRemoteRepositoryFilterManager
implements RemoteReposit
@Override
public RemoteRepositoryFilter.Result acceptArtifact(RemoteRepository
remoteRepository, Artifact artifact) {
- return new Consensus(
-
participants.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e
-> e.getValue()
- .acceptArtifact(remoteRepository, artifact))));
+ return new Consensus(participants.entrySet().stream()
+ .collect(Collectors.toMap(
+ Map.Entry::getKey, e ->
e.getValue().acceptArtifact(remoteRepository, artifact))));
}
@Override
public RemoteRepositoryFilter.Result acceptMetadata(RemoteRepository
remoteRepository, Metadata metadata) {
- return new Consensus(
-
participants.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e
-> e.getValue()
- .acceptMetadata(remoteRepository, metadata))));
+ return new Consensus(participants.entrySet().stream()
+ .collect(Collectors.toMap(
+ Map.Entry::getKey, e ->
e.getValue().acceptMetadata(remoteRepository, metadata))));
}
}
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/GroupIdRemoteRepositoryFilterSource.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/GroupIdRemoteRepositoryFilterSource.java
index c98953af0..0b396e221 100644
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/GroupIdRemoteRepositoryFilterSource.java
+++
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/GroupIdRemoteRepositoryFilterSource.java
@@ -266,9 +266,13 @@ public final class GroupIdRemoteRepositoryFilterSource
extends RemoteRepositoryF
}
private Path ruleFile(RepositorySystemSession session, RemoteRepository
remoteRepository) {
- return
ruleFiles(session).computeIfAbsent(normalizeRemoteRepository(session,
remoteRepository), r -> getBasedir(
- session, LOCAL_REPO_PREFIX_DIR, CONFIG_PROP_BASEDIR,
false)
- .resolve(GROUP_ID_FILE_PREFIX + repositoryKey(session,
remoteRepository) + GROUP_ID_FILE_SUFFIX));
+ return ruleFiles(session)
+ .computeIfAbsent(
+ normalizeRemoteRepository(session, remoteRepository),
+ r -> getBasedir(session, LOCAL_REPO_PREFIX_DIR,
CONFIG_PROP_BASEDIR, false)
+ .resolve(GROUP_ID_FILE_PREFIX
+ + repositoryKey(session,
remoteRepository)
+ + GROUP_ID_FILE_SUFFIX));
}
private GroupTree cacheRules(RepositorySystemSession session,
RemoteRepository remoteRepository) {
diff --git
a/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/SmartExecutorUtils.java
b/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/SmartExecutorUtils.java
index 06e3d637c..bd831e06c 100644
---
a/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/SmartExecutorUtils.java
+++
b/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/SmartExecutorUtils.java
@@ -91,8 +91,8 @@ public final class SmartExecutorUtils {
public static SmartExecutor smartExecutor(
RepositorySystemSession session, Integer tasks, int
maxConcurrentTasks, String namePrefix) {
if (tasks == null && maxConcurrentTasks > 1) {
- return (SmartExecutor)
-
session.getData().computeIfAbsent(SmartExecutor.class.getSimpleName() + "-" +
namePrefix, () -> {
+ return (SmartExecutor) session.getData()
+ .computeIfAbsent(SmartExecutor.class.getSimpleName() + "-"
+ namePrefix, () -> {
SmartExecutor smartExecutor = newSmartExecutor(null,
maxConcurrentTasks, namePrefix);
session.addOnSessionEndedHandler(smartExecutor::close);
return new SmartExecutor.NonClosing(smartExecutor);
diff --git a/pom.xml b/pom.xml
index fccb15b8c..2ee4850aa 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>
@@ -110,7 +110,7 @@
<bouncycastleVersion>1.84</bouncycastleVersion>
<!-- Used by Jetty Transport (client) and Test HTTP (server), 12.1
introduced support for different compressions
(https://github.com/jetty/jetty.project/issues/8769) -->
- <jettyVersion>12.1.8</jettyVersion>
+ <jettyVersion>12.1.9</jettyVersion>
<!-- used by supplier and demo only -->
<maven3Version>3.9.15</maven3Version>
<maven4Version>4.0.0-rc-5</maven4Version>
@@ -124,7 +124,7 @@
<bnd.instructions.additions />
<!-- Parent versions -->
- <versions.junit5>5.14.3</versions.junit5>
+ <versions.junit5>5.14.4</versions.junit5>
</properties>
<dependencyManagement>
diff --git a/src/site/site.xml b/src/site/site.xml
index 1028df5bd..f864b4af3 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -22,7 +22,6 @@ under the License.
<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
https://maven.apache.org/xsd/site-2.0.0.xsd"; name="Artifact Resolver">
- <edit>${project.scm.url}</edit>
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
