From 1b7f533835edf12548d6bdebb5cd2af276c4a764 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 14 Nov 2025 15:43:07 +0100 Subject: [PATCH 1/2] Mild backport: support same properties as Resolver 2.x Also, fix misaligned filter sources re session This is "mild backport" of #1655 --- .../impl/filter/DefaultRemoteRepositoryFilterManager.java | 4 +++- .../impl/filter/RemoteRepositoryFilterSourceSupport.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 f6070e91b..919d57146 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 @@ -69,7 +69,9 @@ public DefaultRemoteRepositoryFilterManager(Map { + // use session specific key to distinguish between "derived" sessions + String instanceSpecificKey = INSTANCE_KEY + "." + session.hashCode(); + return (RemoteRepositoryFilter) session.getData().computeIfAbsent(instanceSpecificKey, () -> { HashMap filters = new HashMap<>(); for (Map.Entry entry : sources.entrySet()) { RemoteRepositoryFilter filter = entry.getValue().getRemoteRepositoryFilter(session); diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/RemoteRepositoryFilterSourceSupport.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/RemoteRepositoryFilterSourceSupport.java index 42003ddf8..dea3290b5 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/RemoteRepositoryFilterSourceSupport.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/RemoteRepositoryFilterSourceSupport.java @@ -73,7 +73,8 @@ protected String configPropKey(String name) { * Default is {@code false}. */ protected boolean isEnabled(RepositorySystemSession session) { - return ConfigUtils.getBoolean(session, false, CONFIG_PROP_PREFIX + this.name); + return ConfigUtils.getBoolean(session, false, CONFIG_PROP_PREFIX + this.name) + && ConfigUtils.getBoolean(session, false, CONFIG_PROP_PREFIX + this.name + ".skipped"); } /** From 5f06dad88af9c7ce56d832c71d48917ccf33bf81 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 14 Nov 2025 15:51:32 +0100 Subject: [PATCH 2/2] Fix, missing negation --- .../impl/filter/RemoteRepositoryFilterSourceSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/RemoteRepositoryFilterSourceSupport.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/RemoteRepositoryFilterSourceSupport.java index dea3290b5..04c54bed0 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/RemoteRepositoryFilterSourceSupport.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/RemoteRepositoryFilterSourceSupport.java @@ -74,7 +74,7 @@ protected String configPropKey(String name) { */ protected boolean isEnabled(RepositorySystemSession session) { return ConfigUtils.getBoolean(session, false, CONFIG_PROP_PREFIX + this.name) - && ConfigUtils.getBoolean(session, false, CONFIG_PROP_PREFIX + this.name + ".skipped"); + && !ConfigUtils.getBoolean(session, false, CONFIG_PROP_PREFIX + this.name + ".skipped"); } /**