Remove empty dependency scope from the api

apache · Feb 7, 2024 · cc40ce8 · cc40ce8
1 parent 76794c0
commit cc40ce8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/DependencyScope.java b/api/maven-api-core/src/main/java/org/apache/maven/api/DependencyScope.java
@@ -48,11 +48,6 @@ public enum DependencyScope {
      */
     NONE("none", false),
 
-    /**
-     * Empty scope.
-     */
-    EMPTY("", false),
-
     /**
      * Compile only.
      */

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/PathScope.java b/api/maven-api-core/src/main/java/org/apache/maven/api/PathScope.java
@@ -55,18 +55,16 @@ public interface PathScope extends ExtensibleEnum {
     PathScope MAIN_COMPILE = pathScope(
             "main-compile",
             ProjectScope.MAIN,
-            DependencyScope.EMPTY,
             DependencyScope.COMPILE_ONLY,
             DependencyScope.COMPILE,
             DependencyScope.PROVIDED);
 
-    PathScope MAIN_RUNTIME = pathScope(
-            "main-runtime", ProjectScope.MAIN, DependencyScope.EMPTY, DependencyScope.COMPILE, DependencyScope.RUNTIME);
+    PathScope MAIN_RUNTIME =
+            pathScope("main-runtime", ProjectScope.MAIN, DependencyScope.COMPILE, DependencyScope.RUNTIME);
 
     PathScope TEST_COMPILE = pathScope(
             "test-compile",
             ProjectScope.TEST,
-            DependencyScope.EMPTY,
             DependencyScope.COMPILE,
             DependencyScope.PROVIDED,
             DependencyScope.TEST_ONLY,
@@ -75,7 +73,6 @@ public interface PathScope extends ExtensibleEnum {
     PathScope TEST_RUNTIME = pathScope(
             "test-runtime",
             ProjectScope.TEST,
-            DependencyScope.EMPTY,
             DependencyScope.COMPILE,
             DependencyScope.RUNTIME,
             DependencyScope.PROVIDED,

diff --git a/...-core/src/main/java/org/apache/maven/api/services/DependencyCoordinateFactoryRequest.java b/...-core/src/main/java/org/apache/maven/api/services/DependencyCoordinateFactoryRequest.java
@@ -22,10 +22,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import org.apache.maven.api.ArtifactCoordinate;
-import org.apache.maven.api.Dependency;
-import org.apache.maven.api.Exclusion;
-import org.apache.maven.api.Session;
+import org.apache.maven.api.*;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;
@@ -110,7 +107,7 @@ class DependencyCoordinateFactoryRequestBuilder {
         private String extension;
         private String type;
         private String coordinateString;
-        private String scope;
+        private String scope = DependencyScope.COMPILE.id();
         private boolean optional;
         private Collection<Exclusion> exclusions = Collections.emptyList();