This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 6277f071efb447d6487960f797d8b12de6cbc830 Author: James Netherton <[email protected]> AuthorDate: Wed Aug 14 16:02:15 2024 +0100 Upgrade Quarkus to 3.16.0.CR1 --- docs/antora.yml | 2 +- docs/modules/ROOT/pages/reference/extensions/micrometer.adoc | 2 +- extensions/micrometer/runtime/src/main/doc/usage.adoc | 2 +- integration-tests/micrometer/pom.xml | 2 +- pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-full-pom.xml | 10 +++++----- poms/bom/src/main/generated/flattened-reduced-pom.xml | 8 ++++---- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 8 ++++---- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 0106ccff85..833d216dcd 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -36,7 +36,7 @@ asciidoc: graalvm-docs-version: jdk21 # replace ${graalvm-docs.version} mapstruct-version: 1.5.5.Final # replace ${mapstruct.version} min-maven-version: 3.8.2 # replace ${min-maven-version} - target-maven-version: 3.9.8 # replace ${target-maven-version} + target-maven-version: 3.9.9 # replace ${target-maven-version} # Attributes used in xrefs to other Antora components cq-camel-components: next@components diff --git a/docs/modules/ROOT/pages/reference/extensions/micrometer.adoc b/docs/modules/ROOT/pages/reference/extensions/micrometer.adoc index 05ba357e98..ef1d7e88ec 100644 --- a/docs/modules/ROOT/pages/reference/extensions/micrometer.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/micrometer.adoc @@ -54,7 +54,7 @@ Your application should declare the following dependency or one of the dependen ---- <dependency> <groupId>io.micrometer</groupId> - <artifactId>micrometer-registry-prometheus</artifactId> + <artifactId>micrometer-registry-prometheus-simpleclient</artifactId> </dependency> ---- diff --git a/extensions/micrometer/runtime/src/main/doc/usage.adoc b/extensions/micrometer/runtime/src/main/doc/usage.adoc index 4d6a2b4d7a..0ef057b0bc 100644 --- a/extensions/micrometer/runtime/src/main/doc/usage.adoc +++ b/extensions/micrometer/runtime/src/main/doc/usage.adoc @@ -6,7 +6,7 @@ Your application should declare the following dependency or one of the dependen ---- <dependency> <groupId>io.micrometer</groupId> - <artifactId>micrometer-registry-prometheus</artifactId> + <artifactId>micrometer-registry-prometheus-simpleclient</artifactId> </dependency> ---- diff --git a/integration-tests/micrometer/pom.xml b/integration-tests/micrometer/pom.xml index 2a94f1da44..df33276013 100644 --- a/integration-tests/micrometer/pom.xml +++ b/integration-tests/micrometer/pom.xml @@ -53,7 +53,7 @@ </dependency> <dependency> <groupId>io.micrometer</groupId> - <artifactId>micrometer-registry-prometheus</artifactId> + <artifactId>micrometer-registry-prometheus-simpleclient</artifactId> </dependency> <dependency> <groupId>io.quarkus</groupId> diff --git a/pom.xml b/pom.xml index 34d9063810..8d436eeae7 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ <quarkiverse-mybatis.version>2.2.3</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ --> <quarkiverse-pooled-jms.version>2.5.0</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ --> <quarkiverse-tika.version>2.0.4</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ --> - <quarkus.version>3.14.0</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> + <quarkus.version>999-SNAPSHOT</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> <quarkus-hazelcast-client.version>4.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ --> <quarkus-qpid-jms.version>2.6.1</quarkus-qpid-jms.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ --> @@ -133,7 +133,7 @@ <jxmpp.version>1.0.3</jxmpp.version><!-- @sync org.apache.camel:camel-xmpp:${camel.version} dep:org.jxmpp:jxmpp-jid --> <kafka.version>3.7.1</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients --> <kudu.version>${kudu-version}</kudu.version> - <kotlin.version>2.0.10</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib --> + <kotlin.version>2.0.20</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib --> <kotlinx.version>1.4.0</kotlinx.version><!--Used by com.squareup.wire:wire-compiler referenced from aws2:kinesis --> <kryo.version>2.24.0</kryo.version><!-- @sync org.apache.flink:flink-core:${flink-version} dep:com.esotericsoftware.kryo:kryo --> <langchain4j.version>0.33.0</langchain4j.version><!-- @sync io.quarkiverse.langchain4j:quarkus-langchain4j-parent:${quarkiverse-langchain4j.version} prop:langchain4j.version --> @@ -272,7 +272,7 @@ <!-- maven-enforcer-plugin --> <min-maven-version>3.8.2</min-maven-version> - <target-maven-version>3.9.8</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version --> + <target-maven-version>3.9.9</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version --> <supported-maven-versions>[${min-maven-version},)</supported-maven-versions> <!-- maven-release-plugin --> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index f60e946634..fb9e236ea4 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7166,27 +7166,27 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-script-util</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.0.20</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-compiler-embeddable</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.0.20</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-compiler-impl-embeddable</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.0.20</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.0.20</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-jvm-host</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.0.20</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlinx</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 02176a5e7c..dba35dcb30 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7106,22 +7106,22 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-scripting-compiler-embeddable</artifactId> - <version>2.0.10</version> + <version>2.0.20</version> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-scripting-compiler-impl-embeddable</artifactId> - <version>2.0.10</version> + <version>2.0.20</version> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-scripting-jvm</artifactId> - <version>2.0.10</version> + <version>2.0.20</version> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-scripting-jvm-host</artifactId> - <version>2.0.10</version> + <version>2.0.20</version> </dependency> <dependency> <groupId>org.jetbrains.kotlinx</groupId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index beafbbfb8f..46f01f3bde 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7106,22 +7106,22 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-compiler-embeddable</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.0.20</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-compiler-impl-embeddable</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.0.20</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.0.20</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-jvm-host</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.0.20</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlinx</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
