diff --git a/core/deployment/pom.xml b/core/deployment/pom.xml index 9c7582d95a120..6976efd549c85 100644 --- a/core/deployment/pom.xml +++ b/core/deployment/pom.xml @@ -18,6 +18,10 @@ org.aesh readline + + org.apache.commons + commons-lang3 + org.wildfly.common wildfly-common diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/builder/QuarkusModelBuilder.java b/devtools/gradle/src/main/java/io/quarkus/gradle/builder/QuarkusModelBuilder.java index b2e5c54933f0f..5ef8b13801193 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/builder/QuarkusModelBuilder.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/builder/QuarkusModelBuilder.java @@ -66,6 +66,7 @@ public class QuarkusModelBuilder implements ParameterizedToolingModelBuilder { + private static final String QUARKUS_DEPLOYMENT_ONLY_CLASSPATH = "quarkusDeploymentOnlyClasspath"; private static final String MAIN_RESOURCES_OUTPUT = "build/resources/main"; private static final String CLASSES_OUTPUT = "build/classes"; @@ -291,8 +292,13 @@ private List collectExtensionDependencies(Project project, Collection extensions) { final List platformDependencies = new LinkedList<>(); - final Configuration deploymentConfig = project.getConfigurations() - .detachedConfiguration(extensions.toArray(new org.gradle.api.artifacts.Dependency[0])); + Configuration deploymentConfig = project.getConfigurations().findByName(QUARKUS_DEPLOYMENT_ONLY_CLASSPATH); + if (deploymentConfig == null) { + deploymentConfig = project.getConfigurations().create(QUARKUS_DEPLOYMENT_ONLY_CLASSPATH) + .defaultDependencies(a -> { + a.addAll(extensions); + }); + } final ResolvedConfiguration rc = deploymentConfig.getResolvedConfiguration(); for (ResolvedArtifact a : rc.getResolvedArtifacts()) { if (!isDependency(a)) { diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/application/build.gradle b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/application/build.gradle index 569d9c30e7a6d..46c0222e379d2 100644 --- a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/application/build.gradle +++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/application/build.gradle @@ -17,6 +17,7 @@ repositories { dependencies { implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation 'io.quarkus:quarkus-resteasy' // Library-2 has to be dependency as implementation and test fixture implementation(project(':library-2'))