avoiding resolving when configuring application model task

cdsap · Oct 9, 2024 · 0643aa7 · 0643aa7
1 parent b779ee9
commit 0643aa7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java
@@ -519,10 +519,10 @@ private static void configureApplicationModelTask(Project project, QuarkusApplic
         task.getProjectDescriptor().set(projectDescriptor);
         task.getLaunchMode().set(launchMode);
         task.getOriginalClasspath().setFrom(classpath.getOriginalRuntimeClasspathAsInput());
-        task.getAppClasspath().configureFrom(classpath.getRuntimeConfiguration());
+        task.getAppClasspath().configureFrom(classpath.getRuntimeConfigurationWithoutResolvingDeployment());
         task.getPlatformConfiguration().configureFrom(classpath.getPlatformConfiguration());
         task.getDeploymentClasspath().configureFrom(classpath.getDeploymentConfiguration());
-        task.getPlatformImportProperties().set(classpath.getPlatformImports().getPlatformProperties());
+        task.getPlatformImportProperties().set(classpath.getPlatformImportsWithoutResolvingPlatform().getPlatformProperties());
         task.getApplicationModel().set(
                 project.getLayout().getBuildDirectory()
                         .file(quarkusModelFile));

diff --git a/...del/src/main/java/io/quarkus/gradle/dependency/ApplicationDeploymentClasspathBuilder.java b/...del/src/main/java/io/quarkus/gradle/dependency/ApplicationDeploymentClasspathBuilder.java
@@ -288,6 +288,10 @@ public Configuration getRuntimeConfiguration() {
         return project.getConfigurations().getByName(this.runtimeConfigurationName);
     }
 
+    public Configuration getRuntimeConfigurationWithoutResolvingDeployment() {
+        return project.getConfigurations().getByName(this.runtimeConfigurationName);
+    }
+
     public Configuration getDeploymentConfiguration() {
         return project.getConfigurations().getByName(this.deploymentConfigurationName);
     }
@@ -308,6 +312,10 @@ public PlatformImports getPlatformImports() {
         return platformImports.get(this.platformImportName);
     }
 
+    public PlatformImports getPlatformImportsWithoutResolvingPlatform() {
+        return platformImports.get(this.platformImportName);
+    }
+
     private Set<ExtensionDependency<?>> collectFirstMetQuarkusExtensions(Configuration configuration,
             Collection<ExtensionDependency<?>> knownExtensions) {