Import properties from build.gradle and remove hardcoded quarkus.package.output-directory

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

@@ -3,13 +3,16 @@
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.StringJoiner;
 import java.util.stream.Collectors;
 
+import javax.annotation.Nullable;
+
 import org.gradle.api.Action;
 import org.gradle.api.Project;
 import org.gradle.api.file.FileCollection;
@@ -34,6 +37,8 @@ public class QuarkusPluginExtension {
     private final Project project;
 
     private final Property<String> finalName;
+
+    private Map<String, String> quarkusBuildProperties;
     private final SourceSetExtension sourceSetExtension;
 
     public QuarkusPluginExtension(Project project) {
@@ -43,6 +48,7 @@ public QuarkusPluginExtension(Project project) {
         finalName.convention(project.provider(() -> String.format("%s-%s", project.getName(), project.getVersion())));
 
         this.sourceSetExtension = new SourceSetExtension();
+        quarkusBuildProperties = new HashMap<>();
     }
 
     public void beforeTest(Test task) {
@@ -182,4 +188,13 @@ public Path appJarOrClasses() {
         }
         return classesDir;
     }
+
+    public Map<String, String> getQuarkusBuildProperties() {
+        return quarkusBuildProperties;
+    }
+
+    public void set(String name, @Nullable String value) {
+        quarkusBuildProperties.put(String.format("quarkus.%s", name), value);
+    }
+
 }

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

@@ -1,6 +1,8 @@
 package io.quarkus.gradle.tasks;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -16,6 +18,7 @@
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.java.archives.Attributes;
 import org.gradle.api.provider.MapProperty;
+import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Internal;
@@ -35,15 +38,20 @@
 import io.quarkus.maven.dependency.GACTV;
 import io.quarkus.runtime.util.StringUtil;
 
+@CacheableTask
 public abstract class QuarkusBuild extends QuarkusTask {
 
     private static final String NATIVE_PROPERTY_NAMESPACE = "quarkus.native";
     private static final String MANIFEST_SECTIONS_PROPERTY_PREFIX = "quarkus.package.manifest.manifest-sections";
     private static final String MANIFEST_ATTRIBUTES_PROPERTY_PREFIX = "quarkus.package.manifest.attributes";
 
+    private static final String OUTPUT_DIRECTORY = "quarkus.package.output-directory";
+
     private List<String> ignoredEntries = new ArrayList<>();
     private Manifest manifest = new Manifest();
 
+    private Properties applicationProperties = new Properties();
+
     @Inject
     public QuarkusBuild() {
         super("Quarkus builds a runner jar based on the build jar");
@@ -131,7 +139,8 @@ public File getNativeRunner() {
 
     @OutputDirectory
     public File getFastJar() {
-        return new File(getProject().getBuildDir(), "quarkus-app");
+        return new File(getProject().getBuildDir(),
+                this.getPropValueWithPrecedence(OUTPUT_DIRECTORY, java.util.Optional.of("quarkus-app")));
     }
 
     @TaskAction
@@ -223,4 +232,37 @@ private String expandConfigurationKey(String shortKey) {
         }
         return String.format("%s.%s", NATIVE_PROPERTY_NAMESPACE, hyphenatedKey);
     }
+
+    private String getPropValueWithPrecedence(final String propName, final java.util.Optional<String> defaultValue) {
+        if (applicationProperties.isEmpty()) {
+            FileCollection classpathFiles = getClasspath()
+                    .filter(file -> "application.properties".equalsIgnoreCase(file.getName()));
+            classpathFiles.forEach(file -> {
+                FileInputStream appPropsIS = null;
+                try {
+                    appPropsIS = new FileInputStream(file.getAbsoluteFile());
+                    applicationProperties.load(appPropsIS);
+                    appPropsIS.close();
+                } catch (IOException e) {
+                    if (appPropsIS != null) {
+                        try {
+                            appPropsIS.close();
+                        } catch (IOException ex) {
+                            // Ignore exception closing.
+                        }
+                    }
+                }
+            });
+        }
+        if (extension().getQuarkusBuildProperties().containsKey(propName)) {
+            return extension().getQuarkusBuildProperties().get(propName);
+        } else if (applicationProperties.contains(propName)) {
+            return applicationProperties.getProperty(propName);
+        } else if (getQuarkusBuildEnvProperties().containsKey(propName)) {
+            return getQuarkusBuildEnvProperties().get(propName);
+        } else if (defaultValue.isPresent()) {
+            return defaultValue.get();
+        }
+        return null;
+    }
 }

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

@@ -36,6 +36,12 @@ protected Properties getBuildSystemProperties(ResolvedDependency appArtifact) {
                 realProperties.setProperty(key, (String) value);
             }
         }
+        if (!extension().getQuarkusBuildProperties().isEmpty()) {
+            extension().getQuarkusBuildProperties().entrySet().stream().filter(entry -> entry.getKey().startsWith("quarkus."))
+                    .forEach(entry -> {
+                        realProperties.put(entry.getKey(), entry.getValue());
+                    });
+        }
         realProperties.putIfAbsent("quarkus.application.name", appArtifact.getArtifactId());
         realProperties.putIfAbsent("quarkus.application.version", appArtifact.getVersion());
         return realProperties;

integration-tests/gradle/src/main/resources/build-configuration/build.gradle

@@ -0,0 +1,20 @@
+plugins {
+    id 'java'
+    id 'io.quarkus' apply false
+}
+
+repositories {
+    mavenLocal {
+        content {
+            includeGroupByRegex 'io.quarkus.*'
+        }
+    }
+    mavenCentral()
+}
+
+test {
+    systemProperty "java.util.logging.manager", "org.jboss.logmanager.LogManager"
+}
+
+group = 'io.quarkus.gradle.test'
+version = '1.0'

integration-tests/gradle/src/main/resources/build-configuration/gradle.properties

@@ -0,0 +1,3 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
+quarkusPluginId=io.quarkus

integration-tests/gradle/src/main/resources/build-configuration/settings.gradle

@@ -0,0 +1,18 @@
+pluginManagement {
+    repositories {
+        mavenLocal {
+            content {
+                includeGroupByRegex 'io.quarkus.*'
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+        id "${quarkusPluginId}" version "${quarkusPluginVersion}"
+    }
+}
+
+include 'with-application-properties'
+include 'with-build-configuration'
+include 'without-configuration'

integration-tests/gradle/src/main/resources/build-configuration/with-application-properties/build.gradle

@@ -0,0 +1,44 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+}
+
+repositories {
+    mavenLocal {
+        content {
+            includeGroupByRegex 'io.quarkus.*'
+        }
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+
+    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.rest-assured:rest-assured'
+}
+
+group 'org.acme'
+version '1.0.0-SNAPSHOT'
+
+quarkus {
+    properties {
+        set("package.type", "fast-jar")
+        set("package.output-directory", "build-gradle-output-dir")
+    }
+}
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+}
+
+test {
+    systemProperty "java.util.logging.manager", "org.jboss.logmanager.LogManager"
+}

integration-tests/gradle/src/main/resources/build-configuration/with-application-properties/settings.gradle

@@ -0,0 +1,15 @@
+pluginManagement {
+    repositories {
+        mavenLocal {
+            content {
+                includeGroupByRegex 'io.quarkus.*'
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+        id "${quarkusPluginId}" version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name='with-application-properties'

integration-tests/gradle/src/main/resources/build-configuration/with-application-properties/src/main/java/org/acme/ExampleResource.java

@@ -0,0 +1,19 @@
+package org.acme;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+@Path("/hello")
+public class ExampleResource {
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+
+}

integration-tests/gradle/src/main/resources/build-configuration/with-application-properties/src/main/resources/application.properties

@@ -0,0 +1,5 @@
+# Configuration file
+# key = value
+my-app-name=${quarkus.application.name}
+quarkus.package.type=uber-jar
+quarkus.package.output-directory=application-properties-output-dir

integration-tests/gradle/src/main/resources/build-configuration/with-application-properties/src/test/resources/application.properties

@@ -0,0 +1,4 @@
+# Configuration file
+# key = value
+example.message=Hello from Test
+test-only=Test only

integration-tests/gradle/src/main/resources/build-configuration/with-build-configuration/build.gradle

@@ -0,0 +1,44 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+}
+
+repositories {
+    mavenLocal {
+        content {
+            includeGroupByRegex 'io.quarkus.*'
+        }
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+
+    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.rest-assured:rest-assured'
+}
+
+group 'org.acme'
+version '1.0.0-SNAPSHOT'
+
+quarkus {
+    properties {
+        set("package.type", "uber-jar")
+        set("package.output-directory", "build-gradle-output-dir")
+    }
+}
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+}
+
+test {
+    systemProperty "java.util.logging.manager", "org.jboss.logmanager.LogManager"
+}

integration-tests/gradle/src/main/resources/build-configuration/with-build-configuration/settings.gradle

@@ -0,0 +1,15 @@
+pluginManagement {
+    repositories {
+        mavenLocal {
+            content {
+                includeGroupByRegex 'io.quarkus.*'
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+        id "${quarkusPluginId}" version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name='with-build-configuration'

integration-tests/gradle/src/main/resources/build-configuration/with-build-configuration/src/main/java/org/acme/ExampleResource.java

@@ -0,0 +1,19 @@
+package org.acme;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+@Path("/hello")
+public class ExampleResource {
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+
+}

integration-tests/gradle/src/main/resources/build-configuration/with-build-configuration/src/main/resources/application.properties

@@ -0,0 +1,3 @@
+# Configuration file
+# key = value
+my-app-name=${quarkus.application.name}

integration-tests/gradle/src/main/resources/build-configuration/with-build-configuration/src/test/resources/application.properties

@@ -0,0 +1,4 @@
+# Configuration file
+# key = value
+example.message=Hello from Test
+test-only=Test only