Merge pull request #17473 from aloubyansky/quarkusDeploymentOnlyClass…

…path Gradle: create quarkusDeploymentOnlyClasspath configuration
quarkusio · May 27, 2021 · 57dad8b · 57dad8b
2 parents 3ff1975 + d7e8da7
commit 57dad8b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/core/deployment/pom.xml b/core/deployment/pom.xml
@@ -18,6 +18,10 @@
             <groupId>org.aesh</groupId>
             <artifactId>readline</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wildfly.common</groupId>
             <artifactId>wildfly-common</artifactId>

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
@@ -66,6 +66,7 @@
 
 public class QuarkusModelBuilder implements ParameterizedToolingModelBuilder<ModelParameter> {
 
+    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<Dependency> collectExtensionDependencies(Project project,
             Collection<org.gradle.api.artifacts.Dependency> extensions) {
         final List<Dependency> 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/...ation-tests/gradle/src/test/resources/test-fixtures-multi-module/application/build.gradle b/...ation-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'))