remove some changes

Signed-off-by: tvallin <thibault.vallin@oracle.com>
tvallin · Jul 11, 2023 · e9b668b · e9b668b
1 parent 49938dc
commit e9b668b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/...ven-plugin/src/main/java/io/helidon/pico/maven/plugin/AbstractApplicationCreatorMojo.java b/...ven-plugin/src/main/java/io/helidon/pico/maven/plugin/AbstractApplicationCreatorMojo.java
@@ -120,9 +120,8 @@ static ToolsException noModuleFoundError(String moduleName) {
 
     String getThisModuleName() {
         Build build = getProject().getBuild();
-        String sourceDirectory = build.getSourceDirectory().replace("\\", "/");
-        Path basePath = toBasePath(sourceDirectory);
-        String moduleName = toSuggestedModuleName(basePath, Path.of(sourceDirectory), true).orElseThrow();
+        Path basePath = toBasePath(build.getSourceDirectory());
+        String moduleName = toSuggestedModuleName(basePath, Path.of(build.getSourceDirectory()), true).orElseThrow();
         if (isUnnamedModuleName(moduleName)) {
             // try to recover it from a previous tooling step
             String appPackageName = loadAppPackageName().orElse(null);

diff --git a/pico/maven-plugin/src/main/java/io/helidon/pico/maven/plugin/TestApplicationCreatorMojo.java b/pico/maven-plugin/src/main/java/io/helidon/pico/maven/plugin/TestApplicationCreatorMojo.java
@@ -101,7 +101,6 @@ List<Path> getSourceRootPaths() {
     LinkedHashSet<Path> getClasspathElements() {
         MavenProject project = getProject();
         String testOutputDirectory = project.getBuild().getTestOutputDirectory();
-        testOutputDirectory = Strings.normalizePath(testOutputDirectory);
         LinkedHashSet<Path> result = new LinkedHashSet<>(project.getTestArtifacts().size());
         result.add(new File(testOutputDirectory).toPath());
         for (Object a : project.getTestArtifacts()) {
@@ -119,10 +118,8 @@ LinkedHashSet<Path> getModulepathElements() {
     @Override
     String getThisModuleName() {
         Build build = getProject().getBuild();
-        String testOutputDirectory = Strings.normalizePath(build.getTestOutputDirectory());
-        String testSourceDirectory = Strings.normalizePath(build.getTestSourceDirectory());
-        Path basePath = toBasePath(testSourceDirectory);
-        String moduleName = toSuggestedModuleName(basePath, Path.of(testOutputDirectory), true).orElseThrow();
+        Path basePath = toBasePath(build.getTestSourceDirectory());
+        String moduleName = toSuggestedModuleName(basePath, Path.of(build.getTestOutputDirectory()), true).orElseThrow();
         return moduleName;
     }