From 39696f2fab8de5efef2131ab0508e3f4b81e7714 Mon Sep 17 00:00:00 2001 From: Martin Desruisseaux Date: Tue, 21 May 2024 11:54:32 +0200 Subject: [PATCH] [MNG-8084] Change six remaining imports of `ModelVersionParser`. (#1527) This commit aims to complete d075fe7e85d26d86ad25a963274cd9c5b910c56a, 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` --- .../model/building/DefaultModelBuilder.java | 2 +- .../building/DefaultModelBuilderFactory.java | 2 +- .../model/version/ModelVersionParser.java | 70 ------------------- .../internal/DefaultModelVersionParser.java | 2 +- .../internal/ModelVersionParserTest.java | 2 +- .../repository/internal/VersionRangeTest.java | 2 +- .../repository/internal/VersionTest.java | 2 +- 7 files changed, 6 insertions(+), 76 deletions(-) delete mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/version/ModelVersionParser.java 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 index 73d5f3b14a58..953cac4882ae 100644 --- 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/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java index 363b9b67a3af..97af6e2191b1 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java +++ b/maven-model-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 deleted file mode 100644 index 73dd8d2b8d38..000000000000 --- a/maven-model-builder/src/main/java/org/apache/maven/model/version/ModelVersionParser.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * 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.model.version; - -import org.apache.maven.api.Version; -import org.apache.maven.api.VersionConstraint; -import org.apache.maven.api.VersionRange; -import org.apache.maven.api.annotations.Nonnull; -import org.apache.maven.api.services.VersionParserException; - -/** - * Model builder specific version parser. It is intentionally not - * {@link org.apache.maven.api.services.VersionParser} as this is not a service, - * but at Maven runtime it MAY actually use that service. - * - * @since 4.0.0 - */ -public interface ModelVersionParser { - - /** - * Parses the specified version string, for example "1.0". - * - * @param version the version string to parse, must not be {@code null} - * @return the parsed version, never {@code null} - * @throws VersionParserException if the string violates the syntax rules of this scheme - */ - @Nonnull - Version parseVersion(@Nonnull String version); - - /** - * Parses the specified version range specification, for example "[1.0,2.0)". - * - * @param range the range specification to parse, must not be {@code null} - * @return the parsed version range, never {@code null} - * @throws VersionParserException if the range specification violates the syntax rules of this scheme - */ - @Nonnull - VersionRange parseVersionRange(@Nonnull String range); - - /** - * Parses the specified version constraint specification, for example "1.0" or "[1.0,2.0)". - * - * @param constraint the range specification to parse, must not be {@code null} - * @return the parsed version constraint, never {@code null} - * @throws VersionParserException if the range specification violates the syntax rules of this scheme - */ - @Nonnull - VersionConstraint parseVersionConstraint(@Nonnull String constraint); - - /** - * Checks whether a given artifact version is considered a {@code SNAPSHOT} or not. - */ - boolean isSnapshot(@Nonnull String version); -} diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelVersionParser.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelVersionParser.java index 6716ba78f621..8d5f5fef8794 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelVersionParser.java +++ b/maven-resolver-provider/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/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/ModelVersionParserTest.java b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/ModelVersionParserTest.java index 90203267f616..ed1e0d100009 100644 --- a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/ModelVersionParserTest.java +++ b/maven-resolver-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/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/VersionRangeTest.java b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/VersionRangeTest.java index 23a982d90398..981e6f3af753 100644 --- a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/VersionRangeTest.java +++ b/maven-resolver-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 index d9302037c0c6..273cc339bef8 100644 --- 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;