Skip to content

Commit

Permalink
Sync documentation of main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed May 23, 2024
1 parent c039173 commit ad879ee
Show file tree
Hide file tree
Showing 25 changed files with 286 additions and 95 deletions.
12 changes: 11 additions & 1 deletion _versions/main/guides/datasource.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,9 @@ For more information about pool size adjustment properties, see the <<jdbc-confi

. Add the correct reactive extension for the database of your choice.

ifndef::no-quarkus-reactive-db2-client[]
* `quarkus-reactive-db2-client`
endif::no-quarkus-reactive-db2-client[]
* `quarkus-reactive-mssql-client`
* `quarkus-reactive-mysql-client`
* `quarkus-reactive-oracle-client`
Expand Down Expand Up @@ -302,7 +304,9 @@ Quarkus offers several reactive clients for use with a reactive datasource.

. Add the corresponding extension to your application:
+
ifndef::no-quarkus-reactive-db2-client[]
* DB2: `quarkus-reactive-db2-client`
endif::no-quarkus-reactive-db2-client[]
* MariaDB/MySQL: `quarkus-reactive-mysql-client`
* Microsoft SQL Server: `quarkus-reactive-mssql-client`
* Oracle: `quarkus-reactive-oracle-client`
Expand Down Expand Up @@ -543,7 +547,7 @@ All <<extensions-and-database-drivers-reference,supported JDBC drivers do>>,
but <<other-databases,other JDBC drivers>> might not.
. Make sure your database server is configured to enable XA.
. Enable XA support explicitly for each relevant datasource by setting
<<quarkus-agroal_quarkus-datasource-jdbc-transactions,`quarkus.datasource[.optional name].transactions`>> to `xa`.
<<quarkus-agroal_quarkus-datasource-jdbc-transactions,`quarkus.datasource[.optional name].jdbc.transactions`>> to `xa`.

Using XA, a rollback in one datasource will trigger a rollback in every other datasource enrolled in the transaction.

Expand Down Expand Up @@ -684,6 +688,7 @@ However, the Quarkus Derby extension allows native compilation of the Derby JDBC
* Embedding H2 within your native image is not recommended.
Consider using an alternative approach, for example, using a remote connection to a separate database instead.

ifndef::no-deprecated-test-resource[]
==== Run an integration test

