Skip to content

Commit ce7dc92

Browse files
committed
Add compile-only dependencies to the dev mode compiler classpath
1 parent 3f428b9 commit ce7dc92

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

core/deployment/src/main/java/io/quarkus/deployment/dev/QuarkusCompiler.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import io.quarkus.bootstrap.app.CuratedApplication;
2626
import io.quarkus.bootstrap.app.QuarkusBootstrap;
2727
import io.quarkus.fs.util.FileSystemProviders;
28+
import io.quarkus.maven.dependency.DependencyFlags;
2829
import io.quarkus.maven.dependency.ResolvedDependency;
2930
import io.quarkus.paths.PathCollection;
3031

@@ -67,7 +68,8 @@ public QuarkusCompiler(CuratedApplication application,
6768

6869
final boolean skipReloadableArtifacts = !application.hasReloadableArtifacts();
6970

70-
for (ResolvedDependency i : application.getApplicationModel().getRuntimeDependencies()) {
71+
for (ResolvedDependency i : application.getApplicationModel()
72+
.getDependenciesWithAnyFlag(DependencyFlags.COMPILE_ONLY | DependencyFlags.RUNTIME_CP)) {
7173
if (skipReloadableArtifacts) {
7274
paths.addAll(i.getContentTree().getRoots());
7375
} else {

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTest.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
import org.gradle.api.artifacts.Configuration;
66
import org.gradle.api.tasks.Internal;
77

8+
import io.quarkus.bootstrap.app.QuarkusBootstrap;
89
import io.quarkus.deployment.dev.DevModeCommandLineBuilder;
10+
import io.quarkus.deployment.dev.DevModeContext;
911
import io.quarkus.deployment.dev.IsolatedTestModeMain;
1012
import io.quarkus.gradle.extension.QuarkusPluginExtension;
1113
import io.quarkus.runtime.LaunchMode;
@@ -22,8 +24,12 @@ public QuarkusTest(Configuration quarkusDevConfiguration, QuarkusPluginExtension
2224

2325
@Override
2426
protected void modifyDevModeContext(DevModeCommandLineBuilder builder) {
25-
builder.entryPointCustomizer(
26-
devModeContext -> devModeContext.setAlternateEntryPoint(IsolatedTestModeMain.class.getName()));
27+
builder.entryPointCustomizer(QuarkusTest::configureContinuousTesting);
28+
}
29+
30+
private static void configureContinuousTesting(DevModeContext devModeContext) {
31+
devModeContext.setMode(QuarkusBootstrap.Mode.CONTINUOUS_TEST);
32+
devModeContext.setAlternateEntryPoint(IsolatedTestModeMain.class.getName());
2733
}
2834

2935
@Override

devtools/maven/src/main/java/io/quarkus/maven/TestMojo.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package io.quarkus.maven;
22

3-
import java.util.function.Consumer;
4-
53
import org.apache.maven.plugins.annotations.LifecyclePhase;
64
import org.apache.maven.plugins.annotations.Mojo;
75
import org.apache.maven.plugins.annotations.ResolutionScope;
@@ -25,12 +23,11 @@ protected LaunchMode getLaunchModeClasspath() {
2523

2624
@Override
2725
protected void modifyDevModeContext(DevModeCommandLineBuilder builder) {
28-
builder.entryPointCustomizer(new Consumer<DevModeContext>() {
29-
@Override
30-
public void accept(DevModeContext devModeContext) {
31-
devModeContext.setMode(QuarkusBootstrap.Mode.CONTINUOUS_TEST);
32-
devModeContext.setAlternateEntryPoint(IsolatedTestModeMain.class.getName());
33-
}
34-
});
26+
builder.entryPointCustomizer(TestMojo::configureContinuousTesting);
27+
}
28+
29+
private static void configureContinuousTesting(DevModeContext devModeContext) {
30+
devModeContext.setMode(QuarkusBootstrap.Mode.CONTINUOUS_TEST);
31+
devModeContext.setAlternateEntryPoint(IsolatedTestModeMain.class.getName());
3532
}
3633
}

0 commit comments

Comments
 (0)