Skip to content

Commit 330195e

Browse files
authored
Merge pull request #47721 from gsmet/3.22.2-backports-1
[3.22] 3.22.2 backports 1
2 parents 4e7adfb + d56cbe5 commit 330195e

File tree

49 files changed

+453
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+453
-176
lines changed

.github/workflows/ci-actions-incremental.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1221,7 +1221,8 @@ jobs:
12211221
# Ignore the following YAML Schema error
12221222
timeout-minutes: ${{matrix.timeout}}
12231223
strategy:
1224-
max-parallel: ${{ fromJson(needs.configure.outputs.config).maxParallel || 12 }}
1224+
# fully disable for now as we have issues with RunsOn and it might come from the value being defined (even if set to 999)
1225+
#max-parallel: ${{ fromJson(needs.configure.outputs.config).maxParallel || 12 }}
12251226
fail-fast: false
12261227
matrix: ${{ fromJson(needs.calculate-test-jobs.outputs.native_matrix) }}
12271228
steps:

docs/src/main/asciidoc/_includes/extension-status.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
ifdef::extension-status[]
12
[NOTE]
23
====
34
This technology is considered {extension-status}.
@@ -21,3 +22,4 @@ endif::[]
2122

2223
For a full list of possible statuses, check our https://quarkus.io/faq/#what-are-the-extension-statuses[FAQ entry].
2324
====
25+
endif::[]

docs/src/main/asciidoc/building-native-image.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ This is particularly important when it comes to conformance and security.
7575

7676
* Mandrel is recommended for building native executables that target Linux containerized environments.
7777
This means that Mandrel users are encouraged to use containers to build their native executables.
78-
If you are building native executables for macOS,
78+
If you are building native executables for macOS on amd64/x86,
7979
you should consider using Oracle GraalVM instead,
8080
because Mandrel does not currently target this platform.
81-
Building native executables directly on bare metal Linux or Windows is possible,
81+
Building native executables directly on bare metal Linux, macOS (on M processors), or Windows is possible,
8282
with details available in the https://github.com/graalvm/mandrel/blob/default/README.md[Mandrel README]
8383
and https://github.com/graalvm/mandrel/releases[Mandrel releases].
8484

@@ -111,7 +111,7 @@ We recommend the _community edition_ of GraalVM. For example, install it with `s
111111
export GRAALVM_HOME=$HOME/Development/mandrel/
112112
----
113113
+
114-
On macOS (not supported by Mandrel), point the variable to the `Home` sub-directory:
114+
On macOS (amd64/x86 based Macs not supported), point the variable to the `Home` sub-directory:
115115
+
116116
[source,bash]
117117
----

docs/src/main/asciidoc/deploying-to-openshift-docker-howto.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ openshift-helloworld openshift-helloworld-username-dev.apps.sandbox-m2.ll9k.p1
145145
Be aware that the route is now listening on port 80 and is no longer on port 8080.
146146
====
147147
+
148-
You can test the application demonstrated in this example with a web browser or a terminal by using `curl` and the complete URL output from `oc get routes`, that is, "\http://openshift-helloworld-username-dev.apps.sandbox-m2.ll9k.p1.openshiftapps.com".
148+
You can test the application demonstrated in this example with a web browser or a terminal by using `curl` and the complete URL output from `oc get routes`, that is, `\http://openshift-helloworld-username-dev.apps.sandbox-m2.ll9k.p1.openshiftapps.com`.
149149
+
150150
For example: `curl \http://openshift-helloworld-username-dev.apps.sandbox-m2.ll9k.p1.openshiftapps.com`.
151151

docs/src/main/asciidoc/getting-started-testing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1431,7 +1431,7 @@ An example use of this could be the following Maven command, that forces `@Quark
14311431
./mvnw verify -Dquarkus.http.test-host=1.2.3.4 -Dquarkus.http.test-port=4321
14321432
----
14331433

1434-
To test against a running instance that only accepts SSL/TLS connection (example: `https://1.2.3.4:4321`) set the system property `quarkus.http.test-ssl-enabled` to `true`.
1434+
To test against a running instance that only accepts SSL/TLS connection (example: `https://1.2.3.4:4321`) set the system property `quarkus.http.test-ssl-enabled` to `true` and `quarkus.http.test-ssl-port` to the target HTTPS port.
14351435

