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

elharo pushed a commit to branch fix/issue-136-scope-comparator
in repository https://gitbox.apache.org/repos/asf/maven-dependency-tree.git

commit cf01878a6c6c880c822ad725db220bf4be5d47fd
Author: Elliotte Rusty Harold <[email protected]>
AuthorDate: Thu Nov 19 16:35:00 2026 +0000

    Make verbose scope comparison deterministic for unknown scopes
---
 .../graph/internal/VerboseJavaScopeSelector.java   | 10 ++++-
 .../internal/VerboseJavaScopeSelectorTest.java     | 50 ++++++++++++++++++++++
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/shared/dependency/graph/internal/VerboseJavaScopeSelector.java
 
b/src/main/java/org/apache/maven/shared/dependency/graph/internal/VerboseJavaScopeSelector.java
index 7cf2194..b28072f 100644
--- 
a/src/main/java/org/apache/maven/shared/dependency/graph/internal/VerboseJavaScopeSelector.java
+++ 
b/src/main/java/org/apache/maven/shared/dependency/graph/internal/VerboseJavaScopeSelector.java
@@ -48,11 +48,17 @@ public class VerboseJavaScopeSelector extends ScopeSelector 
{
     }
 
     static class ScopeComparator implements Comparator<String> {
-        List<String> orderedScopes = Arrays.asList("compile", "runtime", 
"provided", "test");
+        private static final List<String> ORDERED_SCOPES = 
Arrays.asList("compile", "runtime", "provided", "test");
 
         @Override
         public int compare(String lhs, String rhs) {
-            return orderedScopes.indexOf(rhs) - orderedScopes.indexOf(lhs);
+            int byPriority = Integer.compare(priority(lhs), priority(rhs));
+            return byPriority == 0 ? lhs.compareTo(rhs) : byPriority;
+        }
+
+        private static int priority(String scope) {
+            int index = ORDERED_SCOPES.indexOf(scope);
+            return index < 0 ? 0 : ORDERED_SCOPES.size() - index;
         }
     }
 }
diff --git 
a/src/test/java/org/apache/maven/shared/dependency/graph/internal/VerboseJavaScopeSelectorTest.java
 
b/src/test/java/org/apache/maven/shared/dependency/graph/internal/VerboseJavaScopeSelectorTest.java
new file mode 100644
index 0000000..2a4fed1
--- /dev/null
+++ 
b/src/test/java/org/apache/maven/shared/dependency/graph/internal/VerboseJavaScopeSelectorTest.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.shared.dependency.graph.internal;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+
+import 
org.apache.maven.shared.dependency.graph.internal.VerboseJavaScopeSelector.ScopeComparator;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class VerboseJavaScopeSelectorTest {
+
+    private final ScopeComparator comparator = new ScopeComparator();
+
+    @Test
+    void selectsTheSameUnknownScopeRegardlessOfEncounterOrder() {
+        assertEquals("system", Stream.of("system", 
"custom").max(comparator).get());
+        assertEquals("system", Stream.of("custom", 
"system").max(comparator).get());
+    }
+
+    @Test
+    void ranksUnknownScopesBelowKnownScopesAndPreservesKnownScopeOrder() {
+        List<String> scopes =
+                new ArrayList<>(Arrays.asList("provided", "system", "compile", 
"custom", "test", "runtime"));
+
+        scopes.sort(comparator.reversed());
+
+        assertEquals(Arrays.asList("compile", "runtime", "provided", "test", 
"system", "custom"), scopes);
+    }
+}

Reply via email to