[MNG-8084] Change six remaining imports of ModelVersionParser. (apa…

…che#1527) This commit aims to complete d075fe7, which moved `ModelVersionParser` interface from the `org.apache.maven.model.version` package to `org.apache.maven.api.services.model`. Completing this change is necessary for building `maven-plugin-tools` or `maven-plugin-testing`. This commit deletes the old interface for making sure that there is no accidental use. The old and new interfaces were identical except for the package names and the imports. As a result of this change, the following implementation classes are identical except for package names and imports: * `maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelVersionParser.java` * `maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelVersionParser.java`
olamy · May 21, 2024 · 39696f2 · 39696f2
1 parent c87a4b5
commit 39696f2
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 76 deletions.
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -48,6 48,7 @@
 import org.apache.maven.api.model.Exclusion;
 import org.apache.maven.api.model.InputSource;
 import org.apache.maven.api.services.VersionParserException;
 import org.apache.maven.api.services.model.ModelVersionParser;
 import org.apache.maven.building.Source;
 import org.apache.maven.model.Activation;
 import org.apache.maven.model.Build;
@@ -89,7 90,6 @@
 import org.apache.maven.model.v4.MavenTransformer;
 import org.apache.maven.model.validation.DefaultModelValidator;
 import org.apache.maven.model.validation.ModelValidator;
-import org.apache.maven.model.version.ModelVersionParser;
 import org.codehaus.plexus.interpolation.InterpolationException;
 import org.codehaus.plexus.interpolation.Interpolator;
 import org.codehaus.plexus.interpolation.MapBasedValueSource;

diff --git a/...del-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java b/...del-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java
@@ -23,6 23,7 @@
 import org.apache.maven.api.Version;
 import org.apache.maven.api.VersionConstraint;
 import org.apache.maven.api.VersionRange;
 import org.apache.maven.api.services.model.ModelVersionParser;
 import org.apache.maven.api.spi.ModelParser;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.composition.DefaultDependencyManagementImporter;
@@ -74,7 75,6 @@
 import org.apache.maven.model.superpom.SuperPomProvider;
 import org.apache.maven.model.validation.DefaultModelValidator;
 import org.apache.maven.model.validation.ModelValidator;
-import org.apache.maven.model.version.ModelVersionParser;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/version/ModelVersionParser.java b/maven-model-builder/src/main/java/org/apache/maven/model/version/ModelVersionParser.java
diff --git a/...rovider/src/main/java/org/apache/maven/repository/internal/DefaultModelVersionParser.java b/...rovider/src/main/java/org/apache/maven/repository/internal/DefaultModelVersionParser.java
@@ -28,7 28,7 @@
 import org.apache.maven.api.VersionConstraint;
 import org.apache.maven.api.VersionRange;
 import org.apache.maven.api.services.VersionParserException;
-import org.apache.maven.model.version.ModelVersionParser;
 import org.apache.maven.api.services.model.ModelVersionParser;
 import org.eclipse.aether.version.InvalidVersionSpecificationException;
 import org.eclipse.aether.version.VersionScheme;
 

diff --git a/...r-provider/src/test/java/org/apache/maven/repository/internal/ModelVersionParserTest.java b/...r-provider/src/test/java/org/apache/maven/repository/internal/ModelVersionParserTest.java
@@ -20,7 20,7 @@
 
 import org.apache.maven.api.VersionConstraint;
 import org.apache.maven.api.services.VersionParserException;
-import org.apache.maven.model.version.ModelVersionParser;
 import org.apache.maven.api.services.model.ModelVersionParser;
 import org.eclipse.aether.util.version.GenericVersionScheme;
 import org.junit.jupiter.api.Test;
 

diff --git a/...esolver-provider/src/test/java/org/apache/maven/repository/internal/VersionRangeTest.java b/...esolver-provider/src/test/java/org/apache/maven/repository/internal/VersionRangeTest.java
@@ -21,7 21,7 @@
 import org.apache.maven.api.Version;
 import org.apache.maven.api.VersionRange;
 import org.apache.maven.api.services.VersionParserException;
-import org.apache.maven.model.version.ModelVersionParser;
 import org.apache.maven.api.services.model.ModelVersionParser;
 import org.eclipse.aether.util.version.GenericVersionScheme;
 import org.junit.jupiter.api.Test;
 

diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/VersionTest.java b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/VersionTest.java
@@ -26,7 26,7 @@
 import java.util.stream.Stream;
 
 import org.apache.maven.api.Version;
-import org.apache.maven.model.version.ModelVersionParser;
 import org.apache.maven.api.services.model.ModelVersionParser;
 import org.eclipse.aether.util.version.GenericVersionScheme;
 import org.junit.jupiter.api.Test;