. Add a dependency on the artifacts providing the additional tools that are under the following Maven coordinates:
Expand Down Expand Up @@ -720,6 +725,7 @@ public class TestResources {
quarkus.datasource.db-kind=h2
quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
----
endif::no-deprecated-test-resource[]

[[datasource-reference]]
== References
Expand Down Expand Up @@ -912,9 +918,11 @@ a|* JDBC: `org.postgresql.Driver`
|`reactive-pg-client`
|`io.vertx.pgclient.spi.PgDriver`

ifndef::no-quarkus-reactive-db2-client[]
|`db2`
|`reactive-db2-client`
|`io.vertx.db2client.spi.DB2Driver`
endif::no-quarkus-reactive-db2-client[]
|===

[TIP]
Expand All @@ -928,9 +936,11 @@ This automatic resolution is applicable in most cases so that driver configurati

include::{generated-dir}/config/quarkus-reactive-datasource.adoc[opts=optional, leveloffset=+1]

ifndef::no-quarkus-reactive-db2-client[]
==== Reactive DB2 configuration

include::{generated-dir}/config/quarkus-reactive-db2-client.adoc[opts=optional, leveloffset=+1]
endif::no-quarkus-reactive-db2-client[]

==== Reactive MariaDB/MySQL specific configuration

Expand Down
2 changes: 1 addition & 1 deletion _versions/main/guides/javascript/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if(tables){
const decoration = td.firstElementChild.lastElementChild.firstElementChild;
const iconDecoration = decoration.children.item(0);
const collapsibleSpan = decoration.children.item(1);
const descDiv = td.firstElementChild.children.item(1);
const descDiv = td.firstElementChild.querySelector(".description");
const collapsibleHandler = makeCollapsibleHandler(descDiv, td, row, collapsibleSpan, iconDecoration);
row.addEventListener('click', collapsibleHandler);
}
Expand Down
2 changes: 1 addition & 1 deletion _versions/main/guides/kafka-dev-services.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ For Strimzi, you can select any image with a Kafka version which has Kraft suppo

[source, properties]
----
quarkus.kafka.devservices.image-name=quay.io/strimzi-test-container/test-container:0.105.0-kafka-3.6.0
quarkus.kafka.devservices.image-name=quay.io/strimzi-test-container/test-container:0.106.0-kafka-3.7.0
----

== Configuring Kafka topics
Expand Down
4 changes: 2 additions & 2 deletions _versions/main/guides/kafka-getting-started.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ version: '3.5'
services:
zookeeper:
image: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
image: quay.io/strimzi/kafka:0.41.0-kafka-3.7.0
command: [
"sh", "-c",
"bin/zookeeper-server-start.sh config/zookeeper.properties"
Expand All @@ -421,7 +421,7 @@ services:
- kafka-quickstart-network
kafka:
image: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
image: quay.io/strimzi/kafka:0.41.0-kafka-3.7.0
command: [
"sh", "-c",
"bin/kafka-server-start.sh config/server.properties --override listeners=$${KAFKA_LISTENERS} --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override zookeeper.connect=$${KAFKA_ZOOKEEPER_CONNECT}"
Expand Down
4 changes: 2 additions & 2 deletions _versions/main/guides/kafka-schema-registry-avro.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ version: '2'
services:
zookeeper:
image: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
image: quay.io/strimzi/kafka:0.41.0-kafka-3.7.0
command: [
"sh", "-c",
"bin/zookeeper-server-start.sh config/zookeeper.properties"
Expand All @@ -335,7 +335,7 @@ services:
LOG_DIR: /tmp/logs
kafka:
image: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
image: quay.io/strimzi/kafka:0.41.0-kafka-3.7.0
command: [
"sh", "-c",
"bin/kafka-server-start.sh config/server.properties --override listeners=$${KAFKA_LISTENERS} --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override zookeeper.connect=$${KAFKA_ZOOKEEPER_CONNECT}"
Expand Down
4 changes: 2 additions & 2 deletions _versions/main/guides/kafka-schema-registry-json-schema.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ version: '2'
services:
zookeeper:
image: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
image: quay.io/strimzi/kafka:0.41.0-kafka-3.7.0
command: [
"sh", "-c",
"bin/zookeeper-server-start.sh config/zookeeper.properties"
Expand All @@ -363,7 +363,7 @@ services:
LOG_DIR: /tmp/logs
kafka:
image: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
image: quay.io/strimzi/kafka:0.41.0-kafka-3.7.0
command: [
"sh", "-c",
"bin/kafka-server-start.sh config/server.properties --override listeners=$${KAFKA_LISTENERS} --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override zookeeper.connect=$${KAFKA_ZOOKEEPER_CONNECT}"
Expand Down
4 changes: 2 additions & 2 deletions _versions/main/guides/kafka-streams.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ version: '3.5'
services:
zookeeper:
image: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
image: quay.io/strimzi/kafka:0.41.0-kafka-3.7.0
command: [
"sh", "-c",
"bin/zookeeper-server-start.sh config/zookeeper.properties"
Expand All @@ -511,7 +511,7 @@ services:
networks:
- kafkastreams-network
kafka:
image: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
image: quay.io/strimzi/kafka:0.41.0-kafka-3.7.0
command: [
"sh", "-c",
"bin/kafka-server-start.sh config/server.properties --override listeners=$${KAFKA_LISTENERS} --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override zookeeper.connect=$${KAFKA_ZOOKEEPER_CONNECT} --override num.partitions=$${KAFKA_NUM_PARTITIONS}"
Expand Down
2 changes: 1 addition & 1 deletion _versions/main/guides/kafka.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2423,7 +2423,7 @@ The configuration of the created Kafka broker can be customized using `@Resource
[source,java]
----
@QuarkusTestResource(value = KafkaCompanionResource.class, initArgs = {
@ResourceArg(name = "strimzi.kafka.image", value = "quay.io/strimzi-test-container/test-container:0.105.0-kafka-3.6.0"), // Image name
@ResourceArg(name = "strimzi.kafka.image", value = "quay.io/strimzi-test-container/test-container:0.106.0-kafka-3.7.0"), // Image name
@ResourceArg(name = "kafka.port", value = "9092"), // Fixed port for kafka, by default it will be exposed on a random port
@ResourceArg(name = "kraft", value = "true"), // Enable Kraft mode
@ResourceArg(name = "num.partitions", value = "3"), // Other custom broker configurations
Expand Down
2 changes: 1 addition & 1 deletion _versions/main/guides/podman.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ With the above rootless setup on Linux, you will need to configure clients, such

[source,bash]
----
export DOCKER_HOST=$(podman info --format '{{.Host.RemoteSocket.Path}}')
export DOCKER_HOST=unix://$(podman info --format '{{.Host.RemoteSocket.Path}}')
----

== Other Linux settings
Expand Down
Loading

0 comments on commit ad879ee

Please sign in to comment.