From 2ae4cb98d8849575df1573478038547b2609e012 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Mon, 8 Sep 2025 15:49:47 +0200 Subject: [PATCH 1/3] fix(QTDI-1963): fix windows path for rootRepo --- .../org/talend/sdk/component/container/ContainerManager.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java b/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java index 488767caf300d..eeedb240241d8 100644 --- a/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java +++ b/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java @@ -33,7 +33,6 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; @@ -120,7 +119,7 @@ public ContainerManager(final DependenciesResolutionConfiguration dependenciesRe if (PathFactory.get(System.getProperty("user.home")).resolve(".m2/repository").equals(rootRepo)) { final URL nested = classLoaderConfiguration.getParent().getResource("MAVEN-INF/repository"); if (nested != null) { - rootRepo = Paths.get(nested.getFile().replace("file:", "")); + rootRepo = PathFactory.get(nested.getFile().replace("file:", "")); } } this.rootRepositoryLocation = rootRepo; From 4418b04e58e924bea673e7f21e419b72e4c03f4b Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Tue, 9 Sep 2025 09:39:34 +0200 Subject: [PATCH 2/3] fix(QTDI-1963): using java 11 method for path --- .../talend/sdk/component/container/ContainerManager.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java b/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java index eeedb240241d8..87efdfc1340d7 100644 --- a/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java +++ b/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java @@ -29,6 +29,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.net.URISyntaxException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -119,7 +120,11 @@ public ContainerManager(final DependenciesResolutionConfiguration dependenciesRe if (PathFactory.get(System.getProperty("user.home")).resolve(".m2/repository").equals(rootRepo)) { final URL nested = classLoaderConfiguration.getParent().getResource("MAVEN-INF/repository"); if (nested != null) { - rootRepo = PathFactory.get(nested.getFile().replace("file:", "")); + try { + rootRepo = Path.of(nested.toURI()); + } catch (URISyntaxException e) { + info("Cannot convert MAVEN-INF/repository url to path: " + e.getMessage()); + } } } this.rootRepositoryLocation = rootRepo; From 46e6916711fcee409a773ed23a4aa808e993ef9c Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Thu, 11 Sep 2025 16:11:30 +0200 Subject: [PATCH 3/3] fix(QTDI-1963): revert java 11 method for path --- .../talend/sdk/component/container/ContainerManager.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java b/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java index 87efdfc1340d7..a8fd3b69afba2 100644 --- a/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java +++ b/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java @@ -29,7 +29,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.URISyntaxException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -120,11 +119,7 @@ public ContainerManager(final DependenciesResolutionConfiguration dependenciesRe if (PathFactory.get(System.getProperty("user.home")).resolve(".m2/repository").equals(rootRepo)) { final URL nested = classLoaderConfiguration.getParent().getResource("MAVEN-INF/repository"); if (nested != null) { - try { - rootRepo = Path.of(nested.toURI()); - } catch (URISyntaxException e) { - info("Cannot convert MAVEN-INF/repository url to path: " + e.getMessage()); - } + rootRepo = PathFactory.get(nested.getFile().replace("file:", "")); } } this.rootRepositoryLocation = rootRepo;