MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[maven]IDEA-327528 - deprecate idea.force.m2.home, use maven.repo.local system property

Browse Source 
GitOrigin-RevId: 9cc30832d98f881baa98daf58ea3c64841883a70
This commit is contained in:
Alexander Bubenchikov
2024-06-25 10:21:40 +00:00
committed by intellij-monorepo-bot
parent 0076d7e78f
commit 2221c4c6a8
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenPathMacroContributor.java
+2 -2
View File
@@ -16,8 +16,8 @@ final class MavenPathMacroContributor implements PathMacroContributor {
@Override
public void forceRegisterPathMacros(@NotNull Map<String, String> macros) {
if (System.getProperty(MavenUtil.PROP_FORCED_M2_HOME) != null) {
macros.put(PathMacrosImpl.MAVEN_REPOSITORY, System.getProperty(MavenUtil.PROP_FORCED_M2_HOME));
if (System.getProperty(MavenUtil.MAVEN_REPO_LOCAL) != null) {
macros.put(PathMacrosImpl.MAVEN_REPOSITORY, System.getProperty(MavenUtil.MAVEN_REPO_LOCAL));
}
}
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java
+21 -1
View File
@@ -136,7 +136,10 @@ public class MavenUtil {
public static final String LIB_DIR = "lib";
public static final String CLIENT_ARTIFACT_SUFFIX = "-client";
public static final String CLIENT_EXPLODED_ARTIFACT_SUFFIX = CLIENT_ARTIFACT_SUFFIX + " exploded";
protected static final String PROP_FORCED_M2_HOME = "idea.force.m2.home";
@Deprecated
private static final String PROP_FORCED_M2_HOME = "idea.force.m2.home";
public static final String MAVEN_REPO_LOCAL = "maven.repo.local";
@SuppressWarnings("unchecked")
private static final Pair<Pattern, String>[] SUPER_POM_PATHS = new Pair[]{
@@ -945,11 +948,21 @@ public class MavenUtil {
@NotNull
public static File resolveDefaultLocalRepository() {
String mavenRepoLocal = System.getProperty(MAVEN_REPO_LOCAL);
if (mavenRepoLocal != null) {
MavenLog.LOG.info("using " + MAVEN_REPO_LOCAL + "=" + mavenRepoLocal + " as maven home");
return new File(mavenRepoLocal);
}
String forcedM2Home = System.getProperty(PROP_FORCED_M2_HOME);
if (forcedM2Home != null) {
MavenLog.LOG.error(PROP_FORCED_M2_HOME + " is deprecated, use maven.repo.local property instead");
return new File(forcedM2Home);
}
File result = doResolveLocalRepository(resolveUserSettingsFile(null), null);
if (result == null) {
result = new File(resolveM2Dir(), REPOSITORY_DIR);
}
@@ -968,10 +981,17 @@ public class MavenUtil {
@Nullable String overriddenUserSettingsFile) {
String forcedM2Home = System.getProperty(PROP_FORCED_M2_HOME);
if (forcedM2Home != null) {
MavenLog.LOG.error(PROP_FORCED_M2_HOME + " is deprecated, use maven.repo.local property instead");
return new File(forcedM2Home);
}
File result = null;
if (!isEmptyOrSpaces(overriddenLocalRepository)) result = new File(overriddenLocalRepository);
String localRepoHome = System.getProperty(MAVEN_REPO_LOCAL);
if (localRepoHome != null) {
MavenLog.LOG.debug("Using " + MAVEN_REPO_LOCAL + "=" + localRepoHome);
return new File(localRepoHome);
}
if (result == null) {
result = doResolveLocalRepository(resolveUserSettingsFile(overriddenUserSettingsFile),
resolveGlobalSettingsFile(mavenHomeType));