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 2023/09/06 11:29:01 UTC

[maven] branch master updated: Deprecate all classes in maven-compat (#1227)

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


The following commit(s) were added to refs/heads/master by this push:
     new 05a76bc427 Deprecate all classes in maven-compat (#1227)
05a76bc427 is described below

commit 05a76bc427b2a951e009f908244128b42dc0cb2c
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Sep 6 13:28:54 2023 +0200

    Deprecate all classes in maven-compat (#1227)
---
 maven-compat/pom.xml                                                  | 4 ++--
 .../src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java    | 1 +
 .../src/main/java/org/apache/maven/artifact/ArtifactStatus.java       | 1 +
 .../org/apache/maven/artifact/UnknownRepositoryLayoutException.java   | 1 +
 .../java/org/apache/maven/artifact/deployer/ArtifactDeployer.java     | 1 +
 .../apache/maven/artifact/deployer/ArtifactDeploymentException.java   | 1 +
 .../org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java   | 1 +
 .../maven/artifact/installer/ArtifactInstallationException.java       | 1 +
 .../java/org/apache/maven/artifact/installer/ArtifactInstaller.java   | 1 +
 .../org/apache/maven/artifact/installer/DefaultArtifactInstaller.java | 1 +
 .../java/org/apache/maven/artifact/manager/DefaultWagonManager.java   | 1 +
 .../apache/maven/artifact/repository/ArtifactRepositoryFactory.java   | 1 +
 .../maven/artifact/repository/DefaultArtifactRepositoryFactory.java   | 1 +
 .../maven/artifact/repository/LegacyLocalRepositoryManager.java       | 1 +
 .../apache/maven/artifact/repository/layout/FlatRepositoryLayout.java | 1 +
 .../artifact/repository/metadata/AbstractRepositoryMetadata.java      | 1 +
 .../artifact/repository/metadata/ArtifactRepositoryMetadata.java      | 1 +
 .../repository/metadata/DefaultRepositoryMetadataManager.java         | 1 +
 .../maven/artifact/repository/metadata/GroupRepositoryMetadata.java   | 1 +
 .../org/apache/maven/artifact/repository/metadata/MetadataBridge.java | 1 +
 .../org/apache/maven/artifact/repository/metadata/MetadataUtils.java  | 1 +
 .../apache/maven/artifact/repository/metadata/RepositoryMetadata.java | 1 +
 .../repository/metadata/RepositoryMetadataDeploymentException.java    | 1 +
 .../repository/metadata/RepositoryMetadataInstallationException.java  | 1 +
 .../maven/artifact/repository/metadata/RepositoryMetadataManager.java | 1 +
 .../artifact/repository/metadata/RepositoryMetadataReadException.java | 1 +
 .../repository/metadata/RepositoryMetadataResolutionException.java    | 1 +
 .../repository/metadata/SnapshotArtifactRepositoryMetadata.java       | 1 +
 .../org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java | 1 +
 .../org/apache/maven/artifact/resolver/ArtifactResolutionResult.java  | 1 +
 .../java/org/apache/maven/artifact/resolver/ArtifactResolver.java     | 1 +
 .../org/apache/maven/artifact/resolver/DebugResolutionListener.java   | 1 +
 .../org/apache/maven/artifact/resolver/DefaultArtifactResolver.java   | 1 +
 .../apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java | 1 +
 .../org/apache/maven/artifact/resolver/ResolutionErrorHandler.java    | 1 +
 .../java/org/apache/maven/artifact/resolver/ResolutionListener.java   | 1 +
 .../main/java/org/apache/maven/artifact/resolver/ResolutionNode.java  | 1 +
 .../java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java  | 1 +
 .../org/apache/maven/artifact/resolver/WarningResolutionListener.java | 1 +
 .../maven/artifact/resolver/filter/InversionArtifactFilter.java       | 1 +
 .../org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java   | 1 +
 .../org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java | 1 +
 .../java/org/apache/maven/plugin/internal/DefaultPluginManager.java   | 1 +
 .../org/apache/maven/project/MissingRepositoryElementException.java   | 1 +
 .../maven/project/inheritance/DefaultModelInheritanceAssembler.java   | 1 +
 .../org/apache/maven/project/validation/ModelValidationResult.java    | 1 +
 .../main/java/org/apache/maven/reporting/MavenReportException.java    | 1 +
 .../main/java/org/apache/maven/repository/MavenArtifactMetadata.java  | 1 +
 .../src/main/java/org/apache/maven/repository/MetadataGraph.java      | 1 +
 .../src/main/java/org/apache/maven/repository/MetadataGraphNode.java  | 1 +
 .../java/org/apache/maven/repository/MetadataResolutionRequest.java   | 1 +
 .../java/org/apache/maven/repository/MetadataResolutionResult.java    | 1 +
 .../src/main/java/org/apache/maven/repository/MirrorSelector.java     | 1 +
 .../java/org/apache/maven/repository/UserLocalArtifactRepository.java | 1 +
 .../java/org/apache/maven/repository/VersionNotFoundException.java    | 1 +
 .../org/apache/maven/repository/legacy/ChecksumFailedException.java   | 1 +
 .../org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java | 1 +
 .../java/org/apache/maven/repository/legacy/DefaultWagonManager.java  | 1 +
 .../org/apache/maven/repository/legacy/LegacyRepositorySystem.java    | 1 +
 .../main/java/org/apache/maven/repository/legacy/MavenArtifact.java   | 1 +
 .../org/apache/maven/repository/legacy/TransferListenerAdapter.java   | 1 +
 .../java/org/apache/maven/repository/legacy/UpdateCheckManager.java   | 1 +
 .../apache/maven/repository/legacy/WagonConfigurationException.java   | 1 +
 .../main/java/org/apache/maven/repository/legacy/WagonManager.java    | 1 +
 .../maven/repository/legacy/repository/ArtifactRepositoryFactory.java | 1 +
 .../legacy/repository/DefaultArtifactRepositoryFactory.java           | 1 +
 .../repository/legacy/resolver/DefaultLegacyArtifactCollector.java    | 1 +
 .../maven/repository/legacy/resolver/conflict/ConflictResolver.java   | 1 +
 .../repository/legacy/resolver/conflict/ConflictResolverFactory.java  | 1 +
 .../legacy/resolver/conflict/ConflictResolverNotFoundException.java   | 1 +
 .../legacy/resolver/conflict/DefaultConflictResolverFactory.java      | 1 +
 .../repository/legacy/resolver/conflict/FarthestConflictResolver.java | 1 +
 .../repository/legacy/resolver/conflict/NearestConflictResolver.java  | 1 +
 .../repository/legacy/resolver/conflict/NewestConflictResolver.java   | 1 +
 .../repository/legacy/resolver/conflict/OldestConflictResolver.java   | 1 +
 .../legacy/resolver/transform/AbstractVersionTransformation.java      | 1 +
 .../repository/legacy/resolver/transform/ArtifactTransformation.java  | 1 +
 .../legacy/resolver/transform/ArtifactTransformationManager.java      | 1 +
 .../resolver/transform/DefaultArtifactTransformationManager.java      | 1 +
 .../legacy/resolver/transform/LatestArtifactTransformation.java       | 1 +
 .../legacy/resolver/transform/ReleaseArtifactTransformation.java      | 1 +
 .../repository/legacy/resolver/transform/SnapshotTransformation.java  | 1 +
 .../java/org/apache/maven/repository/metadata/ArtifactMetadata.java   | 1 +
 .../java/org/apache/maven/repository/metadata/ClasspathContainer.java | 1 +
 .../org/apache/maven/repository/metadata/ClasspathTransformation.java | 1 +
 .../maven/repository/metadata/DefaultClasspathTransformation.java     | 1 +
 .../repository/metadata/DefaultGraphConflictResolutionPolicy.java     | 1 +
 .../maven/repository/metadata/DefaultGraphConflictResolver.java       | 1 +
 .../maven/repository/metadata/GraphConflictResolutionException.java   | 1 +
 .../maven/repository/metadata/GraphConflictResolutionPolicy.java      | 1 +
 .../org/apache/maven/repository/metadata/GraphConflictResolver.java   | 1 +
 .../main/java/org/apache/maven/repository/metadata/MetadataGraph.java | 1 +
 .../java/org/apache/maven/repository/metadata/MetadataGraphEdge.java  | 1 +
 .../repository/metadata/MetadataGraphTransformationException.java     | 1 +
 .../org/apache/maven/repository/metadata/MetadataGraphVertex.java     | 1 +
 .../java/org/apache/maven/repository/metadata/MetadataResolution.java | 1 +
 .../apache/maven/repository/metadata/MetadataResolutionException.java | 1 +
 .../apache/maven/repository/metadata/MetadataResolutionRequest.java   | 1 +
 .../maven/repository/metadata/MetadataResolutionRequestTypeEnum.java  | 1 +
 .../apache/maven/repository/metadata/MetadataResolutionResult.java    | 1 +
 .../apache/maven/repository/metadata/MetadataRetrievalException.java  | 1 +
 .../java/org/apache/maven/repository/metadata/MetadataSource.java     | 1 +
 .../java/org/apache/maven/repository/metadata/MetadataTreeNode.java   | 1 +
 .../java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java   | 1 +
 .../maven/usability/plugin/ExpressionDocumentationException.java      | 1 +
 .../java/org/apache/maven/usability/plugin/ExpressionDocumenter.java  | 1 +
 106 files changed, 107 insertions(+), 2 deletions(-)

diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index b879eedf60..1cfe9c305c 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -28,8 +28,8 @@ under the License.
 
   <artifactId>maven-compat</artifactId>
 
-  <name>Maven Compat</name>
-  <description>Maven2 classes maintained as compatibility layer.</description>
+  <name>Maven Compat (deprecated)</name>
+  <description>Deprecated Maven2 classes maintained as compatibility layer.</description>
 
   <dependencies>
     <dependency>
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
index 671649e39c..34178d5bc4 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
@@ -24,6 +24,7 @@ package org.apache.maven.artifact;
  *
  *
  */
+@Deprecated
 public enum ArtifactScopeEnum {
     compile(1),
     test(2),
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java
index 6ff6563a6e..3a6a2bdf50 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java
@@ -25,6 +25,7 @@ import java.util.Map;
  * Type safe enumeration for the artifact status field.
  *
  */
+@Deprecated
 public final class ArtifactStatus implements Comparable<ArtifactStatus> {
     /**
      * No trust - no information about status.
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java b/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
index ac05dbd49b..dcaa874cb6 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
@@ -26,6 +26,7 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
  * component in the current container.
  *
  */
+@Deprecated
 public class UnknownRepositoryLayoutException extends InvalidRepositoryException {
 
     private final String layoutId;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
index 7584339920..43dbd13ea5 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
@@ -26,6 +26,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
 /**
  * ArtifactDeployer
  */
+@Deprecated
 public interface ArtifactDeployer {
     String ROLE = ArtifactDeployer.class.getName();
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java
index 0c6bae0ada..6351873bfa 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java
@@ -20,6 +20,7 @@ package org.apache.maven.artifact.deployer;
 
 /**
  */
+@Deprecated
 public class ArtifactDeploymentException extends Exception {
     public ArtifactDeploymentException(String message) {
         super(message);
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
index 1d04b089f5..3ecc9ab80e 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
@@ -51,6 +51,7 @@ import org.eclipse.aether.util.artifact.SubArtifact;
  * DefaultArtifactDeployer
  */
 @Named
+@Deprecated
 public class DefaultArtifactDeployer extends AbstractLogEnabled implements ArtifactDeployer {
 
     @Inject
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java b/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java
index c66c2d5432..830a90bd11 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java
@@ -20,6 +20,7 @@ package org.apache.maven.artifact.installer;
 
 /**
  */
+@Deprecated
 public class ArtifactInstallationException extends Exception {
     public ArtifactInstallationException(String message) {
         super(message);
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java b/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java
index f6e117fb31..f9f4c12c77 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java
@@ -25,6 +25,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
 
 /**
  */
+@Deprecated
 public interface ArtifactInstaller {
     String ROLE = ArtifactInstaller.class.getName();
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java b/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
index d36e935f97..4adf578ddf 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
@@ -48,6 +48,7 @@ import org.eclipse.aether.util.artifact.SubArtifact;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultArtifactInstaller extends AbstractLogEnabled implements ArtifactInstaller {
 
     @Inject
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
index f5f029f063..ee2ff7240c 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
@@ -48,6 +48,7 @@ import org.codehaus.plexus.logging.Logger;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultWagonManager extends org.apache.maven.repository.legacy.DefaultWagonManager
         implements WagonManager {
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
index 3f4b3153a9..85a2f24c91 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
@@ -23,6 +23,7 @@ import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 
 /**
  */
+@Deprecated
 public interface ArtifactRepositoryFactory {
     String ROLE = ArtifactRepositoryFactory.class.getName();
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
index bff9a0cf0c..8ddb073dfe 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
@@ -37,6 +37,7 @@ import org.eclipse.aether.RepositorySystemSession;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultArtifactRepositoryFactory implements ArtifactRepositoryFactory {
 
     @Inject
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
index 01b03e37d0..6034d84208 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
@@ -49,6 +49,7 @@ import org.eclipse.aether.repository.RemoteRepository;
  * of the public API. In particular, this class can be changed or deleted without prior notice.
  *
  */
+@Deprecated
 public class LegacyLocalRepositoryManager implements LocalRepositoryManager {
 
     private final ArtifactRepository delegate;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
index c787cf3211..3dd264bcf4 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
@@ -31,6 +31,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
  */
 @Named("flat")
 @Singleton
+@Deprecated
 public class FlatRepositoryLayout implements ArtifactRepositoryLayout {
 
     private static final char ARTIFACT_SEPARATOR = '-';
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
index 7d81a419c3..9e30f10b4d 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
@@ -37,6 +37,7 @@ import org.apache.maven.artifact.repository.metadata.io.MetadataStaxWriter;
  * Shared methods of the repository metadata handling.
  *
  */
+@Deprecated
 public abstract class AbstractRepositoryMetadata implements RepositoryMetadata {
     private static final String LS = System.lineSeparator();
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
index e6e5de29fb..3038cc1eb6 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
@@ -29,6 +29,7 @@ import org.apache.maven.artifact.versioning.VersionRange;
  * Metadata for the artifact directory of the repository.
  *
  */
+@Deprecated
 public class ArtifactRepositoryMetadata extends AbstractRepositoryMetadata {
     private Artifact artifact;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
index 92ba77ea6c..a7136ae39c 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
@@ -51,6 +51,7 @@ import org.codehaus.plexus.logging.AbstractLogEnabled;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultRepositoryMetadataManager extends AbstractLogEnabled implements RepositoryMetadataManager {
     @Inject
     private WagonManager wagonManager;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
index ea9ebf8765..a7c4515c6b 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
@@ -27,6 +27,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
  * Metadata for the group directory of the repository.
  *
  */
+@Deprecated
 public class GroupRepositoryMetadata extends AbstractRepositoryMetadata {
     private final String groupId;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
index b7a2f85932..bc60117a2e 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
@@ -36,6 +36,7 @@ import org.eclipse.aether.metadata.Metadata;
  * of the public API. In particular, this class can be changed or deleted without prior notice.
  *
  */
+@Deprecated
 public final class MetadataBridge extends AbstractMetadata implements MergeableMetadata {
 
     private ArtifactMetadata metadata;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java
index ed7c757aae..1ef6090012 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java
@@ -22,6 +22,7 @@ package org.apache.maven.artifact.repository.metadata;
  * Assists in handling repository metadata.
  *
  */
+@Deprecated
 class MetadataUtils {
 
     public static Metadata cloneMetadata(Metadata src) {
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
index 5e984b34d6..078ce1175a 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
@@ -26,6 +26,7 @@ import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
  *
  * TODO not happy about the store method - they use "this"
  */
+@Deprecated
 public interface RepositoryMetadata extends org.apache.maven.artifact.metadata.ArtifactMetadata {
 
     int RELEASE = 1;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java
index 6bad1ae524..8e374e9a64 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java
@@ -22,6 +22,7 @@ package org.apache.maven.artifact.repository.metadata;
  * Error while deploying repository metadata.
  *
  */
+@Deprecated
 public class RepositoryMetadataDeploymentException extends Throwable {
     public RepositoryMetadataDeploymentException(String message) {
         super(message);
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java
index ba35a6f684..314b89ba1c 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java
@@ -22,6 +22,7 @@ package org.apache.maven.artifact.repository.metadata;
  * Error while installing repository metadata.
  *
  */
+@Deprecated
 public class RepositoryMetadataInstallationException extends Throwable {
     public RepositoryMetadataInstallationException(String message) {
         super(message);
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
index e49a52d412..b92eddcd56 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
@@ -27,6 +27,7 @@ import org.apache.maven.artifact.repository.RepositoryRequest;
 /**
  * RepositoryMetadataManager
  */
+@Deprecated
 public interface RepositoryMetadataManager {
 
     void resolve(RepositoryMetadata repositoryMetadata, RepositoryRequest repositoryRequest)
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java
index 1f01ec51bf..8b588fb5d5 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java
@@ -22,6 +22,7 @@ package org.apache.maven.artifact.repository.metadata;
  * Problem storing the repository metadata in the local repository.
  *
  */
+@Deprecated
 public class RepositoryMetadataReadException extends Exception {
     public RepositoryMetadataReadException(String message) {
         super(message);
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java
index efbe2844bd..50782b3317 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java
@@ -22,6 +22,7 @@ package org.apache.maven.artifact.repository.metadata;
  * Error while retrieving repository metadata from the repository.
  *
  */
+@Deprecated
 public class RepositoryMetadataResolutionException extends Exception {
     public RepositoryMetadataResolutionException(String message) {
         super(message);
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
index 2592e55557..ca1c1696f1 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
@@ -26,6 +26,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
  *
  * TODO split instantiation (versioning, plugin mappings) from definition
  */
+@Deprecated
 public class SnapshotArtifactRepositoryMetadata extends AbstractRepositoryMetadata {
     private Artifact artifact;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
index 201a0a49a0..6bd018e7a5 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
@@ -37,6 +37,7 @@ import org.apache.maven.settings.Server;
  * to process a POMs dependencies.
  *
  */
+@Deprecated
 public class ArtifactResolutionRequest implements RepositoryRequest {
     private static final String LS = System.lineSeparator();
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
index d69eab8909..c530287001 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
@@ -43,6 +43,7 @@ import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
  *       complex requiring a long list of checks, need to create a parent/interface/encapsulation
  *       for the types of exceptions
  */
+@Deprecated
 public class ArtifactResolutionResult {
     private static final String LS = System.lineSeparator();
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
index b8d194795b..ccdd808d12 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
@@ -31,6 +31,7 @@ import org.apache.maven.wagon.events.TransferListener;
 /**
  */
 // Just hide the one method we want behind the RepositorySystem interface.
+@Deprecated
 public interface ArtifactResolver {
 
     ArtifactResolutionResult resolve(ArtifactResolutionRequest request);
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
index d378a7e420..70191b2cb6 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
@@ -30,6 +30,7 @@ import org.codehaus.plexus.logging.Logger;
  * Send resolution events to the debug log.
  *
  */
+@Deprecated
 public class DebugResolutionListener implements ResolutionListener, ResolutionListenerForDepMgmt {
     private Logger logger;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 61d8a7cfac..c2b90b2353 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -72,6 +72,7 @@ import org.eclipse.aether.resolution.ArtifactResult;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultArtifactResolver implements ArtifactResolver, Disposable {
     @Inject
     private Logger logger;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java
index cdf233a35c..d2311e737f 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java
@@ -29,6 +29,7 @@ import java.util.List;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultResolutionErrorHandler implements ResolutionErrorHandler {
 
     public void throwErrors(ArtifactResolutionRequest request, ArtifactResolutionResult result)
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java
index 5417ae6691..ccd8688ec5 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java
@@ -20,6 +20,7 @@ package org.apache.maven.artifact.resolver;
 
 /**
  */
+@Deprecated
 public interface ResolutionErrorHandler {
 
     void throwErrors(ArtifactResolutionRequest request, ArtifactResolutionResult result)
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java
index 542fd37f9c..5015ff2807 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java
@@ -25,6 +25,7 @@ import org.apache.maven.artifact.versioning.VersionRange;
  * Listens to the resolution process and handles events.
  *
  */
+@Deprecated
 public interface ResolutionListener {
     String ROLE = ResolutionListener.class.getName();
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
index 0ce3738f91..16e6217197 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
@@ -34,6 +34,7 @@ import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
 /**
  * ResolutionNode
  */
+@Deprecated
 public class ResolutionNode {
     private Artifact artifact;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java
index fa05d6ae59..4e6016c6ef 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java
@@ -28,6 +28,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
  * the remote repositories where attempts were made to resolve the artifacts.
  *
  */
+@Deprecated
 public class UnresolvedArtifacts {
     private Artifact originatingArtifact;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java
index e139f192bf..ddfd5686a6 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java
@@ -26,6 +26,7 @@ import org.codehaus.plexus.logging.Logger;
  * Send resolution warning events to the warning log.
  *
  */
+@Deprecated
 public class WarningResolutionListener implements ResolutionListener {
     private Logger logger;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
index b13678c167..30f4e16418 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
@@ -23,6 +23,7 @@ import org.apache.maven.artifact.Artifact;
 /**
  * InversionArtifactFilter
  */
+@Deprecated
 public class InversionArtifactFilter implements ArtifactFilter {
     private final ArtifactFilter toInvert;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
index d86f22efc9..274add48ac 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
@@ -28,6 +28,7 @@ import org.apache.maven.artifact.Artifact;
  * Apply multiple filters, accepting an artifact if at least one of the filters accepts it.
  *
  */
+@Deprecated
 public class OrArtifactFilter implements ArtifactFilter {
 
     private Set<ArtifactFilter> filters;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java
index 270f3e7f7b..16ee7bef6b 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java
@@ -21,6 +21,7 @@ package org.apache.maven.artifact.resolver.filter;
 import org.apache.maven.artifact.Artifact;
 
 /** Artifact Filter which filters on artifact type */
+@Deprecated
 public class TypeArtifactFilter implements ArtifactFilter {
     private String type = "jar";
 
diff --git a/maven-compat/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java b/maven-compat/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
index ff3173f255..7a60717df6 100644
--- a/maven-compat/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
@@ -64,6 +64,7 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultPluginManager implements PluginManager {
 
     private final PlexusContainer container;
diff --git a/maven-compat/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java b/maven-compat/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java
index b528c6a2e5..d3a1246ece 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java
@@ -23,6 +23,7 @@ import org.apache.maven.artifact.InvalidRepositoryException;
 /**
  * Error constructing an artifact repository.
  */
+@Deprecated
 public class MissingRepositoryElementException extends InvalidRepositoryException {
 
     public MissingRepositoryElementException(String message, String repositoryId) {
diff --git a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
index c872258889..c265dc0042 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
@@ -29,6 +29,7 @@ import org.apache.maven.model.Model;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultModelInheritanceAssembler implements ModelInheritanceAssembler {
     @Override
     public void assembleModelInheritance(Model child, Model parent, String childPathAdjustment) {
diff --git a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
index 42a4d643e6..bc305cb2a0 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
@@ -24,6 +24,7 @@ import java.util.List;
 
 /**
  */
+@Deprecated
 public class ModelValidationResult {
 
     /** */
diff --git a/maven-compat/src/main/java/org/apache/maven/reporting/MavenReportException.java b/maven-compat/src/main/java/org/apache/maven/reporting/MavenReportException.java
index 871c8b8ecf..f6e1fbb351 100644
--- a/maven-compat/src/main/java/org/apache/maven/reporting/MavenReportException.java
+++ b/maven-compat/src/main/java/org/apache/maven/reporting/MavenReportException.java
@@ -22,6 +22,7 @@ package org.apache.maven.reporting;
  * An exception occurring during the execution of a Maven report.
  *
  */
+@Deprecated
 public class MavenReportException extends Exception {
     public MavenReportException(String msg) {
         super(msg);
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java b/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
index 64aa85f2d6..d84e67a03a 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
@@ -23,6 +23,7 @@ package org.apache.maven.repository;
  *
  *
  */
+@Deprecated
 public class MavenArtifactMetadata {
     public static final String DEFAULT_TYPE = "jar";
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
index 34f2f0148a..d6b7c9205b 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
@@ -26,6 +26,7 @@ import java.util.Collection;
  *
  *
  */
+@Deprecated
 public class MetadataGraph {
     /** all graph nodes */
     Collection<MetadataGraphNode> nodes;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
index 3d22611fd4..c67a55550f 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
@@ -26,6 +26,7 @@ import java.util.List;
  *
  *
  */
+@Deprecated
 public class MetadataGraphNode {
     /** node payload */
     MavenArtifactMetadata metadata;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
index 37868990ba..4c438ca1e7 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
@@ -30,6 +30,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
  *
  *
  */
+@Deprecated
 public class MetadataResolutionRequest {
     private MavenArtifactMetadata mad;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
index bbdffb1e76..6f9ff29437 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
@@ -35,6 +35,7 @@ import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
  *
  *
  */
+@Deprecated
 public class MetadataResolutionResult {
     private Artifact originatingArtifact;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java b/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java
index 2a3b8c218b..eb958ae486 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java
@@ -27,6 +27,7 @@ import org.apache.maven.settings.Mirror;
  * Handles the selection of mirrors for repositories.
  *
  */
+@Deprecated
 public interface MirrorSelector {
 
     /**
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java b/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
index ffc2be9c57..2cc8e36c8c 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
@@ -27,6 +27,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
 /**
  * UserLocalArtifactRepository
  */
+@Deprecated
 public class UserLocalArtifactRepository extends LocalArtifactRepository {
     private ArtifactRepository localRepository;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java b/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
index 0f265cf1dd..4adb4eb660 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
@@ -28,6 +28,7 @@ import org.apache.maven.model.Dependency;
  * Thrown if a dependency has an invalid version.
  *
  */
+@Deprecated
 public class VersionNotFoundException extends Exception {
     private Dependency dependency;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/ChecksumFailedException.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/ChecksumFailedException.java
index eced4a309e..ea375a3fbb 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/ChecksumFailedException.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/ChecksumFailedException.java
@@ -24,6 +24,7 @@ import org.apache.maven.wagon.TransferFailedException;
  * Occurs when a download checksum fails.
  *
  */
+@Deprecated
 public class ChecksumFailedException extends TransferFailedException {
     public ChecksumFailedException(String s) {
         super(s);
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
index f975742cf9..4c4156a071 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
@@ -45,6 +45,7 @@ import org.codehaus.plexus.logging.Logger;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultUpdateCheckManager extends AbstractLogEnabled implements UpdateCheckManager {
 
     private static final String ERROR_KEY_SUFFIX = ".error";
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
index 963b9377e7..7a590981ff 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
@@ -66,6 +66,7 @@ import org.eclipse.aether.util.ConfigUtils;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultWagonManager implements WagonManager {
 
     private static final String[] CHECKSUM_IDS = {"md5", "sha1"};
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
index 7dbb558910..327b30942c 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
@@ -84,6 +84,7 @@ import org.eclipse.aether.repository.RemoteRepository;
  */
 @Named("default")
 @Singleton
+@Deprecated
 public class LegacyRepositorySystem implements RepositorySystem {
 
     @Inject
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/MavenArtifact.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/MavenArtifact.java
index 1696f38d8d..ccb18d2054 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/MavenArtifact.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/MavenArtifact.java
@@ -21,6 +21,7 @@ package org.apache.maven.repository.legacy;
 import org.apache.maven.repository.ArtifactTransferResource;
 import org.apache.maven.wagon.resource.Resource;
 
+@Deprecated
 class MavenArtifact implements ArtifactTransferResource {
 
     private String repositoryUrl;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
index f03f13d4bb..e6d533105f 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
@@ -32,6 +32,7 @@ import org.apache.maven.wagon.resource.Resource;
 /**
  * TransferListenerAdapter
  */
+@Deprecated
 public class TransferListenerAdapter implements TransferListener {
 
     private final ArtifactTransferListener listener;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
index a84448d9a0..957594f57c 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
@@ -27,6 +27,7 @@ import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
 /**
  * UpdateCheckManager
  */
+@Deprecated
 public interface UpdateCheckManager {
 
     boolean isUpdateRequired(Artifact artifact, ArtifactRepository repository);
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java
index 9236849e2e..1ebe551c8b 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java
@@ -23,6 +23,7 @@ import org.apache.maven.wagon.TransferFailedException;
 /**
  * WagonConfigurationException
  */
+@Deprecated
 public class WagonConfigurationException extends TransferFailedException {
 
     static final long serialVersionUID = 1;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
index 8dd0f6c282..697e86af6e 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
@@ -34,6 +34,7 @@ import org.apache.maven.wagon.repository.Repository;
 /**
  * WagonManager
  */
+@Deprecated
 public interface WagonManager {
     @Deprecated
     Wagon getWagon(String protocol) throws UnsupportedProtocolException;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
index 5ffe51aed1..2abe5ea84b 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
@@ -23,6 +23,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 
+@Deprecated
 public interface ArtifactRepositoryFactory {
 
     String DEFAULT_LAYOUT_ID = "default";
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
index ee753ba898..34dd8e860d 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
@@ -35,6 +35,7 @@ import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout2;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultArtifactRepositoryFactory implements ArtifactRepositoryFactory {
     // TODO use settings?
     private String globalUpdatePolicy;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
index 16b1b0f39e..01ace06381 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
@@ -60,6 +60,7 @@ import org.codehaus.plexus.logging.Logger;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultLegacyArtifactCollector implements LegacyArtifactCollector {
 
     @Inject
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java
index 999c5dec44..00846bf5ee 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java
@@ -24,6 +24,7 @@ import org.apache.maven.artifact.resolver.ResolutionNode;
  * Determines which version of an artifact to use when there are conflicting declarations.
  *
  */
+@Deprecated
 public interface ConflictResolver {
     String ROLE = ConflictResolver.class.getName();
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverFactory.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverFactory.java
index 92372f7cb2..ecda46077c 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverFactory.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverFactory.java
@@ -24,6 +24,7 @@ package org.apache.maven.repository.legacy.resolver.conflict;
  * @see ConflictResolver
  * @since 3.0
  */
+@Deprecated
 public interface ConflictResolverFactory {
     // constants --------------------------------------------------------------
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverNotFoundException.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverNotFoundException.java
index e2e465d0f0..e8213c4701 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverNotFoundException.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverNotFoundException.java
@@ -23,6 +23,7 @@ package org.apache.maven.repository.legacy.resolver.conflict;
  *
  * @since 3.0
  */
+@Deprecated
 public class ConflictResolverNotFoundException extends Exception {
     // constants --------------------------------------------------------------
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java
index 902ef570b4..cfe9cd4378 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java
@@ -37,6 +37,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultConflictResolverFactory implements ConflictResolverFactory, Contextualizable {
     // fields -----------------------------------------------------------------
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java
index 3b8c8433a6..b3dc4772a7 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java
@@ -31,6 +31,7 @@ import org.apache.maven.artifact.resolver.ResolutionNode;
  */
 @Named("farthest")
 @Singleton
+@Deprecated
 public class FarthestConflictResolver implements ConflictResolver {
     // ConflictResolver methods -----------------------------------------------
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java
index f0e8069a3b..7d2bccc23e 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java
@@ -31,6 +31,7 @@ import org.apache.maven.artifact.resolver.ResolutionNode;
  */
 @Named("nearest")
 @Singleton
+@Deprecated
 public class NearestConflictResolver implements ConflictResolver {
     // ConflictResolver methods -----------------------------------------------
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java
index 7f31dccf7d..10cadb204d 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java
@@ -34,6 +34,7 @@ import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
  */
 @Named("newest")
 @Singleton
+@Deprecated
 public class NewestConflictResolver implements ConflictResolver {
     // ConflictResolver methods -----------------------------------------------
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java
index 6dc2a9979e..bd15924812 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java
@@ -34,6 +34,7 @@ import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
  */
 @Named("oldest")
 @Singleton
+@Deprecated
 public class OldestConflictResolver implements ConflictResolver {
     // ConflictResolver methods -----------------------------------------------
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java
index 2a0c154c64..f86ea3bc58 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java
@@ -43,6 +43,7 @@ import org.codehaus.plexus.logging.AbstractLogEnabled;
  *
  * TODO try and refactor to remove abstract methods - not particular happy about current design
  */
+@Deprecated
 public abstract class AbstractVersionTransformation extends AbstractLogEnabled implements ArtifactTransformation {
     @Inject
     protected RepositoryMetadataManager repositoryMetadataManager;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
index 3dbd849a3d..ddda6402f6 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
@@ -30,6 +30,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 
 /**
  */
+@Deprecated
 public interface ArtifactTransformation {
     String ROLE = ArtifactTransformation.class.getName();
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
index 0ef1c95ad3..f86d9a16c3 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
@@ -31,6 +31,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 /**
  * Manages multiple ArtifactTransformation instances and applies them in succession.
  */
+@Deprecated
 public interface ArtifactTransformationManager {
     String ROLE = ArtifactTransformationManager.class.getName();
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
index 631caf8aa6..8eef94e9f3 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
@@ -40,6 +40,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultArtifactTransformationManager implements ArtifactTransformationManager {
 
     private List<ArtifactTransformation> artifactTransformations;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java
index 437e936c79..53468900cb 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java
@@ -34,6 +34,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException;
  */
 @Named("latest")
 @Singleton
+@Deprecated
 public class LatestArtifactTransformation extends AbstractVersionTransformation {
 
     public void transformForResolve(Artifact artifact, RepositoryRequest request)
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java
index 8594a0fb72..abc20e2cd2 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java
@@ -37,6 +37,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException;
  */
 @Named("release")
 @Singleton
+@Deprecated
 public class ReleaseArtifactTransformation extends AbstractVersionTransformation {
 
     public void transformForResolve(Artifact artifact, RepositoryRequest request)
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
index f0272413c8..08765b247e 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
@@ -44,6 +44,7 @@ import org.codehaus.plexus.util.StringUtils;
  */
 @Named("snapshot")
 @Singleton
+@Deprecated
 public class SnapshotTransformation extends AbstractVersionTransformation {
     private static final String DEFAULT_SNAPSHOT_TIMESTAMP_FORMAT = "yyyyMMdd.HHmmss";
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
index 4049e076ff..b0a231f3df 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
@@ -27,6 +27,7 @@ import org.apache.maven.artifact.ArtifactScopeEnum;
  * Artifact Metadata that is resolved independent of Artifact itself.
  *
  */
+@Deprecated
 public class ArtifactMetadata {
     /**
      * standard glorified artifact coordinates
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
index 0925a3610e..ad1937a4b1 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
@@ -29,6 +29,7 @@ import org.apache.maven.artifact.ArtifactScopeEnum;
  *
  *
  */
+@Deprecated
 public class ClasspathContainer implements Iterable<ArtifactMetadata> {
     private List<ArtifactMetadata> classpath;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java
index 26a35c6e95..746ea81a0f 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java
@@ -25,6 +25,7 @@ import org.apache.maven.artifact.ArtifactScopeEnum;
  *
  *
  */
+@Deprecated
 public interface ClasspathTransformation {
     String ROLE = ClasspathTransformation.class.getName();
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
index 2578f0d832..5a41c607d7 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
@@ -35,6 +35,7 @@ import org.apache.maven.artifact.ArtifactScopeEnum;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultClasspathTransformation implements ClasspathTransformation {
     @Inject
     GraphConflictResolver conflictResolver;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java
index 568354db11..71a66895cd 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java
@@ -30,6 +30,7 @@ import org.codehaus.plexus.component.annotations.Configuration;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultGraphConflictResolutionPolicy implements GraphConflictResolutionPolicy {
     /**
      * artifact, closer to the entry point, is selected
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
index 9e5c0bba04..55bad67432 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
@@ -34,6 +34,7 @@ import org.apache.maven.artifact.ArtifactScopeEnum;
  */
 @Named
 @Singleton
+@Deprecated
 public class DefaultGraphConflictResolver implements GraphConflictResolver {
     /**
      * artifact, closer to the entry point, is selected
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java
index 0431048f7c..68a22c99a4 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java
@@ -22,6 +22,7 @@ package org.apache.maven.repository.metadata;
  *
  *
  */
+@Deprecated
 public class GraphConflictResolutionException extends Exception {
     private static final long serialVersionUID = 2677613140287940255L;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java
index 5d066a981d..0662dfffed 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java
@@ -24,6 +24,7 @@ package org.apache.maven.repository.metadata;
  *
  *
  */
+@Deprecated
 public interface GraphConflictResolutionPolicy {
     String ROLE = GraphConflictResolutionPolicy.class.getName();
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java
index d699b34ec1..e573f82fe0 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java
@@ -25,6 +25,7 @@ import org.apache.maven.artifact.ArtifactScopeEnum;
  * Different implementations will implement different conflict resolution policies.
  *
  */
+@Deprecated
 public interface GraphConflictResolver {
     String ROLE = GraphConflictResolver.class.getName();
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
index edfdfe30ef..c226ff5701 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
@@ -31,6 +31,7 @@ import org.apache.maven.artifact.ArtifactScopeEnum;
  *
  *
  */
+@Deprecated
 public class MetadataGraph {
     public static final int DEFAULT_VERTICES = 32;
     public static final int DEFAULT_EDGES = 64;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
index 721c98a783..161b9beef9 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
@@ -26,6 +26,7 @@ import org.apache.maven.artifact.ArtifactScopeEnum;
  *
  *
  */
+@Deprecated
 public class MetadataGraphEdge {
     String version;
     ArtifactScopeEnum scope;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
index 10b6297c6d..85e79fef60 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
@@ -20,6 +20,7 @@ package org.apache.maven.repository.metadata;
 
 /**
  */
+@Deprecated
 public class MetadataGraphTransformationException extends Exception {
 
     private static final long serialVersionUID = -4029897098314019152L;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
index f119f908ed..ee8a3b5757 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
@@ -24,6 +24,7 @@ import org.apache.maven.artifact.ArtifactScopeEnum;
  * metadata graph vertice - just a wrapper around artifact's metadata
  *
  */
+@Deprecated
 public class MetadataGraphVertex implements Comparable<MetadataGraphVertex> {
     ArtifactMetadata md;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
index 97c5f10edb..21d48366bd 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
@@ -26,6 +26,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
  *
  *
  */
+@Deprecated
 public class MetadataResolution {
     /** resolved MD  */
     private ArtifactMetadata artifactMetadata;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java
index 5d9efbc21a..ab18144c17 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java
@@ -21,6 +21,7 @@ package org.apache.maven.repository.metadata;
 /**
  * MetadataResolutionException
  */
+@Deprecated
 public class MetadataResolutionException extends Exception {
 
     public MetadataResolutionException() {
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
index a1d95f9c45..ec2bbecd6d 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
@@ -22,6 +22,7 @@ import java.util.List;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 
+@Deprecated
 public class MetadataResolutionRequest {
     protected ArtifactMetadata query;
     protected ArtifactRepository localRepository;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java
index 0183ea66a2..927464b7c4 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java
@@ -21,6 +21,7 @@ package org.apache.maven.repository.metadata;
 /**
  * MetadataResolutionRequestTypeEnum
  */
+@Deprecated
 public enum MetadataResolutionRequestTypeEnum {
     tree(1),
     graph(2),
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
index 9785869cfe..e5bd8f14ed 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
@@ -27,6 +27,7 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
  * Get rid of them after debugging
  *
  */
+@Deprecated
 public class MetadataResolutionResult {
     MetadataTreeNode treeRoot;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java
index 85a913bf4e..dd7d51ef54 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java
@@ -22,6 +22,7 @@ package org.apache.maven.repository.metadata;
  * Error while retrieving repository metadata from the repository.
  *
  */
+@Deprecated
 public class MetadataRetrievalException extends Exception {
 
     private ArtifactMetadata artifact;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java
index 11b58389a4..bab22f7000 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java
@@ -27,6 +27,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
  * artifact.
  *
  */
+@Deprecated
 public interface MetadataSource {
     String ROLE = MetadataSource.class.getName();
 
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java
index 60650ff8b9..7fbe882ad7 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java
@@ -26,6 +26,7 @@ import org.apache.maven.artifact.ArtifactScopeEnum;
  *
  *
  */
+@Deprecated
 public class MetadataTreeNode {
     ArtifactMetadata md; // this node
 
diff --git a/maven-compat/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java b/maven-compat/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 9bcd33b9f3..c669fcc449 100644
--- a/maven-compat/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ b/maven-compat/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -36,6 +36,7 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 /**
  */
+@Deprecated
 @Named
 @Singleton
 public class DefaultMavenSettingsBuilder extends AbstractLogEnabled implements MavenSettingsBuilder {
diff --git a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java
index fad67888ba..1378ab248b 100644
--- a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java
+++ b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java
@@ -21,6 +21,7 @@ package org.apache.maven.usability.plugin;
 /**
  * ExpressionDocumentationException
  */
+@Deprecated
 public class ExpressionDocumentationException extends Exception {
     static final long serialVersionUID = 1;
 
diff --git a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
index c6474a1b58..55b1a4ac17 100644
--- a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
+++ b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
@@ -34,6 +34,7 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 /**
  * ExpressionDocumenter
  */
+@Deprecated
 public class ExpressionDocumenter {
 
     private static final String[] EXPRESSION_ROOTS = {"project", "settings", "session", "plugin", "rootless"};