This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit cc5257de971c0b7376c6e8ae9cf4af5f23c58e2d
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Fri Oct 18 07:12:46 2024 +0100

    Upgrade Quarkus to 3.17.0.CR1
---
 pom.xml                                            |  4 ++--
 poms/bom/src/main/generated/flattened-full-pom.xml |  6 +++---
 .../src/main/generated/flattened-reduced-pom.xml   |  6 +++---
 .../generated/flattened-reduced-verbose-pom.xml    |  6 +++---
 .../quarkus/maven/UpdateExtensionDocPageMojo.java  | 22 +++++++++++-----------
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8dcfb836c0..0ab60ffa29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,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.6.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.16.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/ -->
 
@@ -81,7 +81,7 @@
         <azure-identity.version>1.13.2</azure-identity.version><!-- @sync 
com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-identity 
-->
         
<azure-core-http-vertx.version>1.0.0-beta.21</azure-core-http-vertx.version> 
<!-- TODO: https://github.com/apache/camel-quarkus/issues/4181 -->
         
<cassandra-driver-test.version>3.7.1</cassandra-driver-test.version><!-- Keep 
in sync with testcontainers instead of Debezium bom -->
-        <bouncycastle.version>1.78.1</bouncycastle.version><!-- @sync 
io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on 
-->
+        <bouncycastle.version>1.79</bouncycastle.version><!-- @sync 
io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on 
-->
         <brotli.version>0.1.2</brotli.version><!-- @sync 
org.apache.httpcomponents.client5:httpclient5-parent:${httpclient5.version} 
prop:brotli.version -->
         <caffeine.version>3.1.8</caffeine.version><!-- @sync 
io.quarkus:quarkus-bom:${quarkus.version} 
dep:com.github.ben-manes.caffeine:caffeine -->
         
<commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml 
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 989c7aa428..ae7f3361c4 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -7147,17 +7147,17 @@
       <dependency>
         <groupId>org.bouncycastle</groupId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
         <artifactId>bcmail-jdk18on</artifactId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-        <version>1.78.1</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+        <version>1.79</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
         <artifactId>bcpg-jdk18on</artifactId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-        <version>1.78.1</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+        <version>1.79</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
         <artifactId>bcutil-jdk18on</artifactId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-        <version>1.78.1</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+        <version>1.79</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
       </dependency>
       <dependency>
         <groupId>org.brotli</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 e4cdeb2c13..3cfedbe2ed 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -7097,17 +7097,17 @@
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcmail-jdk18on</artifactId>
-        <version>1.78.1</version>
+        <version>1.79</version>
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcpg-jdk18on</artifactId>
-        <version>1.78.1</version>
+        <version>1.79</version>
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcutil-jdk18on</artifactId>
-        <version>1.78.1</version>
+        <version>1.79</version>
       </dependency>
       <dependency>
         <groupId>org.brotli</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 13a962ff66..699f25049e 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -7097,17 +7097,17 @@
       <dependency>
         <groupId>org.bouncycastle</groupId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
         <artifactId>bcmail-jdk18on</artifactId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-        <version>1.78.1</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+        <version>1.79</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
         <artifactId>bcpg-jdk18on</artifactId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-        <version>1.78.1</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+        <version>1.79</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
         <artifactId>bcutil-jdk18on</artifactId><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-        <version>1.78.1</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+        <version>1.79</version><!-- 
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
       </dependency>
       <dependency>
         <groupId>org.brotli</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 dd69313293..f29f2e3e87 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
@@ -46,9 +46,11 @@ import freemarker.template.utility.DeepUnwrap;
 import 
io.quarkus.annotation.processor.documentation.config.merger.JavadocMerger;
 import 
io.quarkus.annotation.processor.documentation.config.merger.JavadocRepository;
 import io.quarkus.annotation.processor.documentation.config.merger.MergedModel;
+import 
io.quarkus.annotation.processor.documentation.config.merger.MergedModel.ConfigRootKey;
 import io.quarkus.annotation.processor.documentation.config.merger.ModelMerger;
 import 
