Remove originalScope and originalOptionality

apache · Jan 8, 2025 · 3c54d66 · 3c54d66
1 parent 1d0fe10
commit 3c54d66
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 44 deletions.
diff --git a/src/main/java/org/apache/maven/shared/dependency/graph/ConflictData.java b/src/main/java/org/apache/maven/shared/dependency/graph/ConflictData.java
@@ -26,12 +26,8 @@
 public class ConflictData {
     private String winnerVersion;
 
-    private String originalScope;
-
     private String ignoredScope;
 
-    private Boolean originalOptionality;
-
     /**
      * Construct ConflictData. Containing information about conflicts during dependency resolution.
      * Either this node lost the conflict and winnerVersion is set with the version of the winnig node,
@@ -55,42 +51,6 @@ public String getWinnerVersion() {
         return winnerVersion;
     }
 
-    /**
-     * Original scope of a rejected dependency due to a conflict.
-     *
-     * @return the original scope of the dependency that was updated from
-     */
-    public String getOriginalScope() {
-        return originalScope;
-    }
-
-    /**
-     * Set original scope of a rejected dependency due to a conflict.
-     *
-     * @param originalScope the original scope of the dependency that was updated from
-     */
-    public void setOriginalScope(String originalScope) {
-        this.originalScope = originalScope;
-    }
-
-    /**
-     * Original optionality of a rejected dependency due to a conflict.
-     *
-     * @return the original optionality of the dependency
-     */
-    public Boolean getOriginalOptionality() {
-        return originalOptionality;
-    }
-
-    /**
-     * Set original optionality of a rejected dependency due to a conflict.
-     *
-     * @param originalOptionality the original optionality of the dependency
-     */
-    public void setOriginalOptionality(Boolean originalOptionality) {
-        this.originalOptionality = originalOptionality;
-    }
-
     /**
      * The scope of the dependency that was not updated to during dependency resolution.
      *

diff --git a/src/main/java/org/apache/maven/shared/dependency/graph/internal/VerboseDependencyNode.java b/src/main/java/org/apache/maven/shared/dependency/graph/internal/VerboseDependencyNode.java
@@ -65,10 +65,6 @@ public String toNodeString() {
             appender.append("scope managed from ", getPremanagedScope());
         }
 
-        if (data.getOriginalScope() != null) {
-            appender.append("scope updated from ", data.getOriginalScope());
-        }
-
         if (data.getIgnoredScope() != null) {
             appender.append("scope not updated to ", data.getIgnoredScope());
         }