From 8ddf875697051fc297a6d6a2aace602f40ddeeb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Galder=20Zamarren=CC=83o?= Date: Thu, 29 Sep 2022 15:39:44 +0200 Subject: [PATCH 01/23] Switch native GC policy from space/time to adaptive (default) (cherry picked from commit 7a0c45e2f6e8f6762931edcf7d54e6630d3694e3) --- .../io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java index 4b6ee08603718..7bcd1b030f7dd 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java @@ -727,8 +727,6 @@ public NativeImageInvokerInfo build() { */ handleAdditionalProperties(nativeImageArgs); - nativeImageArgs.add( - "-H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy$BySpaceAndTime"); //the default collection policy results in full GC's 50% of the time nativeImageArgs.add("-H:+AllowFoldMethods"); if (nativeConfig.headless) { From 18a3b6517c11f46c81429a32c2e410dcae9405f9 Mon Sep 17 00:00:00 2001 From: kdnakt Date: Tue, 8 Nov 2022 01:14:55 +0900 Subject: [PATCH 02/23] Fix compilation error in virtual threads doc (cherry picked from commit 2e04ead0817214357044ce79cff552a6c3bb2e46) --- docs/src/main/asciidoc/virtual-threads.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/virtual-threads.adoc b/docs/src/main/asciidoc/virtual-threads.adoc index 9e1197cd8e840..cc51fd06cbc67 100644 --- a/docs/src/main/asciidoc/virtual-threads.adoc +++ b/docs/src/main/asciidoc/virtual-threads.adoc @@ -238,7 +238,7 @@ public class FortuneResource { for(int i=0; i < fortunes.size();i ++){ fortunes.get(i).title+= " - "+quotes.get(i); } - return todos; + return fortunes; } @GET @@ -279,7 +279,7 @@ public class FortuneResource { for(int i=0; i < fortunes.size();i ++){ fortunes.get(i).title+= " - "+quotes.get(i); } - return todos; + return fortunes; } } From cd0a7fa546027a0d6d1051a26084d3370bfa176f Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Mon, 7 Nov 2022 17:16:17 +0100 Subject: [PATCH 03/23] Replace deprecated properties in JReleaser descriptor (cherry picked from commit 86de7fdc7bd0d1b39d0365b44a692273b1f5aa74) --- devtools/cli/distribution/jreleaser.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/devtools/cli/distribution/jreleaser.yml b/devtools/cli/distribution/jreleaser.yml index 40a4b01e8a033..b1cb13a395598 100644 --- a/devtools/cli/distribution/jreleaser.yml +++ b/devtools/cli/distribution/jreleaser.yml @@ -4,11 +4,9 @@ project: longDescription: | Create projects, manage extensions and perform build and development tasks for Quarkus, the Kubernetes Native Java stack tailored for OpenJDK HotSpot and GraalVM. - website: https://quarkus.io authors: - Quarkus Community license: Apache-2.0 - licenseUrl: https://github.com/quarkusio/quarkus/blob/main/LICENSE.txt copyright: Quarkus contributors java: groupId: io.quarkus @@ -18,6 +16,9 @@ project: - cli - quarkus - java + links: + homepage: https://quarkus.io + license: https://github.com/quarkusio/quarkus/blob/main/LICENSE.txt release: github: From 13be1d90d8929e4c3d5f20a8033370bf629742de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= Date: Wed, 9 Nov 2022 13:06:08 +0100 Subject: [PATCH 04/23] Correct typos and code style on the Virtual Threads guide (cherry picked from commit be185aeb5dc5d1f7ce0067f99356f5a5b917f321) --- docs/src/main/asciidoc/virtual-threads.adoc | 25 ++++++++++----------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/docs/src/main/asciidoc/virtual-threads.adoc b/docs/src/main/asciidoc/virtual-threads.adoc index cc51fd06cbc67..e544b9cc6c3a7 100644 --- a/docs/src/main/asciidoc/virtual-threads.adoc +++ b/docs/src/main/asciidoc/virtual-threads.adoc @@ -235,8 +235,8 @@ public class FortuneResource { var quotes = getQuotes(fortunes.size()).await().indefinitely(); // we append each quote to each fortune - for(int i=0; i < fortunes.size();i ++){ - fortunes.get(i).title+= " - "+quotes.get(i); + for(int i=0; i < fortunes.size(); i ++){ + fortunes.get(i).title += " - " + quotes.get(i); } return fortunes; } @@ -254,12 +254,12 @@ public class FortuneResource { // we now need to combine the two reactive streams // before returning the result to the user - return Uni.combine().all().unis(fortunes,quotes).asTuple().onItem().transform(tuple -> { - var todoList=tuple.getItem1(); + return Uni.combine().all().unis(fortunes, quotes).asTuple().onItem().transform(tuple -> { + var todoList = tuple.getItem1(); //can await it since it is already resolved var quotesList = tuple.getItem2(); - for(int i=0; i < todoList.size();i ++){ - todoList.get(i).title+= " - "+quotesList.get(i); + for(int i=0; i < todoList.size(); i ++){ + todoList.get(i).title += " - " + quotesList.get(i); } return todoList; }); @@ -276,12 +276,11 @@ public class FortuneResource { var quotes = getQuotes(fortunes.size()).await().indefinitely(); //we append each quote to each fortune - for(int i=0; i < fortunes.size();i ++){ - fortunes.get(i).title+= " - "+quotes.get(i); + for(int i=0; i < fortunes.size(); i ++){ + fortunes.get(i).title += " - " + quotes.get(i); } return fortunes; } - } ---- @@ -292,7 +291,7 @@ In this situation, the platform thread is blocked exactly as it would have been According to link:{vthreadjep}[JEP 425] this can happen in two situations: -- when a virtual thread executes performs a blocking operation inside a `synchronized` block or method +- when a virtual thread performs a blocking operation inside a `synchronized` block or method - when it executes a blocking operation inside a native method or a foreign function It can be fairly easy to avoid these situations in our own code, but it is hard to verify every dependency we use. @@ -413,7 +412,7 @@ reactive implementation. == A point about performance Our experiments seem to indicate that Quarkus with virtual threads will scale better than Quarkus blocking (offloading -the computation on a pool of platform worker threads) but not as well Quarkus reactive. +the computation on a pool of platform worker threads) but not as well as Quarkus reactive. The memory consumption especially might be an issue: if your system needs to keep its memory footprint low we would advise you stick to using reactive constructs. @@ -423,7 +422,7 @@ This was illustrated in the issue that we will now describe. === The Netty problem For JSON serialization, Netty uses their custom implementation of thread locals, `FastThreadLocal` to store buffers. -When using virtual threads in quarkus, then number of virtual threads simultaneously living in the service is directly +When using virtual threads in quarkus, the number of virtual threads simultaneously living in the service is directly related to the incoming traffic. It is possible to get hundreds of thousands, if not millions, of them. @@ -494,7 +493,7 @@ Instead, you want to specify them all in the configuration of the `quarkus-maven ---- -If you don't want to put specify the opening the `java.lang` module in your pom.xml file, you can also specify it as an argument +If you don't want to specify the opening of the `java.lang` module in your pom.xml file, you can also specify it as an argument when you start the dev mode. The configuration of the quarkus-maven-plugin will be simpler: From bda7286e7c9215546e37ca2677959b0c3c808dda Mon Sep 17 00:00:00 2001 From: Andri Reveli Date: Mon, 7 Nov 2022 18:55:57 +0100 Subject: [PATCH 05/23] Fix table entries in documentation (cherry picked from commit c84309946634460e0ecfcd9fc5713b869b7c94b9) --- docs/src/main/asciidoc/security-getting-started.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/security-getting-started.adoc b/docs/src/main/asciidoc/security-getting-started.adoc index d6a4502f4c363..715bcc3bbbddf 100644 --- a/docs/src/main/asciidoc/security-getting-started.adoc +++ b/docs/src/main/asciidoc/security-getting-started.adoc @@ -23,9 +23,9 @@ The steps in this tutorial guide you through building an application that provid |=== |Endpoint | Description |`/api/public`| The `/api/public` endpoint can be accessed anonymously. -|`/api/users/me`|The `/api/admin` endpoint is protected with role-based access control (RBAC), and only users who have been granted the `admin` role can access it. +|`/api/admin`| The `/api/admin` endpoint is protected with role-based access control (RBAC), and only users who have been granted the `admin` role can access it. At this endpoint, the `@RolesAllowed` annotation is used to declaratively enforce the access constraint. -| `/api/admin`| The `/api/users/me` endpoint is protected with RBAC and only users that have been granted the `user` role can access it. A JSON document with details about the user is returned as a response. +|`/api/users/me`| The `/api/users/me` endpoint is protected with RBAC and only users that have been granted the `user` role can access it. A JSON document with details about the user is returned as a response. |=== [TIP] From af7540b831a2834bb7510e7619391bf8feb4eeb4 Mon Sep 17 00:00:00 2001 From: Foivos Zakkak Date: Thu, 10 Nov 2022 13:59:32 +0200 Subject: [PATCH 06/23] Doc: Fix statement about CA certs embedding (cherry picked from commit 59a6ea82ad5735b85ceaee002f6cc00366a45014) --- docs/src/main/asciidoc/native-and-ssl.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/native-and-ssl.adoc b/docs/src/main/asciidoc/native-and-ssl.adoc index d6b2bf77c1f12..715038051e6d1 100644 --- a/docs/src/main/asciidoc/native-and-ssl.adoc +++ b/docs/src/main/asciidoc/native-and-ssl.adoc @@ -248,7 +248,7 @@ The easiest way to do so is by setting `quarkus.native.additional-build-args`. F quarkus.native.additional-build-args=-J-Djavax.net.ssl.trustStore=/tmp/mycerts,-J-Djavax.net.ssl.trustStorePassword=changeit ---- -will ensure that the certificates of `/tmp/mycerts` are baked into the native binary and used *in addition* to the default `cacerts`. +will ensure that the certificates of `/tmp/mycerts` are baked into the native binary and used *instead* of the default `cacerts`. The file containing the custom TrustStore does *not* (and probably should not) have to be present at runtime as its content has been baked into the native binary. === Run time configuration From 563cd3795d19bacda4c9093d798dfad935f19efd Mon Sep 17 00:00:00 2001 From: Clement Escoffier Date: Mon, 7 Nov 2022 08:58:57 +0100 Subject: [PATCH 07/23] Document that Mandrel 22.3 does not provide a -java11 image anymore (cherry picked from commit 2c363d1f6fe728a6f35e8b3534e5e2526679e1ac) --- docs/src/main/asciidoc/building-native-image.adoc | 11 +++++++++-- docs/src/main/asciidoc/native-reference.adoc | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/building-native-image.adoc b/docs/src/main/asciidoc/building-native-image.adoc index 35805fdcbd8d1..5e96d2e24450d 100644 --- a/docs/src/main/asciidoc/building-native-image.adoc +++ b/docs/src/main/asciidoc/building-native-image.adoc @@ -615,8 +615,15 @@ If you need SSL support in your native executable, you can easily include the ne Please see xref:native-and-ssl.adoc#working-with-containers[our Using SSL With Native Executables guide] for more information. ==== -NOTE: To use Mandrel instead of GraalVM CE, update the `FROM` clause to: `FROM quay.io/quarkus/ubi-quarkus-mandrel:$TAG AS build`. -`$TAG` can be found on the https://quay.io/repository/quarkus/ubi-quarkus-mandrel?tab=tags[Quarkus Mandrel Images Tags page]. +[NOTE,subs=attributes+] +==== +To use Mandrel instead of GraalVM CE, update the `FROM` clause to: `FROM quay.io/quarkus/ubi-quarkus-mandrel-builder-image:{mandrel-flavor} AS build`. +==== + +[NOTE] +==== +Starting with 22.3, Mandrel does not provide a `-java11` variant anymore. Use the `-java17` image instead. +==== === Using a Distroless base image diff --git a/docs/src/main/asciidoc/native-reference.adoc b/docs/src/main/asciidoc/native-reference.adoc index e6820c349a2f4..db380ed75cd7c 100644 --- a/docs/src/main/asciidoc/native-reference.adoc +++ b/docs/src/main/asciidoc/native-reference.adoc @@ -72,6 +72,13 @@ quarkus.container-image.build=true quarkus.container-image.group=test ---- +[IMPORTANT] +==== +Starting with 22.3, Mandrel does not provide a `-java11` version anymore. +Note, however, that this doesn't mean that you may no longer produce native executables with Mandrel for Java 11 projects. +You can still compile your Java 11 projects using OpenJDK 11 and produce native executables from the resulting Java 11 bytecode using the `-java17` Mandrel builder images. +==== + == First Debugging Steps As a first step, change to the project directory and build the native executable for the application: From 5a4656285c57123e1ecbbb35705bf11d95bc9d91 Mon Sep 17 00:00:00 2001 From: Dmitri Bourlatchkov Date: Tue, 8 Nov 2022 18:12:06 -0500 Subject: [PATCH 08/23] Demote the "test dir mapping" log message to debug This log message of the gradle application plugin seems to be unnecessary and confusing to the ordinary plugin user (i.e. a developer building a Quarkus application with Gradle). (cherry picked from commit cc2048bb858d18fd1468c070aa1f928b13fb73dc) --- .../io/quarkus/gradle/extension/QuarkusPluginExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/extension/QuarkusPluginExtension.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/extension/QuarkusPluginExtension.java index 81540986f8dc7..ec9e5bf3d5058 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/extension/QuarkusPluginExtension.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/extension/QuarkusPluginExtension.java @@ -77,7 +77,7 @@ public void beforeTest(Test task) { project.relativePath(outputDirectoryAsFile))) .collect(Collectors.joining(",")); task.environment(BootstrapConstants.TEST_TO_MAIN_MAPPINGS, fileList); - project.getLogger().lifecycle("test dir mapping - {}", fileList); + project.getLogger().debug("test dir mapping - {}", fileList); final String nativeRunner = task.getProject().getBuildDir().toPath().resolve(finalName() + "-runner") .toAbsolutePath() From 64c48b691dd17c0e19e25f054c48a7a7cffb47ea Mon Sep 17 00:00:00 2001 From: kdnakt Date: Mon, 14 Nov 2022 01:23:28 +0900 Subject: [PATCH 09/23] Fix compilation error in virtual threads doc (cherry picked from commit 1241101703961a669e3ede34354cb1c7c4756560) --- docs/src/main/asciidoc/virtual-threads.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/src/main/asciidoc/virtual-threads.adoc b/docs/src/main/asciidoc/virtual-threads.adoc index e544b9cc6c3a7..ad7f5410f75df 100644 --- a/docs/src/main/asciidoc/virtual-threads.adoc +++ b/docs/src/main/asciidoc/virtual-threads.adoc @@ -232,7 +232,7 @@ public class FortuneResource { var fortunes = repository.findAllBlocking(); // we get the list of quotes - var quotes = getQuotes(fortunes.size()).await().indefinitely(); + var quotes = getQuotesAsync(fortunes.size()).await().indefinitely(); // we append each quote to each fortune for(int i=0; i < fortunes.size(); i ++){ @@ -250,7 +250,7 @@ public class FortuneResource { // once we get a result for fortunes, // we know its size and can thus query the right number of quotes - var quotes = fortunes.onItem().transformToUni(list -> getQuotes(list.size())); + var quotes = fortunes.onItem().transformToUni(list -> getQuotesAsync(list.size())); // we now need to combine the two reactive streams // before returning the result to the user @@ -273,7 +273,7 @@ public class FortuneResource { var fortunes = repository.findAllAsyncAndAwait(); //we get the list of quotes - var quotes = getQuotes(fortunes.size()).await().indefinitely(); + var quotes = getQuotesAsync(fortunes.size()).await().indefinitely(); //we append each quote to each fortune for(int i=0; i < fortunes.size(); i ++){ From 3555799257ca16bfd9462eff174065bcded54832 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Nov 2022 20:01:42 +0000 Subject: [PATCH 10/23] Bump com.gradle.plugin-publish from 1.0.0 to 1.1.0 in /devtools/gradle Bumps com.gradle.plugin-publish from 1.0.0 to 1.1.0. --- updated-dependencies: - dependency-name: com.gradle.plugin-publish dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit adf2751a2ec80d5dd1dd1f54d97012b041d65546) --- devtools/gradle/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/gradle/build.gradle b/devtools/gradle/build.gradle index 5368eedb8580b..5eef9d948f41d 100644 --- a/devtools/gradle/build.gradle +++ b/devtools/gradle/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.gradle.plugin-publish' version '1.0.0' apply false + id 'com.gradle.plugin-publish' version '1.1.0' apply false } subprojects { From faddd683dbb3674916ad563b72151728798aeef0 Mon Sep 17 00:00:00 2001 From: Helber Belmiro Date: Mon, 14 Nov 2022 15:20:04 -0300 Subject: [PATCH 11/23] Fixed code in stork-reference.adoc Signed-off-by: Helber Belmiro (cherry picked from commit b53c33098773300484f8dfdd8d739234585d50e1) --- docs/src/main/asciidoc/stork-reference.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/src/main/asciidoc/stork-reference.adoc b/docs/src/main/asciidoc/stork-reference.adoc index 77a143ffd7288..e0aaa947e6220 100644 --- a/docs/src/main/asciidoc/stork-reference.adoc +++ b/docs/src/main/asciidoc/stork-reference.adoc @@ -137,11 +137,11 @@ import io.smallrye.stork.spi.ServiceDiscoveryProvider; @ServiceDiscoveryAttribute(name = "port", description = "Port of the service discovery server.", required = false) public class AcmeServiceDiscoveryProvider // <3> - implements ServiceDiscoveryProvider { + implements ServiceDiscoveryProvider { // <4> @Override - public ServiceDiscovery createServiceDiscovery(AcmeServiceDiscoveryProviderConfiguration config, + public ServiceDiscovery createServiceDiscovery(AcmeConfiguration config, String serviceName, ServiceConfig serviceConfig, StorkInfrastructure storkInfrastructure) { @@ -154,7 +154,7 @@ This implementation is straightforward. <1> `@ServiceDiscoveryType` annotation defines the type of the service discovery provider. For each `ServiceDiscoveryProvider` annotated with this annotation, a configuration class will be generated. The name of the configuration class is constructed by appending `Configuration` to the name of the provider. <2> Use `@ServiceDiscoveryAttribute` to define configuration properties for services configured with this service discovery provider. Configuration properties are gathered from all properties of a form: `quarkus.stork.my-service.service-discovery.attr=value`. -<3> The provider needs to implement `ServiceDiscoveryType` typed by the configuration class. +<3> The provider needs to implement `ServiceDiscoveryType` typed by the configuration class. This configuration class is generated automatically by the Configuration Generator. Its name is created by appending `Configuration` to the service discovery type, such as `AcmeConfiguration`. <4> `createServiceDiscovery` method is the factory method. It receives the configuration and access to the name of the service and available infrastructure. Then, we need to implement the `ServiceDiscovery` interface: @@ -177,7 +177,7 @@ public class AcmeServiceDiscovery implements ServiceDiscovery { private final String host; private final int port; - public AcmeServiceDiscovery(AcmeServiceDiscoveryProviderConfiguration configuration) { + public AcmeServiceDiscovery(AcmeConfiguration configuration) { this.host = configuration.getHost(); this.port = Integer.parseInt(configuration.getPort()); } From b2f25d953f6e15735fcb28b96fd78e8fa0c6a49a Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Wed, 16 Nov 2022 09:56:08 +0100 Subject: [PATCH 12/23] Set higher timeout for Misc 4 native job (cherry picked from commit 3b9f3f272d44e0b9115aa2f50f244ffb35cba098) --- .github/native-tests.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/native-tests.json b/.github/native-tests.json index 0b156500b0696..9017057d9634c 100644 --- a/.github/native-tests.json +++ b/.github/native-tests.json @@ -116,7 +116,7 @@ }, { "category": "Misc4", - "timeout": 65, + "timeout": 75, "test-modules": "picocli-native, gradle, micrometer-mp-metrics, micrometer-prometheus, logging-json, jaxp, jaxb, opentelemetry, webjars-locator", "os-name": "ubuntu-latest" }, From 66219b0971f7a4f5dd5868c668af1ef1bd1cb744 Mon Sep 17 00:00:00 2001 From: Helber Belmiro Date: Fri, 11 Nov 2022 09:22:16 -0300 Subject: [PATCH 13/23] Fixed error in Stork guide Signed-off-by: Helber Belmiro (cherry picked from commit 2d46d7c25175ea149e524cfdd5321af2c1b2d67d) --- docs/src/main/asciidoc/stork.adoc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/src/main/asciidoc/stork.adoc b/docs/src/main/asciidoc/stork.adoc index 63cfbe7bf924e..5d3358a6fa15b 100644 --- a/docs/src/main/asciidoc/stork.adoc +++ b/docs/src/main/asciidoc/stork.adoc @@ -199,8 +199,8 @@ public class Registration { @ConfigProperty(name = "consul.host") String host; @ConfigProperty(name = "consul.port") int port; - @ConfigProperty(name = "blue-service-port", defaultValue = "9000") int red; - @ConfigProperty(name = "red-service-port", defaultValue = "9001") int blue; + @ConfigProperty(name = "red-service-port", defaultValue = "9000") int red; + @ConfigProperty(name = "blue-service-port", defaultValue = "9001") int blue; /** * Register our two services in Consul. @@ -210,11 +210,10 @@ public class Registration { public void init(@Observes StartupEvent ev, Vertx vertx) { ConsulClient client = ConsulClient.create(vertx, new ConsulClientOptions().setHost(host).setPort(port)); - client.registerServiceAndAwait( - new ServiceOptions().setPort(blue).setAddress("localhost").setName("my-service").setId("blue")); client.registerServiceAndAwait( new ServiceOptions().setPort(red).setAddress("localhost").setName("my-service").setId("red")); - + client.registerServiceAndAwait( + new ServiceOptions().setPort(blue).setAddress("localhost").setName("my-service").setId("blue")); } } ---- From 335a7fdddd4caf9a998441997fa1a50f7514e92d Mon Sep 17 00:00:00 2001 From: Filippe Spolti Date: Fri, 11 Nov 2022 17:34:50 -0300 Subject: [PATCH 14/23] update latest brew openjdk package latest openjdk is now 19: $ brew info openjdk ==> openjdk: stable 19.0.1 (bottled) [keg-only] (cherry picked from commit aad0436bedd9c35567796ba1c2f15456cb6930f6) --- docs/src/main/asciidoc/cli-tooling.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/cli-tooling.adoc b/docs/src/main/asciidoc/cli-tooling.adoc index 6cd609cfc89df..4868f8685de2b 100644 --- a/docs/src/main/asciidoc/cli-tooling.adoc +++ b/docs/src/main/asciidoc/cli-tooling.adoc @@ -149,7 +149,7 @@ You can use Homebrew to install (and update) the Quarkus CLI. Make sure you have a JDK installed before installing the Quarkus CLI. We haven't added an explicit dependency as we wanted to make sure you could use your preferred JDK version. -You can install a JDK with `brew install openjdk` for Java 17 or `brew install openjdk@11` for Java 11. +You can install a JDK with `brew install openjdk` for the latest Java version, `brew install openjdk@17` for Java 17, or `brew install openjdk@11` for Java 11. ==== To install the Quarkus CLI using Homebrew, run the following command: From 6049c28db334e3c65f7a64969f225142d68a62e3 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 17 Nov 2022 13:20:58 +0100 Subject: [PATCH 15/23] Create directories when syncing doc branches for website (cherry picked from commit 9999755ad2fc62d4a706e0e827e0e6f04f7acc8a) --- docs/sync-web-site.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/sync-web-site.sh b/docs/sync-web-site.sh index 44036ce5cb3c8..c477d23c62ead 100755 --- a/docs/sync-web-site.sh +++ b/docs/sync-web-site.sh @@ -41,6 +41,7 @@ if [ $BRANCH == "main" ] && [ "$QUARKUS_RELEASE" == "true" ]; then else TARGET_GUIDES=${TARGET_DIR}/_versions/${BRANCH}/guides TARGET_CONFIG=${TARGET_DIR}/_generated-doc/${BRANCH} + mkdir -p ${TARGET_GUIDES} fi echo "Copying from target/asciidoc/sources/* to $TARGET_GUIDES" From 4a421d16433515e42d3f08d11bb33d0b81cdd3b3 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Thu, 17 Nov 2022 12:55:37 +0100 Subject: [PATCH 16/23] Fix broken markup for a list in security guide Signed-off-by: Harald Albers (cherry picked from commit 9b9d2600f9d537d11ca44c5e136ffb571eb6bf56) --- docs/src/main/asciidoc/security.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/src/main/asciidoc/security.adoc b/docs/src/main/asciidoc/security.adoc index 6e6815d721c03..358b6ecd685a8 100644 --- a/docs/src/main/asciidoc/security.adoc +++ b/docs/src/main/asciidoc/security.adoc @@ -247,6 +247,7 @@ For more information about RBAC and other authorization options in Quarkus, see == Quarkus Security customization Quarkus Security is highly customizable. You can customize the following core security components of Quarkus: + * `HttpAuthenticationMechanism` * `IdentityProvider` * `SecurityidentityAugmentor` From f7977cfe5555eb1b63ea55b440b6821dfa0d1d34 Mon Sep 17 00:00:00 2001 From: Michael Musgrove Date: Wed, 16 Nov 2022 13:55:59 +0000 Subject: [PATCH 17/23] [29307] upgrade narayana to 5.13.1.Final (cherry picked from commit 0f43b63b54465080b6d4ffef011dd72c4b7f9188) --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 96051b33d34b1..2d3aeadffe76b 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -93,7 +93,7 @@ 1.1.8.Final 6.2.5.Final 6.1.7.Final - 5.13.1.Alpha1 + 5.13.1.Final 1.1.1.Final 1.16 7.6.0.Final From 2106d86012c7f1e4772dcf0bb5c0d6ff9cadb684 Mon Sep 17 00:00:00 2001 From: kdnakt Date: Fri, 18 Nov 2022 00:18:46 +0900 Subject: [PATCH 18/23] Rename method names in virtual threads doc (cherry picked from commit 151a14ab9a454603d1aeab22fbb0658fbac41ff7) --- docs/src/main/asciidoc/virtual-threads.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/virtual-threads.adoc b/docs/src/main/asciidoc/virtual-threads.adoc index ad7f5410f75df..a1df10eb19821 100644 --- a/docs/src/main/asciidoc/virtual-threads.adoc +++ b/docs/src/main/asciidoc/virtual-threads.adoc @@ -243,7 +243,7 @@ public class FortuneResource { @GET @Path("/quoted-reactive") - public Uni> getAllQuoted() { + public Uni> getAllQuotedReactive() { // we first fetch the list of resource and we memoize it // to avoid fetching it again everytime need it var fortunes = repository.findAllAsync().memoize().indefinitely(); @@ -268,7 +268,7 @@ public class FortuneResource { @GET @RunOnVirtualThread @Path("/quoted-virtual-thread") - public List getAllQuotedBlocking() { + public List getAllQuotedVirtualThread() { //we get the list of fortunes var fortunes = repository.findAllAsyncAndAwait(); From 6ce512763b7a67a3c3298e8a220cb8e7a13f9526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= Date: Sat, 19 Nov 2022 16:03:38 +0100 Subject: [PATCH 19/23] Add HTTPS port configuration in the HTTP reference guide (cherry picked from commit c5d8040f44da41da9400a5a014a65bef7f9bf5f3) --- docs/src/main/asciidoc/http-reference.adoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/src/main/asciidoc/http-reference.adoc b/docs/src/main/asciidoc/http-reference.adoc index a5dbe8861abeb..22a028bec23b3 100644 --- a/docs/src/main/asciidoc/http-reference.adoc +++ b/docs/src/main/asciidoc/http-reference.adoc @@ -170,6 +170,12 @@ This will also work in tandem with link:https://kubernetes.io/docs/concepts/conf _Note: in order to remain compatible with earlier versions of Quarkus (before 0.16) the default password is set to "password". It is therefore not a mandatory parameter!_ +=== Configure the HTTPS port + +By default, Quarkus listens to port 8443 for SSL secured connections and 8444 when running tests. + +These ports can be configured in your `application.properties` with the properties `quarkus.http.ssl-port` and `quarkus.http.test-ssl-port`. + === Disable the HTTP port It is possible to disable the HTTP port and only support secure requests. This is done via the From dec14894c0a9eb5bfed113d08d6c2b83387c0fe8 Mon Sep 17 00:00:00 2001 From: Sergey Beryozkin Date: Tue, 29 Nov 2022 16:39:17 +0000 Subject: [PATCH 20/23] Fix a typo in the BC CredentialsProvider test (cherry picked from commit 81fdcd199f0f31140d0b70c207ef409968a9be21) --- .../it/bouncycastle/SecretProvider.java | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/server-keystore.jks | Bin 2215 -> 2423 bytes .../BouncyCastleJsseTestCase.java | 2 +- .../src/test/resources/client-truststore.jks | Bin 925 -> 2423 bytes 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/SecretProvider.java b/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/SecretProvider.java index 9eed67c40298d..ba0332d277ffd 100644 --- a/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/SecretProvider.java +++ b/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/SecretProvider.java @@ -15,7 +15,7 @@ public class SecretProvider implements CredentialsProvider { @Override public Map getCredentials(String credentialsProviderName) { Map creds = new HashMap<>(); - creds.put("keystore-password", "password"); + creds.put("keystore-password", "secret"); creds.put("truststore-password", "password"); return creds; } diff --git a/integration-tests/bouncycastle-jsse/src/main/resources/application.properties b/integration-tests/bouncycastle-jsse/src/main/resources/application.properties index 40f0793cd8e70..3a28e5d45804b 100644 --- a/integration-tests/bouncycastle-jsse/src/main/resources/application.properties +++ b/integration-tests/bouncycastle-jsse/src/main/resources/application.properties @@ -1,7 +1,7 @@ quarkus.security.security-providers=BCJSSE quarkus.http.ssl.certificate.key-store-file=server-keystore.jks -quarkus.http.ssl.certificate.key-store-password-key=key-store-password +quarkus.http.ssl.certificate.key-store-password-key=keystore-password quarkus.http.ssl.certificate.trust-store-file=server-truststore.jks quarkus.http.ssl.certificate.trust-store-password-key=truststore-password quarkus.http.ssl.certificate.credentials-provider=custom diff --git a/integration-tests/bouncycastle-jsse/src/main/resources/server-keystore.jks b/integration-tests/bouncycastle-jsse/src/main/resources/server-keystore.jks index d8991ddbd627d40f0254ddae7fa7e78f412b4a23..da33e8e7a16683d421c7a541bf0013521efb605e 100644 GIT binary patch literal 2423 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 aH~3Ca%|*I@e88To>+D>~J`lt~rv3-)J!2gJ literal 2215 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 IX&!X?zsYvI$p8QV diff --git a/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseTestCase.java b/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseTestCase.java index 13b16316d1b1c..26be3a6af710a 100644 --- a/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseTestCase.java +++ b/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseTestCase.java @@ -45,7 +45,7 @@ protected void doTestListProviders() { .setBaseUri(String.format("%s://%s", url.getProtocol(), url.getHost())) .setPort(url.getPort()) .setKeyStore("client-keystore.jks", "password") - .setTrustStore("client-truststore.jks", "password") + .setTrustStore("client-truststore.jks", "secret") .build(); RestAssured.given() .spec(spec) diff --git a/integration-tests/bouncycastle-jsse/src/test/resources/client-truststore.jks b/integration-tests/bouncycastle-jsse/src/test/resources/client-truststore.jks index 112fb9857fbd71c688d2bdd6ea2bf647790def70..da33e8e7a16683d421c7a541bf0013521efb605e 100644 GIT binary patch literal 2423 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 aH~3Ca%|*I@e88To>+D>~J`lt~rv3-)J!2gJ literal 925 zcmezO_TO6u1_mY|W(3o$xs}cI8JL?G`56qF7`d357#SJb>>3m5 zZ=H#Lv+59Q`XPs%cW*|zcHdloqAxePpx)#s-v#GfEiaLcc0X6@y`H-%=v#*1=Oe7K z)qW-B>_$?)l+O%qOP zY5rU~k%^g+fpM{-fxLk%FydtSSj1RFgzrhQ6sa|LY5ME@@w;|V$wlpR7jhs1(+w~X z85yJu_Xh_F$};l(IqMm5)_GpSy6dL=5m%H>zWY>H{I`CVzt}sMyehA$jr&-7PpP*z zM48ljF&z(>+8^ZC_}KfmbhqPb-)8xgH)l67pO-z~qM~p}$NWZ#hk(j5-lwf^Z+9IR zc2RuKX)N84ko-LLoWpNbiHME=d^>D69Nu<9Q%!uM)C=*$E z`%UAe|2n@mpUG}^eHO=ZUMDN|=Mhak)*TB!DV*2nlr){SFL#&7L?v}&&wkHmlGl&k z3^#C^8TY=sB=b?#=~rQg60Xlac=V9r%)_@Gyd?kf1a~&vU$Fg3$o1A5_JX^7TZ`vz kyRg-4({opScL4{{nL7JKu02z^Frzkj_mi(*L+#BK0Mrvya{vGU From 91f6345b0b27ecc1da2062957109fe3e2babe0d6 Mon Sep 17 00:00:00 2001 From: Rostislav Svoboda Date: Fri, 2 Dec 2022 23:28:03 +0100 Subject: [PATCH 21/23] Update the description copied from non-reactive variants (cherry picked from commit 92bd8d8c9e27f69e5840d59bf67d8323d1a07997) --- extensions/keycloak-admin-client-reactive/runtime/pom.xml | 2 +- .../hibernate-reactive-rest-data-panache/runtime/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/keycloak-admin-client-reactive/runtime/pom.xml b/extensions/keycloak-admin-client-reactive/runtime/pom.xml index dc194217932f8..8660b35d01ab7 100644 --- a/extensions/keycloak-admin-client-reactive/runtime/pom.xml +++ b/extensions/keycloak-admin-client-reactive/runtime/pom.xml @@ -11,7 +11,7 @@ quarkus-keycloak-admin-client-reactive Quarkus - Keycloak Admin Client - Reactive - Runtime - Administer a Keycloak Instance + Administer a Keycloak Instance using Reactive diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/runtime/pom.xml b/extensions/panache/hibernate-reactive-rest-data-panache/runtime/pom.xml index 3f50888b2350f..f4db684d089fc 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/runtime/pom.xml +++ b/extensions/panache/hibernate-reactive-rest-data-panache/runtime/pom.xml @@ -11,7 +11,7 @@ quarkus-hibernate-reactive-rest-data-panache Quarkus - Hibernate Reactive REST data with Panache - Runtime - Generate JAX-RS resources for your Hibernate Panache entities and repositories + Generate JAX-RS resources for your Hibernate Reactive Panache entities and repositories From 445297598b800da9574e4feedee89cddbea5dab2 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Tue, 22 Nov 2022 17:18:06 +0100 Subject: [PATCH 22/23] Upgrade flapdoodle to 3.5.2 (cherry picked from commit c6fe8fe9fd83b8399f7859c70745b96c46beccb9) --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 2d3aeadffe76b..9d352f78a81fb 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -168,7 +168,7 @@ 3.14.9 1.17.2 0.1.1 - 3.3.0 + 3.5.2 5.2.SP7 2.1.SP2 5.3.Final From 38a92114df765175125c384ca7af3bb69056848c Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Tue, 22 Nov 2022 17:18:51 +0100 Subject: [PATCH 23/23] Include de.flapdoodle.embed in dependabot updates (cherry picked from commit 70721326cb5aa5693046c9b2c460a6ef4f03eb8b) --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 419943c20baaa..c87a0eca1a2f7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -123,6 +123,7 @@ updates: - dependency-name: biz.paluch.logging:logstash-gelf # MongoDB - dependency-name: org.mongodb:* + - dependency-name: de.flapdoodle.embed:* # Avro - dependency-name: org.apache.avro:* # gRPC