You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2024/10/25 12:08:38 UTC
(camel-quarkus) branch quarkus-main updated (4a39502c05 -> 456ffa9558)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
discard 4a39502c05 UpdateExtensionDocPageMojo is broken, fix #6418
discard 797766653c Upgrade Quarkus to 3.17.0.CR1
add e5dd6b04bc Mysql testResource instead of devservices
add 6cf7430d11 Document FHIR native mode requirements for FhirContext
add 48781876a1 Improve some test assertions in FHIR tests
add 8b3d72b8f2 Fix check for ServiceRemoveEvent observers
add 4782c6f3fa Bump cq-plugin.version from 4.13.1 to 4.14.1
add 7e537931c6 Add a brief explanation of yaml-io usage to the extension documentation
add 953200d7a4 Add BeanIO native support
add 63663ea8ea Fixes #6676, removal of classifier bcfips from the crypto dependencies
add 56aa2c1a36 Bump actions/cache from 4.1.1 to 4.1.2 (#6679)
add 4d0afcd7f0 Bump org.codehaus.mojo:exec-maven-plugin from 3.4.1 to 3.5.0 (#6680)
add a847c8bcfe Bump org.wiremock:wiremock-standalone from 3.9.1 to 3.9.2 (#6681)
add e56bd90942 Add a basic test for pipes
add 75e2fc09a7 Transform the configuration options documentation from vanila JavaDoc to @asciidoclet
add 3a0c91c9eb Bump quarkiverse-jgit.version from 3.3.0 to 3.3.1 (#6685)
add d1d440f802 Bump actions/checkout from 4.2.1 to 4.2.2 (#6686)
add c0e3395950 Upgrade Quarkus to 3.16.0
add c829a1cbae Upgrade Camel to 4.8.1
add f5391e1d75 Remove capability from catalog
add 6dc82f32c2 Work around Camel OpenTelemetry thread factory services not being compatible with Quarkus OpenTelemetry
add 897b8e997d Add tests for JQ built in functions
add 050e313ffc Fixes #6576 - test coverage for smb producer
add a7fcd873d2 Remove redundant camel.sb.docs.branch property
add 1979399f2c Upgrade Quarkus CXF to 3.16.0
add ddb242df30 Bump quarkiverse-cxf.version from 3.16.0 to 3.16.1
add 556e32ee9d Auto generated changes for dependabot commit ec913c497f94bb90346d8af77e0227ab39324cd4
add 5311648199 Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.5.0 to 3.6.0
add a5cd4eb48d Bump actions/setup-java from 4.4.0 to 4.5.0
add 1ab3dc3d2f Bump cq-plugin.version from 4.14.1 to 4.14.2
add 17e3c76455 Downgrade maven-release-plugin to 3.0.1
add 872459e8f5 Temporarily disable Dependabot upgrades of maven-release-plugin
new c298c17595 Upgrade Quarkus to 3.17.0.CR1
new 456ffa9558 UpdateExtensionDocPageMojo is broken, fix #6418
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (4a39502c05)
\
N -- N -- N refs/heads/quarkus-main (456ffa9558)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/dependabot.yml | 2 +
.github/workflows/camel-master-cron.yaml | 32 +-
.github/workflows/ci-build.yaml | 34 +-
.github/workflows/generate-sbom-main.yml | 4 +-
.github/workflows/label-issue.yaml | 2 +-
.github/workflows/pr-validate.yml | 4 +-
.github/workflows/quarkus-master-cron.yaml | 32 +-
.../workflows/synchronize-dependabot-branch.yaml | 2 +-
.../catalog/quarkus/QuarkusRuntimeProvider.java | 16 -
docs/antora.yml | 4 +-
docs/modules/ROOT/examples/dataformats/beanio.yml | 6 +-
.../ROOT/pages/reference/extensions/beanio.adoc | 52 +-
.../ROOT/pages/reference/extensions/core.adoc | 145 ++-
.../ROOT/pages/reference/extensions/cxf-soap.adoc | 7 +-
.../ROOT/pages/reference/extensions/debug.adoc | 3 +-
.../ROOT/pages/reference/extensions/fhir.adoc | 81 +-
.../reference/extensions/file-cluster-service.adoc | 3 +-
.../ROOT/pages/reference/extensions/graphql.adoc | 5 +-
.../ROOT/pages/reference/extensions/grpc.adoc | 22 +-
.../ROOT/pages/reference/extensions/jasypt.adoc | 13 +-
.../ROOT/pages/reference/extensions/jfr.adoc | 14 +-
.../ROOT/pages/reference/extensions/kafka.adoc | 5 +-
.../ROOT/pages/reference/extensions/kamelet.adoc | 4 +-
.../extensions/kubernetes-cluster-service.adoc | 15 +-
.../pages/reference/extensions/micrometer.adoc | 14 +-
.../pages/reference/extensions/opentelemetry.adoc | 16 +-
.../pages/reference/extensions/rest-openapi.adoc | 8 +-
.../ROOT/pages/reference/extensions/servlet.adoc | 38 +-
.../ROOT/pages/reference/extensions/yaml-io.adoc | 12 +
.../org/apache/camel/quarkus/core/CamelConfig.java | 397 +++---
.../quarkus/core/CamelLifecycleEventBridge.java | 2 +-
.../apache/camel/quarkus/main/CamelMainConfig.java | 21 +-
.../yaml-io/runtime/src/main/doc/usage.adoc | 8 +
.../beanio/deployment/BeanioProcessor.java | 46 -
.../cli/connector/CamelCliConnectorConfig.java | 3 +
extensions-jvm/pom.xml | 1 -
.../beanio/deployment/pom.xml | 4 +
.../beanio/deployment/BeanioProcessor.java | 137 +++
.../deployment/BeanioPropertiesBuildItem.java | 22 +-
{extensions-jvm => extensions}/beanio/pom.xml | 2 +-
.../beanio/runtime/pom.xml | 5 +
extensions/beanio/runtime/src/main/doc/usage.adoc | 31 +
.../main/resources/META-INF/quarkus-extension.yaml | 3 +-
.../cxf/soap/deployment/CxfBuildTimeConfig.java | 23 +-
.../camel/quarkus/component/debug/DebugConfig.java | 9 +-
.../fhir/runtime/src/main/doc/configuration.adoc | 3 +-
extensions/fhir/runtime/src/main/doc/usage.adoc | 73 ++
.../camel/quarkus/component/fhir/FhirConfig.java | 12 +
.../file/cluster/FileLockClusterServiceConfig.java | 22 +-
.../component/graphql/CamelGraphQLConfig.java | 10 +-
.../quarkus/grpc/runtime/GrpcBuildTimeConfig.java | 47 +-
.../jasypt/CamelJasyptBuildTimeConfig.java | 9 +-
.../component/jasypt/CamelJasyptConfig.java | 45 +-
.../component/jfr/RuntimeCamelJfrConfig.java | 17 +-
.../joor/runtime/JoorExpressionConfig.java | 18 +-
.../component/jq/deployment/JqProcessor.java | 17 -
.../quarkus/component/jq/CamelJqRecorder.java | 35 -
.../component/kafka/CamelKafkaRuntimeConfig.java | 11 +-
.../KubernetesClusterServiceBuildTimeConfig.java | 16 +-
.../KubernetesClusterServiceRuntimeConfig.java | 37 +-
.../micrometer/CamelMicrometerConfig.java | 52 +-
.../runtime/CamelMicroProfileHealthConfig.java | 2 +
.../deployment/OpenApiJavaBuildTimeConfig.java | 2 +-
extensions/opentelemetry/deployment/pom.xml | 5 +
.../OpenTelemetryThreadPoolServiceOverrides.java | 51 +
.../opentelemetry/CamelOpenTelemetryConfig.java | 34 +-
...TelemetryInstrumentedThreadFactoryListener.java | 27 +-
...OpenTelemetryInstrumentedThreadPoolFactory.java | 73 ++
.../CurrentContextScheduledExecutorService.java | 101 ++
.../ForwardingScheduledExecutorService.java | 75 ++
extensions/pom.xml | 1 +
.../runtime/RestOpenApiBuildTimeConfig.java | 23 +-
.../servlet/runtime/CamelServletConfig.java | 91 +-
.../quarkus/component/xslt/CamelXsltConfig.java | 7 +
.../soap/wss/client/it/CxfSoapWssClientTest.java | 7 +-
integration-test-groups/jdbc/mysql/README.adoc | 26 -
integration-test-groups/jdbc/mysql/pom.xml | 26 +-
.../src/main/resources/application.properties | 2 +-
.../component/jdbc/mysql/CamelMysqlJdbcTest.java | 3 +-
.../component/jdbc/mysql/MysqlTestResource.java | 92 ++
integration-tests-jvm/pom.xml | 1 -
.../beanio/pom.xml | 27 +
.../component/beanio/it/BeanioResource.java | 0
.../quarkus/component/beanio/it/BeanioRoutes.java | 0
.../component/beanio/it/model/A1Record.java | 3 +
.../component/beanio/it/model/AbstractRecord.java | 3 +
.../component/beanio/it/model/B1Record.java | 3 +
.../beanio/it/model/CustomErrorHandler.java | 0
.../component/beanio/it/model/Employee.java | 3 +
.../beanio/it/model/EmployeeAnnotated.java | 0
.../quarkus/component/beanio/it/model/Error.java | 3 +
.../quarkus/component/beanio/it/model/Header.java | 2 +
.../component/beanio/it/model/Separator.java | 3 +
.../quarkus/component/beanio/it/model/Trailer.java | 3 +
.../src/main/resources/application.properties | 10 +-
.../beanio/src/main/resources/complex-mapping.xml | 3 +
.../beanio/src/main/resources/employee-mapping.xml | 10 +
.../src/main/resources/single-object-mapping.xml | 3 +
.../quarkus/component/beanio/it/BeanioIT.java} | 12 +-
.../quarkus/component/beanio/it/BeanioTest.java | 0
.../beanio/src/test/resources/complex-data.txt | 0
.../beanio/src/test/resources/employees-csv.txt | 0
.../src/test/resources/employees-delimited.txt | 0
.../src/test/resources/employees-fixedlength.txt | 0
.../src/test/resources/employees-with-error.txt | 0
.../beanio/src/test/resources/employees-xml.txt | 0
.../fhir/it/AbstractFhirRouteBuilder.java | 7 +
.../component/fhir/it/FhirDstu2Hl7OrgResource.java | 43 +-
.../component/fhir/it/FhirDstu2Resource.java | 40 +-
.../component/fhir/it/FhirDstu2_1Resource.java | 40 +-
.../component/fhir/it/FhirDstu3Resource.java | 27 +-
.../quarkus/component/fhir/it/FhirR4Resource.java | 40 +-
.../quarkus/component/fhir/it/FhirR5Resource.java | 40 +-
.../component/fhir/it/AbstractFhirTest.java | 22 +-
integration-tests/jdbc-grouped/pom.xml | 26 +-
.../apache/camel/quarkus/component/jq/it/Book.java | 14 +-
.../camel/quarkus/component/jq/it/JqResource.java | 37 +
.../camel/quarkus/component/jq/it/JqRoutes.java | 8 +
.../camel/quarkus/component/jq/it/JqTest.java | 16 +
integration-tests/kamelet/pom.xml | 17 +
.../component/kamelet/it/KameletResource.java | 7 +
.../src/main/resources/application.properties | 6 +-
.../kamelets/greeting-from-property.kamelet.yaml | 42 +-
.../src/main/resources/pipes/greeting-pipe.yaml | 29 +-
.../quarkus/component/kamelet/it/KameletTest.java | 8 +
integration-tests/pom.xml | 1 +
integration-tests/smb/pom.xml | 27 +
.../quarkus/component/smb/it/SmbResource.java | 74 ++
.../camel/quarkus/component/smb/it/SmbRoute.java | 58 +-
.../camel/quarkus/component/smb/it/SmbTest.java | 104 ++
pom.xml | 19 +-
poms/bom/pom.xml | 12 -
poms/bom/src/main/generated/flattened-full-pom.xml | 1295 ++++++++++----------
.../src/main/generated/flattened-reduced-pom.xml | 775 ++++++------
.../generated/flattened-reduced-verbose-pom.xml | 1295 ++++++++++----------
.../org/apache/camel/quarkus/maven/CqCatalog.java | 23 -
.../quarkus/maven/UpdateExtensionDocPageMojo.java | 2 +-
tooling/scripts/test-categories.yaml | 1 +
138 files changed, 3974 insertions(+), 2651 deletions(-)
create mode 100644 extensions-core/yaml-io/runtime/src/main/doc/usage.adoc
delete mode 100644 extensions-jvm/beanio/deployment/src/main/java/org/apache/camel/quarkus/component/beanio/deployment/BeanioProcessor.java
rename {extensions-jvm => extensions}/beanio/deployment/pom.xml (93%)
create mode 100644 extensions/beanio/deployment/src/main/java/org/apache/camel/quarkus/component/beanio/deployment/BeanioProcessor.java
copy integration-tests-jvm/beanio/src/main/java/org/apache/camel/quarkus/component/beanio/it/model/Error.java => extensions/beanio/deployment/src/main/java/org/apache/camel/quarkus/component/beanio/deployment/BeanioPropertiesBuildItem.java (66%)
rename {extensions-jvm => extensions}/beanio/pom.xml (96%)
rename {extensions-jvm => extensions}/beanio/runtime/pom.xml (92%)
create mode 100644 extensions/beanio/runtime/src/main/doc/usage.adoc
copy {extensions-jvm => extensions}/beanio/runtime/src/main/resources/META-INF/quarkus-extension.yaml (97%)
create mode 100644 extensions/fhir/runtime/src/main/doc/usage.adoc
delete mode 100644 extensions/jq/runtime/src/main/java/org/apache/camel/quarkus/component/jq/CamelJqRecorder.java
create mode 100644 extensions/opentelemetry/deployment/src/main/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetryThreadPoolServiceOverrides.java
rename integration-test-groups/jdbc/mysql/src/main/java/org/apache/camel/quarkus/component/jdbc/mysql/Sha256FIPSPasswordPlugin.java => extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/patch/OpenTelemetryInstrumentedThreadFactoryListener.java (55%)
create mode 100644 extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/patch/OpenTelemetryInstrumentedThreadPoolFactory.java
create mode 100644 extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/patch/internal/CurrentContextScheduledExecutorService.java
create mode 100644 extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/patch/internal/ForwardingScheduledExecutorService.java
delete mode 100644 integration-test-groups/jdbc/mysql/README.adoc
create mode 100644 integration-test-groups/jdbc/mysql/src/test/java/org/apache/camel/quarkus/component/jdbc/mysql/MysqlTestResource.java
rename {integration-tests-jvm => integration-tests}/beanio/pom.xml (83%)
rename {integration-tests-jvm => integration-tests}/beanio/src/main/java/org/apache/camel/quarkus/component/beanio/it/BeanioResource.java (100%)
rename {integration-tests-jvm => integration-tests}/beanio/src/main/java/org/apache/camel/quarkus/component/beanio/it/BeanioRoutes.java (100%)
rename {integration-tests-jvm => integration-tests}/beanio/src/main/java/org/apache/camel/quarkus/component/beanio/it/model/A1Record.java (95%)
rename {integration-tests-jvm => integration-tests}/beanio/src/main/java/org/apache/camel/quarkus/component/beanio/it/model/AbstractRecord.java (95%)
rename {integration-tests-jvm => integration-tests}/beanio/src/main/java/org/apache/camel/quarkus/component/beanio/it/model/B1Record.java (95%)
rename {integration-tests-jvm => integration-tests}/beanio/src/main/java/org/apache/camel/quarkus/component/beanio/it/model/CustomErrorHandler.java (100%)
rename {integration-tests-jvm => integration-tests}/beanio/src/main/java/org/apache/camel/quarkus/component/beanio/it/model/Employee.java (97%)
rename {integration-tests-jvm => integration-tests}/beanio/src/main/java/org/apache/camel/quarkus/component/beanio/it/model/EmployeeAnnotated.java (100%)
rename {integration-tests-jvm => integration-tests}/beanio/src/main/java/org/apache/camel/quarkus/component/beanio/it/model/Error.java (93%)
rename {integration-tests-jvm => integration-tests}/beanio/src/main/java/org/apache/camel/quarkus/component/beanio/it/model/Header.java (97%)
rename {integration-tests-jvm => integration-tests}/beanio/src/main/java/org/apache/camel/quarkus/component/beanio/it/model/Separator.java (95%)
rename {integration-tests-jvm => integration-tests}/beanio/src/main/java/org/apache/camel/quarkus/component/beanio/it/model/Trailer.java (95%)
copy {integration-test-groups/jdbc/mysql => integration-tests/beanio}/src/main/resources/application.properties (80%)
rename {integration-tests-jvm => integration-tests}/beanio/src/main/resources/complex-mapping.xml (98%)
rename {integration-tests-jvm => integration-tests}/beanio/src/main/resources/employee-mapping.xml (89%)
rename {integration-tests-jvm => integration-tests}/beanio/src/main/resources/single-object-mapping.xml (94%)
copy integration-tests/{smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java => beanio/src/test/java/org/apache/camel/quarkus/component/beanio/it/BeanioIT.java} (68%)
rename {integration-tests-jvm => integration-tests}/beanio/src/test/java/org/apache/camel/quarkus/component/beanio/it/BeanioTest.java (100%)
rename {integration-tests-jvm => integration-tests}/beanio/src/test/resources/complex-data.txt (100%)
rename {integration-tests-jvm => integration-tests}/beanio/src/test/resources/employees-csv.txt (100%)
rename {integration-tests-jvm => integration-tests}/beanio/src/test/resources/employees-delimited.txt (100%)
rename {integration-tests-jvm => integration-tests}/beanio/src/test/resources/employees-fixedlength.txt (100%)
rename {integration-tests-jvm => integration-tests}/beanio/src/test/resources/employees-with-error.txt (100%)
rename {integration-tests-jvm => integration-tests}/beanio/src/test/resources/employees-xml.txt (100%)
copy extensions-jvm/beanio/runtime/src/main/resources/META-INF/quarkus-extension.yaml => integration-tests/kamelet/src/main/resources/kamelets/greeting-from-property.kamelet.yaml (54%)
rename extensions-jvm/beanio/runtime/src/main/resources/META-INF/quarkus-extension.yaml => integration-tests/kamelet/src/main/resources/pipes/greeting-pipe.yaml (56%)
(camel-quarkus) 01/02: Upgrade Quarkus to 3.17.0.CR1
Posted by ja...@apache.org.
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 c298c175954f6015d40e623e43c423193efc9f8a
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Oct 18 07:12:46 2024 +0100
Upgrade Quarkus to 3.17.0.CR1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6386554415..d1287d4682 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.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.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/ -->
(camel-quarkus) 02/02: UpdateExtensionDocPageMojo is broken, fix #6418
Posted by ja...@apache.org.
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 456ffa9558bec561c6ce1fea135ceafd74adaf39
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Mon Oct 21 11:38:59 2024 +0200
UpdateExtensionDocPageMojo is broken, fix #6418
---
.../quarkus/maven/UpdateExtensionDocPageMojo.java | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
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,