Unify windows path for local M2 repo

spring-projects-experimental · Oct 9, 2023 · ffd9bb2 · ffd9bb2
1 parent 590cc44
commit ffd9bb2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/...nts/sbm-core/src/main/java/org/springframework/sbm/project/parser/MavenProjectParser.java b/...nts/sbm-core/src/main/java/org/springframework/sbm/project/parser/MavenProjectParser.java
@@ -39,6 +39,7 @@
 import org.springframework.sbm.build.impl.RewriteMavenParser;
 import org.springframework.sbm.engine.events.*;
 import org.springframework.sbm.scopes.ProjectMetadata;
+import org.springframework.sbm.utils.LinuxWindowsPathUnifier;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
@@ -73,9 +74,10 @@ public List<SourceFile> parse(Path projectDirectory, List<Resource> resources) {
         projectMetadata.setMavenSettings(mavenSettings);
         MavenExecutionContextView mavenExecutionContext = MavenExecutionContextView.view(executionContext);
         mavenExecutionContext.setMavenSettings(mavenSettings);
-//        if(mavenExecutionContext.getLocalRepository() == null) {
-        MavenExecutionContextView.view(executionContext).setLocalRepository(new MavenRepository("local", "file://" + Path.of(System.getProperty("user.home")).resolve(".m2/repository"), null, null, false, null, null, null));
-//        }
+        Path localRepo = Path.of(System.getProperty("user.home")).resolve(".m2/repository");
+        String unifiedLocalRepo = LinuxWindowsPathUnifier.unifyPath(localRepo);
+        String uri = "%s://%s".formatted("file", unifiedLocalRepo);
+        MavenExecutionContextView.view(executionContext).setLocalRepository(new MavenRepository("local", uri, null, null, false, null, null, null));
         // default local repo provided by MavenExecutionContextView misses two '/' in the path
         mavenConfigHandler.injectMavenConfigIntoSystemProperties(resources);
 

diff --git a/...onents/sbm-utils/src/main/java/org/springframework/sbm/utils/LinuxWindowsPathUnifier.java b/...onents/sbm-utils/src/main/java/org/springframework/sbm/utils/LinuxWindowsPathUnifier.java
@@ -21,23 +21,23 @@
 
 public class LinuxWindowsPathUnifier {
 
-    public String unifyPath(Path path) {
+    public static String unifyPath(Path path) {
         return unifyPath(path.toString());
     }
 
-    public String unifyPath(String path) {
+    public static String unifyPath(String path) {
         path = StringUtils.cleanPath(path);
         if (isWindows()) {
             path = transformToLinuxPath(path);
         }
         return path;
     }
 
-    boolean isWindows() {
+    public static boolean isWindows() {
         return System.getProperty("os.name").contains("Windows");
     }
 
-    private String transformToLinuxPath(String path) {
+    private static String transformToLinuxPath(String path) {
         return path.replaceAll("^[\\w]+:\\/?", "/");
     }
 }