(maven-resolver) branch master updated: [MRESOLVER-653] Support legacy 1.9.x split repository config (#649)

[cstamas]

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git


The following commit(s) were added to refs/heads/master by this push:
     new d06761dc [MRESOLVER-653] Support legacy 1.9.x split repository config 
(#649)
d06761dc is described below

commit d06761dcb0ca10bbcf0b13834d1f9f9b12cf9c82
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Sun Feb 2 15:10:10 2025 +0100

    [MRESOLVER-653] Support legacy 1.9.x split repository config (#649)
    
    Added legacy properties for now as private and undocumented keys.
    
    ---
    
    https://issues.apache.org/jira/browse/MRESOLVER-652
---
 .../LocalPathPrefixComposerFactorySupport.java     | 53 ++++++++++++++++++----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/LocalPathPrefixComposerFactorySupport.java
 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/LocalPathPrefixComposerFactorySupport.java
index 88c6bace..6c66e584 100644
--- 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/LocalPathPrefixComposerFactorySupport.java
+++ 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/LocalPathPrefixComposerFactorySupport.java
@@ -145,41 +145,76 @@ public abstract class 
LocalPathPrefixComposerFactorySupport implements LocalPath
 
     public static final String DEFAULT_SNAPSHOTS_PREFIX = "snapshots";
 
+    // Legacy support: properties were renamed in Resolver 2.0.x, but we 
should support 1.9.x properties as well
+    // These below are Resolver 1.9.x properties, are undocumented and shall 
be removed with Resolver 2.1.x (or later).
+
+    private static final String R1_CONF_PROP_SPLIT = 
"aether.enhancedLocalRepository.split";
+
+    private static final String R1_CONF_PROP_LOCAL_PREFIX = 
"aether.enhancedLocalRepository.localPrefix";
+
+    private static final String R1_CONF_PROP_SPLIT_LOCAL = 
"aether.enhancedLocalRepository.splitLocal";
+
+    private static final String R1_CONF_PROP_REMOTE_PREFIX = 
"aether.enhancedLocalRepository.remotePrefix";
+
+    private static final String R1_CONF_PROP_SPLIT_REMOTE = 
"aether.enhancedLocalRepository.splitRemote";
+
+    private static final String R1_CONF_PROP_SPLIT_REMOTE_REPOSITORY =
+            "aether.enhancedLocalRepository.splitRemoteRepository";
+
+    private static final String R1_CONF_PROP_SPLIT_REMOTE_REPOSITORY_LAST =
+            "aether.enhancedLocalRepository.splitRemoteRepositoryLast";
+
+    private static final String R1_CONF_PROP_RELEASES_PREFIX = 
"aether.enhancedLocalRepository.releasesPrefix";
+
+    private static final String R1_CONF_PROP_SNAPSHOTS_PREFIX = 
"aether.enhancedLocalRepository.snapshotsPrefix";
+
     protected boolean isSplit(RepositorySystemSession session) {
-        return ConfigUtils.getBoolean(session, DEFAULT_SPLIT, 
CONFIG_PROP_SPLIT);
+        return ConfigUtils.getBoolean(session, DEFAULT_SPLIT, 
CONFIG_PROP_SPLIT, R1_CONF_PROP_SPLIT);
     }
 
     protected String getLocalPrefix(RepositorySystemSession session) {
-        return ConfigUtils.getString(session, DEFAULT_LOCAL_PREFIX, 
CONFIG_PROP_LOCAL_PREFIX);
+        return ConfigUtils.getString(
+                session, DEFAULT_LOCAL_PREFIX, CONFIG_PROP_LOCAL_PREFIX, 
R1_CONF_PROP_LOCAL_PREFIX);
     }
 
     protected boolean isSplitLocal(RepositorySystemSession session) {
-        return ConfigUtils.getBoolean(session, DEFAULT_SPLIT_LOCAL, 
CONFIG_PROP_SPLIT_LOCAL);
+        return ConfigUtils.getBoolean(session, DEFAULT_SPLIT_LOCAL, 
CONFIG_PROP_SPLIT_LOCAL, R1_CONF_PROP_SPLIT_LOCAL);
     }
 
     protected String getRemotePrefix(RepositorySystemSession session) {
-        return ConfigUtils.getString(session, DEFAULT_REMOTE_PREFIX, 
CONFIG_PROP_REMOTE_PREFIX);
+        return ConfigUtils.getString(
+                session, DEFAULT_REMOTE_PREFIX, CONFIG_PROP_REMOTE_PREFIX, 
R1_CONF_PROP_REMOTE_PREFIX);
     }
 
     protected boolean isSplitRemote(RepositorySystemSession session) {
-        return ConfigUtils.getBoolean(session, DEFAULT_SPLIT_REMOTE, 
CONFIG_PROP_SPLIT_REMOTE);
+        return ConfigUtils.getBoolean(
+                session, DEFAULT_SPLIT_REMOTE, CONFIG_PROP_SPLIT_REMOTE, 
R1_CONF_PROP_SPLIT_REMOTE);
     }
 
     protected boolean isSplitRemoteRepository(RepositorySystemSession session) 
{
-        return ConfigUtils.getBoolean(session, 
DEFAULT_SPLIT_REMOTE_REPOSITORY, CONFIG_PROP_SPLIT_REMOTE_REPOSITORY);
+        return ConfigUtils.getBoolean(
+                session,
+                DEFAULT_SPLIT_REMOTE_REPOSITORY,
+                CONFIG_PROP_SPLIT_REMOTE_REPOSITORY,
+                R1_CONF_PROP_SPLIT_REMOTE_REPOSITORY);
     }
 
     protected boolean isSplitRemoteRepositoryLast(RepositorySystemSession 
session) {
         return ConfigUtils.getBoolean(
-                session, DEFAULT_SPLIT_REMOTE_REPOSITORY_LAST, 
CONFIG_PROP_SPLIT_REMOTE_REPOSITORY_LAST);
+                session,
+                DEFAULT_SPLIT_REMOTE_REPOSITORY_LAST,
+                CONFIG_PROP_SPLIT_REMOTE_REPOSITORY_LAST,
+                R1_CONF_PROP_SPLIT_REMOTE_REPOSITORY_LAST);
     }
 
     protected String getReleasesPrefix(RepositorySystemSession session) {
-        return ConfigUtils.getString(session, DEFAULT_RELEASES_PREFIX, 
CONFIG_PROP_RELEASES_PREFIX);
+        return ConfigUtils.getString(
+                session, DEFAULT_RELEASES_PREFIX, CONFIG_PROP_RELEASES_PREFIX, 
R1_CONF_PROP_RELEASES_PREFIX);
     }
 
     protected String getSnapshotsPrefix(RepositorySystemSession session) {
-        return ConfigUtils.getString(session, DEFAULT_SNAPSHOTS_PREFIX, 
CONFIG_PROP_SNAPSHOTS_PREFIX);
+        return ConfigUtils.getString(
+                session, DEFAULT_SNAPSHOTS_PREFIX, 
CONFIG_PROP_SNAPSHOTS_PREFIX, R1_CONF_PROP_SNAPSHOTS_PREFIX);
     }
 
     /**