io.quarkus.annotation.processor.documentation.config.model.AbstractConfigItem;
 import 
io.quarkus.annotation.processor.documentation.config.model.ConfigProperty;
+import 
io.quarkus.annotation.processor.documentation.config.model.ConfigProperty.PropertyPath;
 import io.quarkus.annotation.processor.documentation.config.model.ConfigRoot;
 import io.quarkus.annotation.processor.documentation.config.model.Extension;
 import 
io.quarkus.annotation.processor.documentation.config.model.JavadocElements.JavadocElement;
@@ -485,10 +487,9 @@ public class UpdateExtensionDocPageMojo extends 
AbstractDocGeneratorMojo {
 
         final JavadocRepository javadocRepository = 
JavadocMerger.mergeJavadocElements(targetDirectories);
         final MergedModel mergedModel = 
ModelMerger.mergeModel(targetDirectories);
-        for (Entry<Extension, Map<MergedModel.ConfigRootKey, ConfigRoot>> 
extensionConfigRootsEntry : mergedModel
-                .getConfigRoots().entrySet()) {
-            for (Entry<MergedModel.ConfigRootKey, ConfigRoot> configRootEntry 
: extensionConfigRootsEntry.getValue()
-                    .entrySet()) {
+        for (Entry<Extension, Map<ConfigRootKey, ConfigRoot>> 
extensionConfigRootsEntry : mergedModel.getConfigRoots()
+                .entrySet()) {
+            for (Entry<ConfigRootKey, ConfigRoot> configRootEntry : 
extensionConfigRootsEntry.getValue().entrySet()) {
                 final ConfigRoot configRoot = configRootEntry.getValue();
                 for (AbstractConfigItem configItem : configRoot.getItems()) {
                     if (configItem instanceof ConfigProperty) {
@@ -590,19 +591,18 @@ public class UpdateExtensionDocPageMojo extends 
AbstractDocGeneratorMojo {
 
         public static ConfigItem of(ConfigProperty configDocItem, 
JavadocRepository javadocRepository, String artifactIdBase) {
             final Optional<JavadocElement> javadoc = javadocRepository
-                    .getElement(configDocItem.getSourceClass(), 
configDocItem.getSourceName());
+                    .getElement(configDocItem.getSourceType(), 
configDocItem.getSourceElementName());
+            final PropertyPath itemPath = configDocItem.getPath();
             if (javadoc.isEmpty()) {
-                throw new IllegalStateException("No JavaDoc for " + 
configDocItem.getPath() + " alias "
-                        + configDocItem.getSourceClass() + "#" + 
configDocItem.getSourceName());
+                throw new IllegalStateException("No JavaDoc for " + 
itemPath.property() + " alias "
+                        + configDocItem.getSourceType() + "#" + 
configDocItem.getSourceElementName());
             }
             final String adocSource = 
LINK_PATTERN.matcher(javadoc.get().description()).replaceAll("xref:$1.adoc");
             final String illustration = 
configDocItem.getPhase().isFixedAtBuildTime() ? "icon:lock[title=Fixed at build 
time]"
                     : "";
             final TypeInfo typeInfo = typeContent(configDocItem, 
javadocRepository, true, artifactIdBase);
             return new ConfigItem(
-                    // TODO: Fix to use the correct value
-                    // https://github.com/apache/camel-quarkus/issues/6418
-                    configDocItem.getPath().toString(),
+                    itemPath.property(),
                     illustration,
                     adocSource,
                     typeInfo.description,
@@ -611,7 +611,7 @@ public class UpdateExtensionDocPageMojo extends 
AbstractDocGeneratorMojo {
                     configDocItem.getDefaultValue(),
                     configDocItem.isOptional(),
                     javadoc.get().since(),
-                    configDocItem.getEnvironmentVariable());
+                    itemPath.environmentVariable());
         }
 
         static TypeInfo typeContent(ConfigProperty configProperty, 
JavadocRepository javadocRepository,

Reply via email to