diff --git a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapMojo.java index 031a190bb73f9..654ee6cb4dce2 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapMojo.java @@ -53,7 +53,11 @@ public abstract class QuarkusBootstrapMojo extends AbstractMojo { @Parameter(defaultValue = "${project.build.finalName}") private String finalName; + /** + * @deprecated use {@code quarkus.package.type} instead + */ @Parameter(property = "uberJar", defaultValue = "false") + @Deprecated private boolean uberJar; /** @@ -145,6 +149,10 @@ protected String[] ignoredEntries() { } protected boolean uberJar() { + if (uberJar) { + getLog().warn( + "The parameter uberJar is deprecated, and will be removed in a future version. To build an uber-jar set the config property quarkus.package.type=uber-jar. For more info see https://quarkus.io/guides/maven-tooling#uber-jar-maven"); + } return uberJar; } diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/base/pom.tpl.qute.xml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/base/pom.tpl.qute.xml index 7e2317ed68399..45b8902c61187 100644 --- a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/base/pom.tpl.qute.xml +++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/base/pom.tpl.qute.xml @@ -18,6 +18,9 @@ {quarkus.maven-plugin.version} {maven-compiler-plugin.version} {maven-surefire-plugin.version} + {#if uberjar} + uber-jar + {/if} @@ -102,11 +105,6 @@ {quarkus.maven-plugin.artifact-id} $\{quarkus-plugin.version} true - {#if uberjar} - - true - - {/if} diff --git a/docs/src/main/asciidoc/maven-tooling.adoc b/docs/src/main/asciidoc/maven-tooling.adoc index 7b7116c9df464..b4e0ce06159eb 100644 --- a/docs/src/main/asciidoc/maven-tooling.adoc +++ b/docs/src/main/asciidoc/maven-tooling.adoc @@ -506,7 +506,8 @@ If you have not used <>, add the following [[uber-jar-maven]] === Uber-Jar Creation -Quarkus Maven plugin supports the generation of Uber-Jars by specifying a `quarkus.package.type=uber-jar` configuration option in your `application.properties`. +Quarkus Maven plugin supports the generation of Uber-Jars by specifying a `quarkus.package.type=uber-jar` configuration option in your `application.properties` +(or `uber-jar` in your `pom.xml`). The original jar will still be present in the `target` directory but it will be renamed to contain the `.original` suffix. diff --git a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/pom.xml index 254fd89bb7cf8..67874a6be94b0 100644 --- a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/pom.xml +++ b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/pom.xml @@ -25,6 +25,7 @@ ${resourceGroup} ${function} ${project.build.directory}/azure-functions/${functionAppName} + uber-jar @@ -79,9 +80,6 @@ io.quarkus quarkus-maven-plugin ${quarkus-plugin.version} - - true - diff --git a/integration-tests/maven/src/test/resources/projects/command-mode-app-args-plugin-config/pom.xml b/integration-tests/maven/src/test/resources/projects/command-mode-app-args-plugin-config/pom.xml index 0ade0f86ba547..9cf6bf6a2c247 100644 --- a/integration-tests/maven/src/test/resources/projects/command-mode-app-args-plugin-config/pom.xml +++ b/integration-tests/maven/src/test/resources/projects/command-mode-app-args-plugin-config/pom.xml @@ -13,6 +13,7 @@ 1.8 UTF-8 1.8 + uber-jar @@ -54,7 +55,6 @@ plugin pom config - true diff --git a/integration-tests/maven/src/test/resources/projects/ignore-entries-uber-jar/pom.xml b/integration-tests/maven/src/test/resources/projects/ignore-entries-uber-jar/pom.xml index 248df4d59f14b..d1fdbfd9bd357 100644 --- a/integration-tests/maven/src/test/resources/projects/ignore-entries-uber-jar/pom.xml +++ b/integration-tests/maven/src/test/resources/projects/ignore-entries-uber-jar/pom.xml @@ -13,6 +13,7 @@ 1.8 UTF-8 1.8 + uber-jar @@ -44,7 +45,6 @@ quarkus-maven-plugin ${quarkus-plugin.version} - true META-INF/swagger-ui-files/swagger-ui-bundle.js.map META-INF/swagger-ui-files/swagger-ui-standalone-preset.js.map diff --git a/integration-tests/maven/src/test/resources/projects/uberjar-maven-plugin-config/pom.xml b/integration-tests/maven/src/test/resources/projects/uberjar-maven-plugin-config/pom.xml index e69c985eab070..19397b3c96c8a 100644 --- a/integration-tests/maven/src/test/resources/projects/uberjar-maven-plugin-config/pom.xml +++ b/integration-tests/maven/src/test/resources/projects/uberjar-maven-plugin-config/pom.xml @@ -13,6 +13,7 @@ 1.8 UTF-8 1.8 + uber-jar @@ -58,9 +59,6 @@ generate-code-tests build - - true -