MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Maven] fix: define the relative Maven configuration paths in the canonical way

Browse Source 
GitOrigin-RevId: 9502a7652790b19a9646d5f71c69ab669ab4d069
This commit is contained in:
Sergei Vorobyov
2024-07-31 13:52:50 +02:00
committed by intellij-monorepo-bot
parent fcc0f854e5
commit d7fd6abaac
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/maven-server-api/src/main/java/org/jetbrains/idea/maven/model/MavenConstants.java
View File

@@ -47,7 +47,7 @@ public final class MavenConstants {
public static final List<String> BASIC_PHASES =
Arrays.asList("clean", "validate", "compile", "test", "package", "verify", "install", "deploy", "site");
public static final String JVM_CONFIG_RELATIVE_PATH = "/.mvn/jvm.config";
public static final String MAVEN_CONFIG_RELATIVE_PATH = "/.mvn/maven.config";
public static final String MAVEN_WRAPPER_RELATIVE_PATH = "/.mvn/wrapper/maven-wrapper.properties";
public static final String JVM_CONFIG_RELATIVE_PATH = ".mvn/jvm.config";
public static final String MAVEN_CONFIG_RELATIVE_PATH = ".mvn/maven.config";
public static final String MAVEN_WRAPPER_RELATIVE_PATH = ".mvn/wrapper/maven-wrapper.properties";
}

8
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java
View File

@@ -18,7 +18,6 @@ import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.util.Consumer;
import com.intellij.util.PathUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jdom.Element;
import org.jetbrains.annotations.ApiStatus;
@@ -37,7 +36,6 @@ import org.jetbrains.idea.maven.utils.MavenJDOMUtil;
import org.jetbrains.idea.maven.utils.*;
import java.io.*;
import java.nio.file.Path;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;
@@ -713,8 +711,8 @@ public class MavenProject {
public void setConfigFileError(@Nullable String message) {
if (message != null) {
myState.myReadingProblems.add(new MavenProjectProblem(myFile.getPath() + MavenConstants.MAVEN_CONFIG_RELATIVE_PATH, message, SYNTAX,
true));
String mavenConfigPath = myFile.getPath() + "/" + MavenConstants.MAVEN_CONFIG_RELATIVE_PATH;
myState.myReadingProblems.add(new MavenProjectProblem(mavenConfigPath, message, SYNTAX, true));
}
}
@@ -1161,7 +1159,7 @@ public class MavenProject {
}
public static @NotNull Map<String, String> readConfigFile(final File baseDir, ConfigFileKind kind) {
File configFile = new File(baseDir + FileUtil.toSystemDependentName(kind.myRelativeFilePath));
File configFile = new File(baseDir, FileUtil.toSystemDependentName(kind.myRelativeFilePath));
ParametersList parametersList = new ParametersList();
if (configFile.isFile()) {