more

Author: aloubyansky

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

@@ -520,9 +520,10 @@ private static void configureApplicationModelTask(Project project, QuarkusApplic
         task.getLaunchMode().set(launchMode);
         task.getTypeModel().set(task.getPath());
         task.getOriginalClasspath().setFrom(classpath.getOriginalRuntimeClasspathAsInput());
-        task.getAppClasspath().configureFrom(classpath.getRuntimeConfigurationWithoutResolvingDeployment(), launchMode);
-        task.getPlatformConfiguration().configureFrom(classpath.getPlatformConfiguration(), launchMode);
-        task.getDeploymentClasspath().configureFrom(classpath.getDeploymentConfiguration(), launchMode);
+        task.getAppClasspath().configureFrom(classpath.getRuntimeConfigurationWithoutResolvingDeployment(), launchMode,
+                project.getName());
+        task.getPlatformConfiguration().configureFrom(classpath.getPlatformConfiguration(), launchMode, project.getName());
+        task.getDeploymentClasspath().configureFrom(classpath.getDeploymentConfiguration(), launchMode, project.getName());
         task.getDeploymentResolvedWorkaround().from(classpath.getDeploymentConfiguration().getIncoming().getFiles());
         task.getPlatformImports().set(classpath.getPlatformImportsWithoutResolvingPlatform());
         task.getApplicationModel().set(project.getLayout().getBuildDirectory().file(quarkusModelFile));

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

@@ -553,11 +553,10 @@ private QuarkusResolvedArtifact toResolvedArtifact(ResolvedArtifactResult result
             return new QuarkusResolvedArtifact(result.getId(), file, type);
         }
 
-        public void configureFrom(Configuration configuration, LaunchMode mode) {
+        public void configureFrom(Configuration configuration, LaunchMode mode, String appName) {
             ResolvableDependencies resolvableDependencies = configuration.getIncoming();
             getRoot().set(resolvableDependencies.getResolutionResult().getRootComponent());
             getResolvedArtifactCollection().set(resolvableDependencies.getArtifacts());
-            final String appName = resolvableDependencies.getResolutionResult().getRoot().getModuleVersion().getName();
             // TODO: Remove me, since we don't apply workspace plugin anymore, so there are no project descriptors
             getProjectDescriptors().setFrom(configuration.getIncoming().artifactView(viewConfiguration -> {
                 // Project descriptors make sense only for projects
@@ -566,8 +565,7 @@ public void configureFrom(Configuration configuration, LaunchMode mode) {
                 viewConfiguration.attributes(attributes -> {
                     attributes.attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE,
                             QUARKUS_PROJECT_DESCRIPTOR_ARTIFACT_TYPE);
-                    attributes.attribute(DeploymentConfigurationResolver.getQuarkusDeploymentAttribute(appName, mode),
-                            DeploymentConfigurationResolver.getQuarkusDeploymentAttributeValue());
+                    DeploymentConfigurationResolver.setDeploymentAttributes(attributes, appName, mode);
                     ConditionalDependencyResolver.setConditionalAttributes(attributes, appName, mode);
                 });
             }).getFiles());

devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/dependency/ConditionalDependencyResolver.java

@@ -51,7 +51,7 @@ public static Attribute<String> getQuarkusConditionalDependencyAttribute(String
     }
 
     public static void setConditionalAttributes(AttributeContainer attributes, String appName, LaunchMode mode) {
-        attributes.attribute(ConditionalDependencyResolver.getQuarkusConditionalDependencyAttribute(appName, mode), ON);
+        attributes.attribute(getQuarkusConditionalDependencyAttribute(appName, mode), ON);
     }
 
     public static void resolve(Project project, LaunchMode mode, TaskDependencyFactory taskDependencyFactory) {

devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/dependency/DeploymentConfigurationResolver.java

@@ -31,6 +31,7 @@
 public class DeploymentConfigurationResolver {
 
     private static final byte COLLECT_TOP_EXTENSIONS = 0b001;
+    private static final String ON = "on";
 
     public static Attribute<String> getQuarkusDeploymentAttribute(String projectName, LaunchMode mode) {
         var sb = new StringBuilder().append(projectName)
@@ -41,8 +42,12 @@ public static Attribute<String> getQuarkusDeploymentAttribute(String projectName
         return Attribute.of(sb.toString(), String.class);
     }
 
-    public static String getQuarkusDeploymentAttributeValue() {
-        return "on";
+    public static void setDeploymentAttributes(AttributeContainer attributes, String appName, LaunchMode mode) {
+        selectDeploymentAttribute(attributes, getQuarkusDeploymentAttribute(appName, mode));
+    }
+
+    private static void selectDeploymentAttribute(AttributeContainer attrs, Attribute<String> attr) {
+        attrs.attribute(attr, ON);
     }
 
     public static void registerDeploymentConfiguration(Project project, LaunchMode mode, String configurationName,
@@ -86,7 +91,7 @@ private DeploymentConfigurationResolver(Project project, Configuration deploymen
         })));
         final String appName = project.getName();
         deploymentConfig.attributes(attrs -> {
-            attrs.attribute(quarkusDepAttr, getQuarkusDeploymentAttributeValue());
+            selectDeploymentAttribute(attrs, quarkusDepAttr);
             ConditionalDependencyResolver.setConditionalAttributes(attrs, appName, mode);
         });
     }
@@ -178,7 +183,7 @@ static void addDeploymentVariant(Attribute<String> attribute,
     private static void addDeploymentVariant(Attribute<String> attribute, ComponentMetadataDetails compDetails,
             Dependency deploymentDependency, String baseVariant) {
         compDetails.maybeAddVariant(attribute.getName(), baseVariant, variant -> {
-            variant.attributes(attrs -> selectDeploymentAttribute(attribute, attrs));
+            variant.attributes(attrs -> selectDeploymentAttribute(attrs, attribute));
             variant.withDependencies(directDeps -> {
                 boolean alreadyAdded = false;
                 for (var directDep : directDeps) {
@@ -195,10 +200,6 @@ private static void addDeploymentVariant(Attribute<String> attribute, ComponentM
         });
     }
 
-    static void selectDeploymentAttribute(Attribute<String> attr, AttributeContainer attrs) {
-        attrs.attribute(attr, getQuarkusDeploymentAttributeValue());
-    }
-
     private Dependency getDeploymentDependency(ExtensionDependency<?> ext) {
         return ext.isProjectDependency()
                 ? DependencyUtils.createDeploymentProjectDependency((Project) ext.getDeploymentModule(), taskDependencyFactory)