Skip to content

Commit 1b7f533

Browse files
committed
Mild backport: support same properties as Resolver 2.x
Also, fix misaligned filter sources re session This is "mild backport" of #1655
1 parent 7fef652 commit 1b7f533

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/DefaultRemoteRepositoryFilterManager.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ public DefaultRemoteRepositoryFilterManager(Map<String, RemoteRepositoryFilterSo
6969

7070
@Override
7171
public RemoteRepositoryFilter getRemoteRepositoryFilter(RepositorySystemSession session) {
72-
return (RemoteRepositoryFilter) session.getData().computeIfAbsent(INSTANCE_KEY, () -> {
72+
// use session specific key to distinguish between "derived" sessions
73+
String instanceSpecificKey = INSTANCE_KEY + "." + session.hashCode();
74+
return (RemoteRepositoryFilter) session.getData().computeIfAbsent(instanceSpecificKey, () -> {
7375
HashMap<String, RemoteRepositoryFilter> filters = new HashMap<>();
7476
for (Map.Entry<String, RemoteRepositoryFilterSource> entry : sources.entrySet()) {
7577
RemoteRepositoryFilter filter = entry.getValue().getRemoteRepositoryFilter(session);

maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/RemoteRepositoryFilterSourceSupport.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ protected String configPropKey(String name) {
7373
* Default is {@code false}.
7474
*/
7575
protected boolean isEnabled(RepositorySystemSession session) {
76-
return ConfigUtils.getBoolean(session, false, CONFIG_PROP_PREFIX + this.name);
76+
return ConfigUtils.getBoolean(session, false, CONFIG_PROP_PREFIX + this.name)
77+
&& ConfigUtils.getBoolean(session, false, CONFIG_PROP_PREFIX + this.name + ".skipped");
7778
}
7879

7980
/**

0 commit comments

Comments
 (0)