Skip to content

Commit 169706d

Browse files
committed
Fixes:
* deriveUntil and applyFrom are invariants within same session; do not spend cpu cycles on them * remove managedLocalPaths as we want javadoc say: first to apply always/consistently
1 parent 22aeddc commit 169706d

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/AbstractDependencyManager.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,8 @@ protected AbstractDependencyManager(
113113
// nullable: if using scope manager, but there is no system scope defined
114114
this.systemDependencyScope = systemDependencyScope;
115115

116-
this.hashCode = Objects.hash(
117-
depth,
118-
deriveUntil,
119-
applyFrom,
120-
managedVersions,
121-
managedScopes,
122-
managedOptionals,
123-
managedLocalPaths,
124-
managedExclusions);
116+
// exclude managedLocalPaths
117+
this.hashCode = Objects.hash(depth, managedVersions, managedScopes, managedOptionals, managedExclusions);
125118
}
126119

127120
protected abstract DependencyManager newInstance(
@@ -320,13 +313,11 @@ public boolean equals(Object obj) {
320313
}
321314

322315
AbstractDependencyManager that = (AbstractDependencyManager) obj;
316+
// exclude managedLocalPaths
323317
return depth == that.depth
324-
&& deriveUntil == that.deriveUntil
325-
&& applyFrom == that.applyFrom
326318
&& managedVersions.equals(that.managedVersions)
327319
&& managedScopes.equals(that.managedScopes)
328320
&& managedOptionals.equals(that.managedOptionals)
329-
&& managedLocalPaths.equals(that.managedLocalPaths)
330321
&& managedExclusions.equals(that.managedExclusions);
331322
}
332323

0 commit comments

Comments
 (0)