diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/QuarkusCompiler.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/QuarkusCompiler.java index d21664b38385c..d4a07719f3d6d 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/QuarkusCompiler.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/QuarkusCompiler.java @@ -25,6 +25,7 @@ import io.quarkus.bootstrap.app.CuratedApplication; import io.quarkus.bootstrap.app.QuarkusBootstrap; import io.quarkus.fs.util.FileSystemProviders; +import io.quarkus.maven.dependency.DependencyFlags; import io.quarkus.maven.dependency.ResolvedDependency; import io.quarkus.paths.PathCollection; @@ -67,7 +68,8 @@ public QuarkusCompiler(CuratedApplication application, final boolean skipReloadableArtifacts = !application.hasReloadableArtifacts(); - for (ResolvedDependency i : application.getApplicationModel().getRuntimeDependencies()) { + for (ResolvedDependency i : application.getApplicationModel() + .getDependenciesWithAnyFlag(DependencyFlags.COMPILE_ONLY | DependencyFlags.RUNTIME_CP)) { if (skipReloadableArtifacts) { paths.addAll(i.getContentTree().getRoots()); } else { diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTest.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTest.java index a29163ebc26ec..102a83cf43f60 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTest.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTest.java @@ -5,7 +5,9 @@ import org.gradle.api.artifacts.Configuration; import org.gradle.api.tasks.Internal; +import io.quarkus.bootstrap.app.QuarkusBootstrap; import io.quarkus.deployment.dev.DevModeCommandLineBuilder; +import io.quarkus.deployment.dev.DevModeContext; import io.quarkus.deployment.dev.IsolatedTestModeMain; import io.quarkus.gradle.extension.QuarkusPluginExtension; import io.quarkus.runtime.LaunchMode; @@ -22,8 +24,12 @@ public QuarkusTest(Configuration quarkusDevConfiguration, QuarkusPluginExtension @Override protected void modifyDevModeContext(DevModeCommandLineBuilder builder) { - builder.entryPointCustomizer( - devModeContext -> devModeContext.setAlternateEntryPoint(IsolatedTestModeMain.class.getName())); + builder.entryPointCustomizer(QuarkusTest::configureContinuousTesting); + } + + private static void configureContinuousTesting(DevModeContext devModeContext) { + devModeContext.setMode(QuarkusBootstrap.Mode.CONTINUOUS_TEST); + devModeContext.setAlternateEntryPoint(IsolatedTestModeMain.class.getName()); } @Override diff --git a/devtools/maven/src/main/java/io/quarkus/maven/TestMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/TestMojo.java index 3f64fb0a2ed34..c8ad28e56785d 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/TestMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/TestMojo.java @@ -1,7 +1,5 @@ package io.quarkus.maven; -import java.util.function.Consumer; - import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.ResolutionScope; @@ -25,12 +23,11 @@ protected LaunchMode getLaunchModeClasspath() { @Override protected void modifyDevModeContext(DevModeCommandLineBuilder builder) { - builder.entryPointCustomizer(new Consumer() { - @Override - public void accept(DevModeContext devModeContext) { - devModeContext.setMode(QuarkusBootstrap.Mode.CONTINUOUS_TEST); - devModeContext.setAlternateEntryPoint(IsolatedTestModeMain.class.getName()); - } - }); + builder.entryPointCustomizer(TestMojo::configureContinuousTesting); + } + + private static void configureContinuousTesting(DevModeContext devModeContext) { + devModeContext.setMode(QuarkusBootstrap.Mode.CONTINUOUS_TEST); + devModeContext.setAlternateEntryPoint(IsolatedTestModeMain.class.getName()); } }