Skip to content

[MRESOLVER-652] Support legacy 1.9.x split repository config #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 2, 2025
Merged

[MRESOLVER-652] Support legacy 1.9.x split repository config #649

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 44 additions & 9 deletions ...src/main/java/org/eclipse/aether/internal/impl/LocalPathPrefixComposerFactorySupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down