Merge pull request #1130 from michalvavrik/feature/fix-remote-dev-mod…

…e-relative-path Fix remote DEV mode relative path in POM file
quarkus-qe · May 15, 2024 · f905b6e · f905b6e
2 parents 33a267d + 1023926
commit f905b6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/...st-core/src/main/java/io/quarkus/test/services/quarkus/QuarkusMavenPluginBuildHelper.java b/...st-core/src/main/java/io/quarkus/test/services/quarkus/QuarkusMavenPluginBuildHelper.java
@@ -12,7 +12,6 @@
 import static io.quarkus.test.utils.PropertiesUtils.toMvnSystemProperty;
 import static java.util.stream.Collectors.toSet;
 import static java.util.stream.Collectors.toUnmodifiableSet;
-import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.File;
 import java.io.IOException;
@@ -114,20 +113,12 @@ private static Set<String> findMavenCommandLineArgs() {
     }
 
     void prepareApplicationFolder() {
-        var mavenProjectRoot = prepareMavenProject();
-
-        try {
-            FileUtils.copyDirectoryTo(mavenProjectRoot, appFolder);
-            FileUtils.deleteFile(mavenProjectRoot.toFile());
-            resourceBuilder.copyResourcesToAppFolder();
-        } catch (Exception ex) {
-            fail("Failed to build Quarkus artifacts. Caused by " + ex);
-        }
+        prepareMavenProject(appFolder);
+        resourceBuilder.copyResourcesToAppFolder();
     }
 
-    private Path prepareMavenProject() {
+    private Path prepareMavenProject(Path mavenBuildProjectRoot) {
         // create new project root
-        Path mavenBuildProjectRoot = appFolder.resolve("mvn-build");
         FileUtils.recreateDirectory(mavenBuildProjectRoot);
 
         // add pom.xml copy to new project root
@@ -166,7 +157,7 @@ private Path prepareMavenProject() {
 
     Optional<Path> buildNativeExecutable() {
         Objects.requireNonNull(targetFolderForLocalArtifacts);
-        var mavenBuildProjectRoot = prepareMavenProject();
+        var mavenBuildProjectRoot = prepareMavenProject(appFolder.resolve("mvn-build"));
 
         // build artifact with Quarkus Maven Plugin
         try {

diff --git a/.../quarkus/test/services/quarkus/RemoteDevModeQuarkusApplicationManagedResourceBuilder.java b/.../quarkus/test/services/quarkus/RemoteDevModeQuarkusApplicationManagedResourceBuilder.java
@@ -50,6 +50,7 @@ public void init(Annotation annotation) {
         RemoteDevModeQuarkusApplication metadata = (RemoteDevModeQuarkusApplication) annotation;
         liveReloadPassword = metadata.password();
         setPropertiesFile(metadata.properties());
+        initAppClasses(new Class<?>[0]);
     }
 
     @Override
@@ -65,8 +66,7 @@ public ManagedResource build(ServiceContext context) {
     @Override
     protected void build() {
         try {
-            FileUtils.copyCurrentDirectoryTo(getContext().getServiceFolder());
-            copyResourcesToAppFolder();
+            new QuarkusMavenPluginBuildHelper(this, null).prepareApplicationFolder();
 
             // Create mutable jar
             installParentPomsIfNeeded();
@@ -119,7 +119,6 @@ protected ProcessBuilder prepareRemoteDevProcess() {
 
         List<String> command = MavenUtils.mvnCommand(getContext());
         command.add(withProperty(QuarkusProperties.PACKAGE_TYPE_NAME, QuarkusProperties.MUTABLE_JAR));
-        command.add(SKIP_CHECKSTYLE);
         command.add(withProperty(QUARKUS_LIVE_RELOAD_PASSWORD, liveReloadPassword));
         command.add(withProperty(QUARKUS_LIVE_RELOAD_URL,
                 managedResource.getURI(Protocol.HTTP).toString()));