(maven-resolver) branch maven-resolver-1.9.x updated: [1.9.x] Mild backport: support same properties as Resolver 2.x (#1656)

[cstamas]

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch maven-resolver-1.9.x
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git


The following commit(s) were added to refs/heads/maven-resolver-1.9.x by this 
push:
     new 8c3fb18df [1.9.x] Mild backport: support same properties as Resolver 
2.x (#1656)
8c3fb18df is described below

commit 8c3fb18df9869d694ec57f280a2bedccb54f8bfe
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Mon Nov 17 20:37:23 2025 +0100

    [1.9.x] Mild backport: support same properties as Resolver 2.x (#1656)
    
    Changes:
    * fix manager to make sure filters and session are aligned
    * support same (newly introduced) properties
    
    This is "mild backport" of #1655
---
 .../internal/impl/filter/DefaultRemoteRepositoryFilterManager.java    | 4 +++-
 .../internal/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 final class DefaultRemoteRepositoryFilterManager 
implements RemoteReposit
 
     @Override
     public RemoteRepositoryFilter 
getRemoteRepositoryFilter(RepositorySystemSession session) {
-        return (RemoteRepositoryFilter) 
session.getData().computeIfAbsent(INSTANCE_KEY, () -> {
+        // use session specific key to distinguish between "derived" sessions
+        String instanceSpecificKey = INSTANCE_KEY + "." + session.hashCode();
+        return (RemoteRepositoryFilter) 
session.getData().computeIfAbsent(instanceSpecificKey, () -> {
             HashMap<String, RemoteRepositoryFilter> filters = new HashMap<>();
             for (Map.Entry<String, RemoteRepositoryFilterSource> 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..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
@@ -73,7 +73,8 @@ public abstract class RemoteRepositoryFilterSourceSupport 
implements RemoteRepos
      * 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");
     }
 
     /**