You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2024/09/28 18:57:07 UTC
(maven) 03/04: [MNG-8264] Deprecate maven-resolver-provider
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 75738858d6b6e28e4b1b172b21f53a57285863f1
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Sep 23 17:55:54 2024 +0200
[MNG-8264] Deprecate maven-resolver-provider
---
maven-resolver-provider/pom.xml | 2 +-
.../maven/repository/internal/ArtifactDescriptorReaderDelegate.java | 2 ++
.../org/apache/maven/repository/internal/ArtifactDescriptorUtils.java | 2 ++
.../maven/repository/internal/DefaultArtifactDescriptorReader.java | 3 +++
.../java/org/apache/maven/repository/internal/DefaultModelCache.java | 2 ++
.../apache/maven/repository/internal/DefaultModelCacheFactory.java | 3 +++
.../org/apache/maven/repository/internal/DefaultModelResolver.java | 2 ++
.../apache/maven/repository/internal/DefaultModelVersionParser.java | 4 ++++
.../apache/maven/repository/internal/DefaultVersionRangeResolver.java | 2 ++
.../org/apache/maven/repository/internal/DefaultVersionResolver.java | 2 ++
.../maven/repository/internal/DefaultVersionSchemeProvider.java | 3 +++
.../org/apache/maven/repository/internal/LocalSnapshotMetadata.java | 3 +++
.../maven/repository/internal/LocalSnapshotMetadataGenerator.java | 3 +++
.../maven/repository/internal/MavenArtifactRelocationSource.java | 2 ++
.../main/java/org/apache/maven/repository/internal/MavenMetadata.java | 2 ++
.../maven/repository/internal/MavenRepositorySystemSupplier.java | 2 ++
.../apache/maven/repository/internal/MavenSessionBuilderSupplier.java | 2 ++
.../org/apache/maven/repository/internal/MavenSnapshotMetadata.java | 2 ++
.../org/apache/maven/repository/internal/MavenWorkspaceReader.java | 3 +++
.../java/org/apache/maven/repository/internal/ModelCacheFactory.java | 3 +++
.../java/org/apache/maven/repository/internal/PluginsMetadata.java | 3 +++
.../apache/maven/repository/internal/PluginsMetadataGenerator.java | 3 +++
.../maven/repository/internal/PluginsMetadataGeneratorFactory.java | 3 +++
.../java/org/apache/maven/repository/internal/RelocatedArtifact.java | 2 ++
.../org/apache/maven/repository/internal/RemoteSnapshotMetadata.java | 3 +++
.../maven/repository/internal/RemoteSnapshotMetadataGenerator.java | 3 +++
.../java/org/apache/maven/repository/internal/RequestTraceHelper.java | 2 ++
.../maven/repository/internal/SnapshotMetadataGeneratorFactory.java | 3 +++
.../java/org/apache/maven/repository/internal/VersionsMetadata.java | 3 +++
.../apache/maven/repository/internal/VersionsMetadataGenerator.java | 3 +++
.../maven/repository/internal/VersionsMetadataGeneratorFactory.java | 3 +++
.../maven/repository/internal/artifact/FatArtifactTraverser.java | 2 ++
.../maven/repository/internal/artifact/MavenArtifactProperties.java | 2 ++
.../main/java/org/apache/maven/repository/internal/package-info.java | 3 +++
.../relocation/DistributionManagementArtifactRelocationSource.java | 2 ++
.../internal/relocation/UserPropertiesArtifactRelocationSource.java | 2 ++
.../repository/internal/scopes/Maven3ScopeManagerConfiguration.java | 2 ++
.../repository/internal/scopes/Maven4ScopeManagerConfiguration.java | 2 ++
.../java/org/apache/maven/repository/internal/type/DefaultType.java | 2 ++
.../apache/maven/repository/internal/type/DefaultTypeProvider.java | 1 +
40 files changed, 97 insertions(+), 1 deletion(-)
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 2f752187d0..c220269c7f 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -28,7 +28,7 @@ under the License.
<artifactId>maven-resolver-provider</artifactId>
- <name>Maven Artifact Resolver Provider</name>
+ <name>Maven Artifact Resolver Provider (deprecated)</name>
<description>Extensions to Maven Resolver for utilizing Maven POM and repository metadata.</description>
<dependencies>
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
index 1bbe98e366..38c9b044a8 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
@@ -49,7 +49,9 @@ import org.eclipse.aether.resolution.ArtifactDescriptorResult;
* <p>
* <strong>Note:</strong> This class is part of work in progress and can be changed or removed without notice.
* @since 3.2.4
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
public class ArtifactDescriptorReaderDelegate {
public void populateResult(RepositorySystemSession session, ArtifactDescriptorResult result, Model model) {
ArtifactTypeRegistry stereotypes = session.getArtifactTypeRegistry();
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java
index 3cd64db236..74b3b7ff34 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java
@@ -28,7 +28,9 @@ import org.eclipse.aether.repository.RepositoryPolicy;
* <strong>Warning:</strong> This is an internal utility class that is only public for technical reasons, it is not part
* of the public API. In particular, this class can be changed or deleted without prior notice.
*
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
public class ArtifactDescriptorUtils {
public static Artifact toPomArtifact(Artifact artifact) {
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 2f32cacc85..bbc55d4d26 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -70,9 +70,12 @@ import org.slf4j.LoggerFactory;
/**
* Default artifact descriptor reader.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
@Named
@Singleton
+@Deprecated(since = "4.0.0")
public class DefaultArtifactDescriptorReader implements ArtifactDescriptorReader {
private final RemoteRepositoryManager remoteRepositoryManager;
private final VersionResolver versionResolver;
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
index 004fb6ef05..213b6dc5a1 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
@@ -33,7 +33,9 @@ import static java.util.Objects.requireNonNull;
/**
* A model builder cache backed by the repository system cache.
*
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
public class DefaultModelCache implements ModelCache {
private static final String KEY = DefaultModelCache.class.getName();
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCacheFactory.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCacheFactory.java
index e23ef59d3a..a46df08c3a 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCacheFactory.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCacheFactory.java
@@ -26,9 +26,12 @@ import org.eclipse.aether.RepositorySystemSession;
/**
* Default implementation of {@link ModelCacheFactory}.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
@Singleton
@Named
+@Deprecated(since = "4.0.0")
public class DefaultModelCacheFactory implements ModelCacheFactory {
@Override
public ModelCache createCache(RepositorySystemSession session) {
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
index 8c6335faa2..66509f4773 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
@@ -53,7 +53,9 @@ import org.eclipse.aether.resolution.VersionRangeResult;
* been initially specified and repositories discovered in dependency POMs are recessively merged into the search chain.
*
* @see DefaultArtifactDescriptorReader
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
class DefaultModelResolver implements ModelResolver {
private final RepositorySystemSession session;
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 8d5f5fef87..0db8131c00 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
@@ -34,8 +34,12 @@ import org.eclipse.aether.version.VersionScheme;
import static java.util.Objects.requireNonNull;
+/**
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
+ */
@Named
@Singleton
+@Deprecated(since = "4.0.0")
public class DefaultModelVersionParser implements ModelVersionParser {
private static final String SNAPSHOT = "SNAPSHOT";
private static final Pattern SNAPSHOT_TIMESTAMP = Pattern.compile("^(.*-)?([0-9]{8}\\.[0-9]{6}-[0-9]+)$");
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
index df2d799237..28953e96f8 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -59,9 +59,11 @@ import org.eclipse.aether.version.VersionRange;
import org.eclipse.aether.version.VersionScheme;
/**
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead/
*/
@Named
@Singleton
+@Deprecated(since = "4.0.0")
public class DefaultVersionRangeResolver implements VersionRangeResolver {
private static final String MAVEN_METADATA_XML = "maven-metadata.xml";
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
index 8e14b5b570..ac0cab573a 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -63,9 +63,11 @@ import org.eclipse.aether.spi.synccontext.SyncContextFactory;
import org.eclipse.aether.util.ConfigUtils;
/**
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
@Named
@Singleton
+@Deprecated(since = "4.0.0")
public class DefaultVersionResolver implements VersionResolver {
private static final String MAVEN_METADATA_XML = "maven-metadata.xml";
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionSchemeProvider.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionSchemeProvider.java
index 8bebb05f57..4fd605f853 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionSchemeProvider.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionSchemeProvider.java
@@ -27,9 +27,12 @@ import org.eclipse.aether.version.VersionScheme;
/**
* Default version scheme provider: provides singleton {@link GenericVersionScheme} instance.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
@Singleton
@Named
+@Deprecated(since = "4.0.0")
public final class DefaultVersionSchemeProvider implements Provider<VersionScheme> {
private final GenericVersionScheme genericVersionScheme;
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
index aea6a01267..e880b45560 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
@@ -34,7 +34,10 @@ import org.eclipse.aether.artifact.Artifact;
/**
* Maven local GAV level metadata.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
final class LocalSnapshotMetadata extends MavenMetadata {
private final Collection<Artifact> artifacts = new ArrayList<>();
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
index c5f3bf8f45..962eb6a4d3 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
@@ -35,7 +35,10 @@ import org.eclipse.aether.util.ConfigUtils;
* Maven local GAV level metadata generator.
* <p>
* Local snapshot metadata contains non-transformed snapshot version.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
class LocalSnapshotMetadataGenerator implements MetadataGenerator {
private final Map<Object, LocalSnapshotMetadata> snapshots;
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenArtifactRelocationSource.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenArtifactRelocationSource.java
index 5cad9c366d..1799d1e5d1 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenArtifactRelocationSource.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenArtifactRelocationSource.java
@@ -30,7 +30,9 @@ import org.eclipse.aether.resolution.ArtifactDescriptorResult;
* explicitly order implementations using Sisu priorities.
*
* @since 4.0.0
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
public interface MavenArtifactRelocationSource {
/**
* Returns {@link Artifact} instance where to relocate to, or {@code null}.
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
index 3e7f9dbe63..d211969aa1 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
@@ -38,7 +38,9 @@ import org.eclipse.aether.metadata.AbstractMetadata;
import org.eclipse.aether.metadata.MergeableMetadata;
/**
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
abstract class MavenMetadata extends AbstractMetadata implements MergeableMetadata {
static final String MAVEN_METADATA_XML = "maven-metadata.xml";
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSupplier.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSupplier.java
index 754bbc2368..a2923aadca 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSupplier.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSupplier.java
@@ -184,7 +184,9 @@ import org.eclipse.aether.version.VersionScheme;
* well. Any subsequent {@code getXXX} method invocation attempt will fail with {@link IllegalStateException}.
*
* @since 4.0.0
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
public class MavenRepositorySystemSupplier implements Supplier<RepositorySystem> {
private final AtomicBoolean closed = new AtomicBoolean(false);
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSessionBuilderSupplier.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSessionBuilderSupplier.java
index 999f57998e..72275546b6 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSessionBuilderSupplier.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSessionBuilderSupplier.java
@@ -61,7 +61,9 @@ import static java.util.Objects.requireNonNull;
* Extend this class and override methods to customize, if needed.
*
* @since 4.0.0
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
public class MavenSessionBuilderSupplier implements Supplier<SessionBuilder> {
protected final RepositorySystem repositorySystem;
protected final InternalScopeManager scopeManager;
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java
index 236830679f..16134223bd 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java
@@ -27,7 +27,9 @@ import org.apache.maven.artifact.repository.metadata.Metadata;
import org.eclipse.aether.artifact.Artifact;
/**
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
abstract class MavenSnapshotMetadata extends MavenMetadata {
static final String SNAPSHOT = "SNAPSHOT";
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenWorkspaceReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenWorkspaceReader.java
index 48fea8b61c..a014be943d 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenWorkspaceReader.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenWorkspaceReader.java
@@ -24,7 +24,10 @@ import org.eclipse.aether.repository.WorkspaceReader;
/**
* MavenWorkspaceReader
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
public interface MavenWorkspaceReader extends WorkspaceReader {
Model findModel(Artifact artifact);
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ModelCacheFactory.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ModelCacheFactory.java
index 0f44f77a2f..fc4c1559a6 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ModelCacheFactory.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ModelCacheFactory.java
@@ -23,7 +23,10 @@ import org.eclipse.aether.RepositorySystemSession;
/**
* Factory for {@link ModelCache} objects.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
public interface ModelCacheFactory {
ModelCache createCache(RepositorySystemSession session);
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadata.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadata.java
index b55ca08600..1fb09475e4 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadata.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadata.java
@@ -32,7 +32,10 @@ import org.apache.maven.artifact.repository.metadata.Plugin;
/**
* Maven G level metadata.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
final class PluginsMetadata extends MavenMetadata {
static final class PluginInfo {
@Nonnull
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGenerator.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGenerator.java
index 558cc2a757..d5bfca2741 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGenerator.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGenerator.java
@@ -48,7 +48,10 @@ import org.slf4j.LoggerFactory;
* Maven G level metadata generator.
* <p>
* Plugin metadata contains G level list of "prefix" to A mapping for plugins present under this G.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
class PluginsMetadataGenerator implements MetadataGenerator {
private static final String PLUGIN_DESCRIPTOR_LOCATION = "META-INF/maven/plugin.xml";
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGeneratorFactory.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGeneratorFactory.java
index 7c1ebffb34..b586532766 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGeneratorFactory.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGeneratorFactory.java
@@ -29,9 +29,12 @@ import org.eclipse.aether.installation.InstallRequest;
/**
* Maven G level metadata generator factory.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
@Named(PluginsMetadataGeneratorFactory.NAME)
@Singleton
+@Deprecated(since = "4.0.0")
public class PluginsMetadataGeneratorFactory implements MetadataGeneratorFactory {
public static final String NAME = "plugins";
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
index e0f8b8b92c..3c038eed92 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
@@ -27,7 +27,9 @@ import org.eclipse.aether.artifact.AbstractArtifact;
import org.eclipse.aether.artifact.Artifact;
/**
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
public final class RelocatedArtifact extends AbstractArtifact {
private final Artifact artifact;
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
index a543495f7e..3f838dc422 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
@@ -37,7 +37,10 @@ import org.eclipse.aether.artifact.Artifact;
/**
* Maven remote GAV level metadata.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
final class RemoteSnapshotMetadata extends MavenSnapshotMetadata {
public static final String DEFAULT_SNAPSHOT_TIMESTAMP_FORMAT = "yyyyMMdd.HHmmss";
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
index d957b29786..e785454364 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
@@ -35,7 +35,10 @@ import org.eclipse.aether.util.ConfigUtils;
* Maven remote GAV level metadata generator.
* <p>
* Remote snapshot metadata converts artifact on-the-fly to use timestamped snapshot version, and enlist it accordingly.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
class RemoteSnapshotMetadataGenerator implements MetadataGenerator {
private final Map<Object, RemoteSnapshotMetadata> snapshots;
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RequestTraceHelper.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RequestTraceHelper.java
index 99435d8788..8643c79f80 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RequestTraceHelper.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RequestTraceHelper.java
@@ -32,7 +32,9 @@ import org.eclipse.aether.resolution.DependencyRequest;
* Helper class to manage {@link RequestTrace} for better error logging.
*
* @since 3.9.9
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
public final class RequestTraceHelper {
/**
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/SnapshotMetadataGeneratorFactory.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/SnapshotMetadataGeneratorFactory.java
index c72bdcc60c..6325320b39 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/SnapshotMetadataGeneratorFactory.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/SnapshotMetadataGeneratorFactory.java
@@ -29,9 +29,12 @@ import org.eclipse.aether.installation.InstallRequest;
/**
* Maven GAV level metadata generator factory.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
@Named(SnapshotMetadataGeneratorFactory.NAME)
@Singleton
+@Deprecated(since = "4.0.0")
public class SnapshotMetadataGeneratorFactory implements MetadataGeneratorFactory {
public static final String NAME = "snapshot";
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java
index 8cd465fcab..7fcc32a9a4 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java
@@ -32,7 +32,10 @@ import org.eclipse.aether.artifact.ArtifactProperties;
/**
* Maven GA level metadata.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
final class VersionsMetadata extends MavenMetadata {
private final Artifact artifact;
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java
index f9d98cdf1f..9540b4a338 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java
@@ -37,7 +37,10 @@ import org.eclipse.aether.util.ConfigUtils;
* Maven GA level metadata generator.
*
* Version metadata contains list of existing baseVersions within this GA.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
class VersionsMetadataGenerator implements MetadataGenerator {
private final Map<Object, VersionsMetadata> versions;
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGeneratorFactory.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGeneratorFactory.java
index 53458c75d5..c29987dcff 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGeneratorFactory.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGeneratorFactory.java
@@ -29,9 +29,12 @@ import org.eclipse.aether.installation.InstallRequest;
/**
* Maven GA level metadata generator factory.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
@Named(VersionsMetadataGeneratorFactory.NAME)
@Singleton
+@Deprecated(since = "4.0.0")
public class VersionsMetadataGeneratorFactory implements MetadataGeneratorFactory {
public static final String NAME = "versions";
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/FatArtifactTraverser.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/FatArtifactTraverser.java
index 4e6df4d39c..b1e8d8414e 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/FatArtifactTraverser.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/FatArtifactTraverser.java
@@ -32,7 +32,9 @@ import static java.util.Objects.requireNonNull;
* @see org.eclipse.aether.artifact.Artifact#getProperties()
* @see MavenArtifactProperties
* @since 4.0.0
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
public final class FatArtifactTraverser implements DependencyTraverser {
public FatArtifactTraverser() {}
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/MavenArtifactProperties.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/MavenArtifactProperties.java
index 8de35b7cb0..1c3d93b613 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/MavenArtifactProperties.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/MavenArtifactProperties.java
@@ -24,7 +24,9 @@ package org.apache.maven.repository.internal.artifact;
*
* @see org.eclipse.aether.artifact.ArtifactProperties
* @since 4.0.0
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
public final class MavenArtifactProperties {
/**
* A boolean flag indicating whether the artifact presents some kind of bundle that physically includes its
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java
index e745bf7326..9ea572a598 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java
@@ -2,5 +2,8 @@
/**
* <a href="https://maven.apache.org/resolver/">Maven Resolver</a> extensions for utilizing the Maven POM and Maven
* repository metadata.
+ *
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
package org.apache.maven.repository.internal;
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/DistributionManagementArtifactRelocationSource.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/DistributionManagementArtifactRelocationSource.java
index fed7cf2301..7121855f30 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/DistributionManagementArtifactRelocationSource.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/DistributionManagementArtifactRelocationSource.java
@@ -40,10 +40,12 @@ import org.slf4j.LoggerFactory;
* Note: this component should kick-in last regarding relocations.
*
* @since 4.0.0
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
@Singleton
@Named(DistributionManagementArtifactRelocationSource.NAME)
@Priority(5)
+@Deprecated(since = "4.0.0")
public final class DistributionManagementArtifactRelocationSource implements MavenArtifactRelocationSource {
public static final String NAME = "distributionManagement";
private static final Logger LOGGER = LoggerFactory.getLogger(DistributionManagementArtifactRelocationSource.class);
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java
index 233494145d..2079f35da5 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java
@@ -44,10 +44,12 @@ import org.slf4j.LoggerFactory;
* Relocation source from user properties.
*
* @since 4.0.0
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
@Singleton
@Named(UserPropertiesArtifactRelocationSource.NAME)
@Priority(50)
+@Deprecated(since = "4.0.0")
public final class UserPropertiesArtifactRelocationSource implements MavenArtifactRelocationSource {
public static final String NAME = "userProperties";
private static final Logger LOGGER = LoggerFactory.getLogger(UserPropertiesArtifactRelocationSource.class);
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven3ScopeManagerConfiguration.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven3ScopeManagerConfiguration.java
index bb3c543c45..53f598e774 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven3ScopeManagerConfiguration.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven3ScopeManagerConfiguration.java
@@ -47,7 +47,9 @@ import static org.eclipse.aether.impl.scope.BuildScopeQuery.union;
* This manager supports the old Maven 3 dependency scopes.
*
* @since 2.0.0
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
public final class Maven3ScopeManagerConfiguration implements ScopeManagerConfiguration {
public static final Maven3ScopeManagerConfiguration INSTANCE = new Maven3ScopeManagerConfiguration();
public static final String DS_COMPILE = "compile";
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven4ScopeManagerConfiguration.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven4ScopeManagerConfiguration.java
index f5668996e6..a388330763 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven4ScopeManagerConfiguration.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven4ScopeManagerConfiguration.java
@@ -46,7 +46,9 @@ import static org.eclipse.aether.impl.scope.BuildScopeQuery.union;
* This manager supports all the new Maven 4 dependency scopes defined in {@link DependencyScope}.
*
* @since 2.0.0
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
public final class Maven4ScopeManagerConfiguration implements ScopeManagerConfiguration {
public static final Maven4ScopeManagerConfiguration INSTANCE = new Maven4ScopeManagerConfiguration();
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultType.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultType.java
index 34cf94020a..8cd12961c9 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultType.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultType.java
@@ -39,7 +39,9 @@ import static java.util.Objects.requireNonNull;
* Default implementation of {@link Type} and Resolver {@link ArtifactType}.
*
* @since 4.0.0
+ * @deprecated since 4.0.0, use {@code maven-api-impl} jar instead
*/
+@Deprecated(since = "4.0.0")
public class DefaultType implements Type, ArtifactType {
private final String id;
private final Language language;
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultTypeProvider.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultTypeProvider.java
index a4995aa43a..6d2e84ef4d 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultTypeProvider.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultTypeProvider.java
@@ -29,6 +29,7 @@ import org.apache.maven.api.Type;
import org.apache.maven.api.spi.TypeProvider;
@Named
+@Deprecated(since = "4.0.0")
public class DefaultTypeProvider implements TypeProvider {
@SuppressWarnings({"rawtypes", "unchecked"})
@Override