From 797c4a84c8f15d0586d1faf0d780006b8e8a6efa Mon Sep 17 00:00:00 2001 From: Ivan Franchin Date: Sat, 23 Jan 2021 11:09:26 -0300 Subject: [PATCH] update to quarkus 1.11.0.Final - update pom files and comment in docker files; - unable to build docker native images; in quarkus-simple-api, tried to downgrade the graalvm version but did not work, see https://github.com/quarkusio/quarkus/issues/14545 --- book-api/quarkus-book-api/pom.xml | 4 ++-- .../quarkus-book-api/src/main/docker/Dockerfile.fast-jar | 2 +- book-api/quarkus-book-api/src/main/docker/Dockerfile.jvm | 2 +- .../quarkus-book-api/src/main/docker/Dockerfile.native | 2 +- elasticsearch/quarkus-elasticsearch/pom.xml | 4 ++-- .../src/main/docker/Dockerfile.fast-jar | 2 +- .../quarkus-elasticsearch/src/main/docker/Dockerfile.jvm | 2 +- .../src/main/docker/Dockerfile.native | 2 +- .../quarkus-producer-consumer/consumer-api/pom.xml | 4 ++-- .../consumer-api/src/main/docker/Dockerfile.fast-jar | 2 +- .../consumer-api/src/main/docker/Dockerfile.jvm | 2 +- .../consumer-api/src/main/docker/Dockerfile.native | 2 +- .../quarkus-producer-consumer/producer-api/pom.xml | 4 ++-- .../producer-api/src/main/docker/Dockerfile.fast-jar | 2 +- .../producer-api/src/main/docker/Dockerfile.jvm | 2 +- .../producer-api/src/main/docker/Dockerfile.native | 2 +- simple-api/quarkus-simple-api/pom.xml | 4 ++-- .../quarkus-simple-api/src/main/docker/Dockerfile.fast-jar | 2 +- .../quarkus-simple-api/src/main/docker/Dockerfile.jvm | 2 +- .../quarkus-simple-api/src/main/docker/Dockerfile.native | 2 +- .../src/main/resources/application.properties | 7 ++++++- 21 files changed, 31 insertions(+), 26 deletions(-) diff --git a/book-api/quarkus-book-api/pom.xml b/book-api/quarkus-book-api/pom.xml index b738dd8..6ab263f 100644 --- a/book-api/quarkus-book-api/pom.xml +++ b/book-api/quarkus-book-api/pom.xml @@ -13,10 +13,10 @@ 11 UTF-8 UTF-8 - 1.10.5.Final + 1.11.0.Final quarkus-universe-bom io.quarkus - 1.10.5.Final + 1.11.0.Final 2.22.1 1.18.16 1.4.1.Final diff --git a/book-api/quarkus-book-api/src/main/docker/Dockerfile.fast-jar b/book-api/quarkus-book-api/src/main/docker/Dockerfile.fast-jar index 491b6a5..afb9471 100644 --- a/book-api/quarkus-book-api/src/main/docker/Dockerfile.fast-jar +++ b/book-api/quarkus-book-api/src/main/docker/Dockerfile.fast-jar @@ -3,7 +3,7 @@ # # Before building the container image run: # -# mvn package -Dquarkus.package.type=fast-jar +# ./mvnw package -Dquarkus.package.type=fast-jar # # Then, build the image with: # diff --git a/book-api/quarkus-book-api/src/main/docker/Dockerfile.jvm b/book-api/quarkus-book-api/src/main/docker/Dockerfile.jvm index f3a662c..701a860 100644 --- a/book-api/quarkus-book-api/src/main/docker/Dockerfile.jvm +++ b/book-api/quarkus-book-api/src/main/docker/Dockerfile.jvm @@ -3,7 +3,7 @@ # # Before building the container image run: # -# mvn package +# ./mvnw package # # Then, build the image with: # diff --git a/book-api/quarkus-book-api/src/main/docker/Dockerfile.native b/book-api/quarkus-book-api/src/main/docker/Dockerfile.native index 6d5d195..df6a275 100644 --- a/book-api/quarkus-book-api/src/main/docker/Dockerfile.native +++ b/book-api/quarkus-book-api/src/main/docker/Dockerfile.native @@ -3,7 +3,7 @@ # # Before building the container image run: # -# mvn package -Pnative -Dquarkus.native.container-build=true +# ./mvnw package -Pnative -Dquarkus.native.container-build=true # # Then, build the image with: # diff --git a/elasticsearch/quarkus-elasticsearch/pom.xml b/elasticsearch/quarkus-elasticsearch/pom.xml index 319f39e..7594e36 100644 --- a/elasticsearch/quarkus-elasticsearch/pom.xml +++ b/elasticsearch/quarkus-elasticsearch/pom.xml @@ -13,10 +13,10 @@ 11 UTF-8 UTF-8 - 1.10.5.Final + 1.11.0.Final quarkus-universe-bom io.quarkus - 1.10.5.Final + 1.11.0.Final 2.22.1 1.18.16 1.4.1.Final diff --git a/elasticsearch/quarkus-elasticsearch/src/main/docker/Dockerfile.fast-jar b/elasticsearch/quarkus-elasticsearch/src/main/docker/Dockerfile.fast-jar index b9bcc5d..1f94cf4 100644 --- a/elasticsearch/quarkus-elasticsearch/src/main/docker/Dockerfile.fast-jar +++ b/elasticsearch/quarkus-elasticsearch/src/main/docker/Dockerfile.fast-jar @@ -3,7 +3,7 @@ # # Before building the container image run: # -# mvn package -Dquarkus.package.type=fast-jar +# ./mvnw package -Dquarkus.package.type=fast-jar # # Then, build the image with: # diff --git a/elasticsearch/quarkus-elasticsearch/src/main/docker/Dockerfile.jvm b/elasticsearch/quarkus-elasticsearch/src/main/docker/Dockerfile.jvm index 33bc63a..41c4823 100644 --- a/elasticsearch/quarkus-elasticsearch/src/main/docker/Dockerfile.jvm +++ b/elasticsearch/quarkus-elasticsearch/src/main/docker/Dockerfile.jvm @@ -3,7 +3,7 @@ # # Before building the container image run: # -# mvn package +# ./mvnw package # # Then, build the image with: # diff --git a/elasticsearch/quarkus-elasticsearch/src/main/docker/Dockerfile.native b/elasticsearch/quarkus-elasticsearch/src/main/docker/Dockerfile.native index 5589862..41036d1 100644 --- a/elasticsearch/quarkus-elasticsearch/src/main/docker/Dockerfile.native +++ b/elasticsearch/quarkus-elasticsearch/src/main/docker/Dockerfile.native @@ -3,7 +3,7 @@ # # Before building the container image run: # -# mvn package -Pnative -Dquarkus.native.container-build=true +# ./mvnw package -Pnative -Dquarkus.native.container-build=true # # Then, build the image with: # diff --git a/producer-consumer/quarkus-producer-consumer/consumer-api/pom.xml b/producer-consumer/quarkus-producer-consumer/consumer-api/pom.xml index 12dd7d4..6405f07 100644 --- a/producer-consumer/quarkus-producer-consumer/consumer-api/pom.xml +++ b/producer-consumer/quarkus-producer-consumer/consumer-api/pom.xml @@ -13,10 +13,10 @@ 11 UTF-8 UTF-8 - 1.10.5.Final + 1.11.0.Final quarkus-universe-bom io.quarkus - 1.10.5.Final + 1.11.0.Final 2.22.1 1.18.16 diff --git a/producer-consumer/quarkus-producer-consumer/consumer-api/src/main/docker/Dockerfile.fast-jar b/producer-consumer/quarkus-producer-consumer/consumer-api/src/main/docker/Dockerfile.fast-jar index 4b0dd55..1733634 100644 --- a/producer-consumer/quarkus-producer-consumer/consumer-api/src/main/docker/Dockerfile.fast-jar +++ b/producer-consumer/quarkus-producer-consumer/consumer-api/src/main/docker/Dockerfile.fast-jar @@ -3,7 +3,7 @@ # # Before building the container image run: # -# mvn package -Dquarkus.package.type=fast-jar +# ./mvnw package -Dquarkus.package.type=fast-jar # # Then, build the image with: # diff --git a/producer-consumer/quarkus-producer-consumer/consumer-api/src/main/docker/Dockerfile.jvm b/producer-consumer/quarkus-producer-consumer/consumer-api/src/main/docker/Dockerfile.jvm index 04002a6..ad73bc4 100644 --- a/producer-consumer/quarkus-producer-consumer/consumer-api/src/main/docker/Dockerfile.jvm +++ b/producer-consumer/quarkus-producer-consumer/consumer-api/src/main/docker/Dockerfile.jvm @@ -3,7 +3,7 @@ # # Before building the container image run: # -# mvn package +# ./mvnw package # # Then, build the image with: # diff --git a/producer-consumer/quarkus-producer-consumer/consumer-api/src/main/docker/Dockerfile.native b/producer-consumer/quarkus-producer-consumer/consumer-api/src/main/docker/Dockerfile.native index 327cbac..8991e19 100644 --- a/producer-consumer/quarkus-producer-consumer/consumer-api/src/main/docker/Dockerfile.native +++ b/producer-consumer/quarkus-producer-consumer/consumer-api/src/main/docker/Dockerfile.native @@ -3,7 +3,7 @@ # # Before building the container image run: # -# mvn package -Pnative -Dquarkus.native.container-build=true +# ./mvnw package -Pnative -Dquarkus.native.container-build=true # # Then, build the image with: # diff --git a/producer-consumer/quarkus-producer-consumer/producer-api/pom.xml b/producer-consumer/quarkus-producer-consumer/producer-api/pom.xml index b4f0d2d..3cf34fa 100644 --- a/producer-consumer/quarkus-producer-consumer/producer-api/pom.xml +++ b/producer-consumer/quarkus-producer-consumer/producer-api/pom.xml @@ -13,10 +13,10 @@ 11 UTF-8 UTF-8 - 1.10.5.Final + 1.11.0.Final quarkus-universe-bom io.quarkus - 1.10.5.Final + 1.11.0.Final 2.22.1 1.18.16 diff --git a/producer-consumer/quarkus-producer-consumer/producer-api/src/main/docker/Dockerfile.fast-jar b/producer-consumer/quarkus-producer-consumer/producer-api/src/main/docker/Dockerfile.fast-jar index 4736639..946e6ce 100644 --- a/producer-consumer/quarkus-producer-consumer/producer-api/src/main/docker/Dockerfile.fast-jar +++ b/producer-consumer/quarkus-producer-consumer/producer-api/src/main/docker/Dockerfile.fast-jar @@ -3,7 +3,7 @@ # # Before building the container image run: # -# mvn package -Dquarkus.package.type=fast-jar +# ./mvnw package -Dquarkus.package.type=fast-jar # # Then, build the image with: # diff --git a/producer-consumer/quarkus-producer-consumer/producer-api/src/main/docker/Dockerfile.jvm b/producer-consumer/quarkus-producer-consumer/producer-api/src/main/docker/Dockerfile.jvm index d074d3e..409e33b 100644 --- a/producer-consumer/quarkus-producer-consumer/producer-api/src/main/docker/Dockerfile.jvm +++ b/producer-consumer/quarkus-producer-consumer/producer-api/src/main/docker/Dockerfile.jvm @@ -3,7 +3,7 @@ # # Before building the container image run: # -# mvn package +# ./mvnw package # # Then, build the image with: # diff --git a/producer-consumer/quarkus-producer-consumer/producer-api/src/main/docker/Dockerfile.native b/producer-consumer/quarkus-producer-consumer/producer-api/src/main/docker/Dockerfile.native index 49ec39a..a1222b2 100644 --- a/producer-consumer/quarkus-producer-consumer/producer-api/src/main/docker/Dockerfile.native +++ b/producer-consumer/quarkus-producer-consumer/producer-api/src/main/docker/Dockerfile.native @@ -3,7 +3,7 @@ # # Before building the container image run: # -# mvn package -Pnative -Dquarkus.native.container-build=true +# ./mvnw package -Pnative -Dquarkus.native.container-build=true # # Then, build the image with: # diff --git a/simple-api/quarkus-simple-api/pom.xml b/simple-api/quarkus-simple-api/pom.xml index a02c79b..580f6ad 100644 --- a/simple-api/quarkus-simple-api/pom.xml +++ b/simple-api/quarkus-simple-api/pom.xml @@ -13,10 +13,10 @@ 11 UTF-8 UTF-8 - 1.10.5.Final + 1.11.0.Final quarkus-universe-bom io.quarkus - 1.10.5.Final + 1.11.0.Final 2.22.1 diff --git a/simple-api/quarkus-simple-api/src/main/docker/Dockerfile.fast-jar b/simple-api/quarkus-simple-api/src/main/docker/Dockerfile.fast-jar index 5f644c3..648e641 100644 --- a/simple-api/quarkus-simple-api/src/main/docker/Dockerfile.fast-jar +++ b/simple-api/quarkus-simple-api/src/main/docker/Dockerfile.fast-jar @@ -3,7 +3,7 @@ # # Before building the container image run: # -# mvn package -Dquarkus.package.type=fast-jar +# ./mvnw package -Dquarkus.package.type=fast-jar # # Then, build the image with: # diff --git a/simple-api/quarkus-simple-api/src/main/docker/Dockerfile.jvm b/simple-api/quarkus-simple-api/src/main/docker/Dockerfile.jvm index cc5bf8b..2a25a2d 100644 --- a/simple-api/quarkus-simple-api/src/main/docker/Dockerfile.jvm +++ b/simple-api/quarkus-simple-api/src/main/docker/Dockerfile.jvm @@ -3,7 +3,7 @@ # # Before building the container image run: # -# mvn package +# ./mvnw package # # Then, build the image with: # diff --git a/simple-api/quarkus-simple-api/src/main/docker/Dockerfile.native b/simple-api/quarkus-simple-api/src/main/docker/Dockerfile.native index 2f51860..591b911 100644 --- a/simple-api/quarkus-simple-api/src/main/docker/Dockerfile.native +++ b/simple-api/quarkus-simple-api/src/main/docker/Dockerfile.native @@ -3,7 +3,7 @@ # # Before building the container image run: # -# mvn package -Pnative -Dquarkus.native.container-build=true +# ./mvnw package -Pnative -Dquarkus.native.container-build=true # # Then, build the image with: # diff --git a/simple-api/quarkus-simple-api/src/main/resources/application.properties b/simple-api/quarkus-simple-api/src/main/resources/application.properties index 2acbe40..25fa565 100644 --- a/simple-api/quarkus-simple-api/src/main/resources/application.properties +++ b/simple-api/quarkus-simple-api/src/main/resources/application.properties @@ -1 +1,6 @@ -quarkus.banner.enabled=false \ No newline at end of file +quarkus.banner.enabled=false + +# As suggested at https://github.com/quarkusio/quarkus/wiki/Migration-Guide-1.11#graalvm-203 +# Go back to GraalVM 20.2 until we upgrade to GraalVM 20.3.1 +quarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:20.2.0-java11 +# quarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel:20.3-java11 \ No newline at end of file