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 913b0cbc42047a981b418d09d5360f2dc7225db3
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Thu Sep 19 15:46:32 2024 +0100
Upgrade Quarkus to 3.16.0.CR1
---
docs/antora.yml | 2 +-
.../openapi/java/deployment/OpenApiJavaProcessor.java | 8 ++++----
integration-tests-support/certificate-generator/pom.xml | 1 +
pom.xml | 9 ++++-----
poms/bom-test/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 ++++----
.../apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java | 6 ++++--
9 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 955c2a7b2d..38cbfa5bbb 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.6.0 # 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/extensions/openapi-java/deployment/src/main/java/org/apache/camel/quarkus/component/openapi/java/deployment/OpenApiJavaProcessor.java
b/extensions/openapi-java/deployment/src/main/java/org/apache/camel/quarkus/component/openapi/java/deployment/OpenApiJavaProcessor.java
index 87fcc4effc..95da4b0e54 100644
---
a/extensions/openapi-java/deployment/src/main/java/org/apache/camel/quarkus/component/openapi/java/deployment/OpenApiJavaProcessor.java
+++
b/extensions/openapi-java/deployment/src/main/java/org/apache/camel/quarkus/component/openapi/java/deployment/OpenApiJavaProcessor.java
@@ -41,9 +41,10 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import
io.quarkus.smallrye.openapi.deployment.spi.AddToOpenAPIDefinitionBuildItem;
-import io.smallrye.openapi.api.models.OpenAPIImpl;
import io.smallrye.openapi.api.util.MergeUtil;
-import io.smallrye.openapi.runtime.io.definition.DefinitionReader;
+import io.smallrye.openapi.runtime.io.IOContext;
+import io.smallrye.openapi.runtime.io.JsonIO;
+import io.smallrye.openapi.runtime.io.OpenAPIDefinitionIO;
import io.swagger.v3.core.jackson.mixin.Components31Mixin;
import io.swagger.v3.core.jackson.mixin.ComponentsMixin;
import io.swagger.v3.core.jackson.mixin.DateSchemaMixin;
@@ -239,8 +240,7 @@ class CamelRestOASFilter implements OASFilter {
String jsonContent =
RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, bc);
final JsonNode node = mapper.readTree(jsonContent);
- OpenAPI oai = new OpenAPIImpl();
- DefinitionReader.processDefinition(oai, node);
+ OpenAPI oai = new
OpenAPIDefinitionIO(IOContext.forJson(JsonIO.newInstance(null))).readObject(node);
MergeUtil.merge(openAPI, oai);
} catch (Exception e) {
LOGGER.warn("Error generating OpenAPI from Camel Rest DSL due to:
{}. This exception is ignored.", e.getMessage(),
diff --git a/integration-tests-support/certificate-generator/pom.xml
b/integration-tests-support/certificate-generator/pom.xml
index 9430281bbb..faa37fe7af 100644
--- a/integration-tests-support/certificate-generator/pom.xml
+++ b/integration-tests-support/certificate-generator/pom.xml
@@ -33,6 +33,7 @@
<dependency>
<groupId>io.smallrye.certs</groupId>
<artifactId>smallrye-certificate-generator-junit5</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/pom.xml b/pom.xml
index 8faa09312e..1b8c898cad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
<quarkiverse-mybatis.version>2.2.4</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.15.1</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.7.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/ -->
@@ -132,7 +132,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.34.0</langchain4j.version><!-- @sync
io.quarkiverse.langchain4j:quarkus-langchain4j-parent:${quarkiverse-langchain4j.version}
prop:langchain4j.version -->
@@ -154,7 +154,7 @@
<retrofit.version>2.9.0</retrofit.version><!-- @sync
org.influxdb:influxdb-java:${influxdb.version}
dep:com.squareup.retrofit2:retrofit -->
<rxjava3.version>3.1.8</rxjava3.version><!-- Used by
amazon-kinesis-client and infinispan-client-hotrod-jakarta -->
<smallrye.reactive.messaging.camel.version>4.24.0</smallrye.reactive.messaging.camel.version><!--
@sync io.quarkus:quarkus-bom:${quarkus.version}
dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
- <snakeyaml.version>2.2</snakeyaml.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml -->
+ <snakeyaml.version>2.3</snakeyaml.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml -->
<snakeyaml-engine.version>${snakeyaml-engine-version}</snakeyaml-engine.version><!--
Resolve conflict between camel-snakeyaml & kubernetes-client -->
<spring.version>${spring-version}</spring.version>
<spring.data.redis.version>${spring-data-redis-version}</spring.data.redis.version>
@@ -173,7 +173,6 @@
<zstd-jni.version>1.5.6-3</zstd-jni.version><!-- @sync
org.apache.kafka:kafka-clients:${kafka.version} dep:com.github.luben:zstd-jni
-->
<!-- Test dependency versions (keep sorted alphabetically) -->
-
<smallrye-certificate-generator-junit5.version>0.8.1</smallrye-certificate-generator-junit5.version><!--
@sync io.quarkus:quarkus-bom:${quarkus.version}
dep:io.smallrye.certs:smallrye-certificate-generator -->
<consul-client.version>${consul-client-version}</consul-client.version>
<ftpserver.version>${ftpserver-version}</ftpserver.version>
<hamcrest.version>3.0</hamcrest.version><!-- Awaitility and Wiremock
-->
@@ -272,7 +271,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-test/pom.xml b/poms/bom-test/pom.xml
index 645d90b4af..13d8cc7594 100644
--- a/poms/bom-test/pom.xml
+++ b/poms/bom-test/pom.xml
@@ -80,12 +80,6 @@
<artifactId>quarkus-micrometer-registry-jmx</artifactId>
<version>${quarkiverse-micrometer.version}</version>
</dependency>
- <!-- TODO: Remove for Quarkus 3.16.0
https://github.com/quarkusio/quarkus/pull/43393 -->
- <dependency>
- <groupId>io.smallrye.certs</groupId>
- <artifactId>smallrye-certificate-generator-junit5</artifactId>
-
<version>${smallrye-certificate-generator-junit5.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-support-custom-dataformat</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index d294187ad7..0323db3f38 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -7214,27 +7214,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 ac115f3b81..e6b94f2690 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -7159,22 +7159,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 28856b2c7d..aff962e334 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -7159,22 +7159,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} -->
diff --git
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
index 0688e29b87..881e249244 100644
---
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
+++
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
@@ -485,8 +485,10 @@ public class UpdateExtensionDocPageMojo extends
AbstractDocGeneratorMojo {
final JavadocRepository javadocRepository =
JavadocMerger.mergeJavadocElements(targetDirectories);
final MergedModel mergedModel =
ModelMerger.mergeModel(targetDirectories);
- for (Entry<Extension, Map<String, ConfigRoot>>
extensionConfigRootsEntry : mergedModel.getConfigRoots().entrySet()) {
- for (Entry<String, ConfigRoot> configRootEntry :
extensionConfigRootsEntry.getValue().entrySet()) {
+ for (Entry<Extension, Map<MergedModel.ConfigRootKey, ConfigRoot>>
extensionConfigRootsEntry : mergedModel
+ .getConfigRoots().entrySet()) {
+ for (Entry<MergedModel.ConfigRootKey, ConfigRoot> configRootEntry
: extensionConfigRootsEntry.getValue()
+ .entrySet()) {
final ConfigRoot configRoot = configRootEntry.getValue();
for (AbstractConfigItem configItem : configRoot.getItems()) {
if (configItem instanceof ConfigProperty) {