14361436
== Mixing `@QuarkusTest` with other type of tests
14371437

docs/src/main/asciidoc/security-openid-connect-dev-services.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ KeyCloak Dev Services Starting:
4242
2021-11-02 17:14:44,170 INFO [io.qua.oid.dep.dev.key.KeycloakDevServicesProcessor] (build-10) Dev Services for Keycloak started.
4343
----
4444

45+
[NOTE]
46+
====
47+
Adding the `quarkus.keycloak.devservices.java-opts=-XX:UseSVE=0` configuration property may help to workaround Keycloak Dev Services startup problems on some Mac OS systems.
48+
====
49+
4550
[IMPORTANT]
4651
====
4752
When logging in to the Keycloak admin console, the username is `admin`, and the password is `admin`.

docs/src/main/asciidoc/tls-registry-reference.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,8 @@ quarkus.tls.http.key-store.pem.0.key=tls.key
849849
[IMPORTANT]
850850
====
851851
Impacted servers and clients may need to listen to the `CertificateUpdatedEvent` to apply the new certificates.
852-
This is automatically done for the Quarkus HTTP server, such as the Quarkus REST server, gRPC server, and WebSocket server, as well as the management interface if it is enabled.
852+
This is automatically done for the Quarkus HTTP server, as well as the Quarkus REST server, gRPC server, and WebSocket server, as well as the management interface if it is enabled.
853+
On the client side, Quarkus REST Client automatically handles certificate update events.
853854
====
854855

855856
NOTE: In Quarkus dev mode, when files are touched, it will trigger the `CertificateUpdatedEvent` much more frequently.

docs/src/main/asciidoc/websockets-next-reference.adoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
55
////
66
[id="websockets-next-reference-guide"]
77
= WebSockets Next reference guide
8-
:extension-status: preview
98
include::_attributes.adoc[]
109
:numbered:
1110
:sectnums:
@@ -14,8 +13,6 @@ include::_attributes.adoc[]
1413
:topics: web,websockets
1514
:extensions: io.quarkus:quarkus-websockets-next
1615

17-
include::{includes}/extension-status.adoc[]
18-
1916
The `quarkus-websockets-next` extension provides a modern declarative API to define WebSocket server and client endpoints.
2017

2118
== The WebSocket protocol

docs/src/main/asciidoc/websockets-next-tutorial.adoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ include::_attributes.adoc[]
1414
This guide explains how your Quarkus application can utilize web sockets to create interactive web applications.
1515
In this guide, we will develop a very simple chat application using web sockets to receive and send messages to the other connected users.
1616

17-
include::{includes}/extension-status.adoc[]
18-
19-
2017
== Prerequisites
2118

2219
include::{includes}/prerequisites.adoc[]

docs/src/main/asciidoc/websockets.adoc

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,22 @@ This guide is maintained in the main Quarkus repository
33
and pull requests should be submitted there:
44
https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
55
////
6-
= Using WebSockets
6+
= Using WebSockets with Undertow
77
include::_attributes.adoc[]
88
:categories: web
99
:summary: This guide explains how your Quarkus application can utilize web sockets to create interactive web applications. Because it’s the canonical web socket application, we are going to create a simple chat application.
1010
:topics: web,websockets
1111
:extensions: io.quarkus:quarkus-websockets,io.quarkus:quarkus-websockets-client
1212

13-
This guide explains how your Quarkus application can utilize web sockets to create interactive web applications.
13+
This guide explains how your Quarkus application can utilize web sockets to create interactive web applications,
14+
in the context of an Undertow-based Quarkus application, or if you rely on https://jakarta.ee/specifications/websocket/[Jakarta WebSocket].
15+
16+
[TIP]
17+
====
18+
If you don't use Undertow or https://jakarta.ee/specifications/websocket/[Jakarta WebSocket],
19+
it is recommended to use the more modern xref:websockets-next-tutorial.adoc[WebSockets Next extensions].
20+
====
21+
1422
Because it's the _canonical_ web socket application, we are going to create a simple chat application.
1523

1624
== Prerequisites

0 commit comments

Comments
 (0)