[MNG-7959] User controlled relocations Addendum (#1350)

Name the things. --- https://issues.apache.org/jira/browse/MNG-7959
apache · Dec 18, 2023 · 9596255 · 9596255
1 parent 57effdd
commit 9596255
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/...der/src/main/java/org/apache/maven/repository/internal/MavenArtifactRelocationSource.java b/...der/src/main/java/org/apache/maven/repository/internal/MavenArtifactRelocationSource.java
@@ -26,6 +26,8 @@
 
 /**
  * Maven relocation source.
+ * Note: implementations of this component should avoid the "default" name (has special meaning in Eclipse Sisu) and
+ * explicitly order implementations using Sisu priorities.
  *
  * @since 4.0.0
  */

diff --git a/.../maven/repository/internal/relocation/DistributionManagementArtifactRelocationSource.java b/.../maven/repository/internal/relocation/DistributionManagementArtifactRelocationSource.java
@@ -42,10 +42,11 @@
  * @since 4.0.0
  */
 @Singleton
-@Named
+@Named(DistributionManagementArtifactRelocationSource.NAME)
 @Priority(5)
 @SuppressWarnings("checkstyle:MagicNumber")
 public final class DistributionManagementArtifactRelocationSource implements MavenArtifactRelocationSource {
+    public static final String NAME = "distributionManagement";
     private static final Logger LOGGER = LoggerFactory.getLogger(DistributionManagementArtifactRelocationSource.class);
 
     @Override

diff --git a/...g/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java b/...g/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java
@@ -46,10 +46,11 @@
  * @since 4.0.0
  */
 @Singleton
-@Named
+@Named(UserPropertiesArtifactRelocationSource.NAME)
 @Priority(50)
 @SuppressWarnings("checkstyle:MagicNumber")
 public final class UserPropertiesArtifactRelocationSource implements MavenArtifactRelocationSource {
+    public static final String NAME = "userProperties";
     private static final Logger LOGGER = LoggerFactory.getLogger(UserPropertiesArtifactRelocationSource.class);
 
     private static final String CONFIG_PROP_RELOCATIONS_ENTRIES = "maven.relocations.entries";