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 2021/09/27 08:32:25 UTC
[camel-quarkus] branch camel-main updated (2375483 -> b86ca55)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard 2375483 Adapt to latest Camel API changes
discard c62c7d2 Remove redundant reflective class registration for SunJaxb21NamespacePrefixMapper
discard 9e2c620 Sync minio version with quarkiverse version due to incompatible okhttp version between quarkus and recent minio version
discard 7ede67c Camel 3.12 : Dataformat fix attributes names
discard a400b46 Upgrade spark and hadoop versions
discard 95b808b Upgrade Camel to 3.12.0
add 0c8de6c Updated CHANGELOG.md
add 796d4fa Upgrade Quarkus to 2.2.3.Final
add 9411480 Updated CHANGELOG.md
add 57edc73 aws2-lambda: Added updateFunction and getFunction tests #2749
add 70b109d replicate more of the main camel website build: use @djencks/asciidoctor-jsonpath and include quarkus examples
add 15f6215 Updated CHANGELOG.md
add ae7b555 Upgrade Quarkus to 2.3.0.CR1
add 5191e5f Work around cassandraql depending on Quarkus Vert.x extensions that no longer exist
add 99eeee7 Temporarily add netty-tcnative-boringssl-static to the BOM to work around netty-bom issues
add cbfd86c Updated CHANGELOG.md
add 43ede15 Updated CHANGELOG.md
add d8c8a84 Use camel-quarkus-build-parent-it as a direct parent of each test module
add 34d853b Improve Kafka integration with Quarkus dev services
add 301a666 aws2-lambda: Add alias tests #2749
add 0fd4957 Add notes on Quarkus Dev Services to JDBC & SQL extension docs
add 21468a3 Updated CHANGELOG.md
new f632ed3 Upgrade Camel to 3.12.0
new 3b3d359 Upgrade spark and hadoop versions
new 856983c Camel 3.12 : Dataformat fix attributes names
new eaefd43 Sync minio version with quarkiverse version due to incompatible okhttp version between quarkus and recent minio version
new a2e2459 Remove redundant reflective class registration for SunJaxb21NamespacePrefixMapper
new 3c97bf6 Adapt to latest Camel API changes
new b86ca55 Adapt to latest Camel API changes
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 (2375483)
\
N -- N -- N refs/heads/camel-main (b86ca55)
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 7 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:
CHANGELOG.md | 20 ++-
docs/.pnp.js | 54 ++++++
docs/antora-playbook.yml | 14 +-
docs/antora.yml | 2 +-
.../ROOT/pages/reference/extensions/bean.adoc | 2 +-
.../ROOT/pages/reference/extensions/groovy.adoc | 4 +-
.../ROOT/pages/reference/extensions/jdbc.adoc | 6 +
.../ROOT/pages/reference/extensions/jsonpath.adoc | 6 +-
.../ROOT/pages/reference/extensions/kafka.adoc | 13 ++
.../ROOT/pages/reference/extensions/ognl.adoc | 4 +-
.../ROOT/pages/reference/extensions/ribbon.adoc | 6 +-
.../ROOT/pages/reference/extensions/sql.adoc | 6 +-
.../ROOT/pages/reference/extensions/xpath.adoc | 4 +-
.../zipkin.adoc => components/hwcloud-dms.adoc} | 0
.../hwcloud-imagerecognition.adoc} | 0
.../zipkin.adoc => components/hwcloud-obs.adoc} | 0
.../ROOT/partials/reference/languages/bean.adoc | 4 +-
.../ROOT/partials/reference/languages/csimple.adoc | 2 +-
.../ROOT/partials/reference/languages/groovy.adoc | 2 +-
.../partials/reference/languages/hl7terser.adoc | 2 +-
.../ROOT/partials/reference/languages/joor.adoc | 2 +-
.../partials/reference/languages/jsonpath.adoc | 4 +-
.../ROOT/partials/reference/languages/mvel.adoc | 2 +-
.../ROOT/partials/reference/languages/ognl.adoc | 2 +-
.../ROOT/partials/reference/languages/xpath.adoc | 2 +-
.../ROOT/partials/reference/languages/xquery.adoc | 2 +-
.../ROOT/partials/reference/others/ribbon.adoc | 2 +-
docs/package.json | 1 +
docs/util/jsonpath-util.js | 82 +++++++++
docs/yarn.lock | 63 ++++++-
extensions/cassandraql/deployment/pom.xml | 10 ++
extensions/cassandraql/runtime/pom.xml | 10 ++
.../jdbc/runtime/src/main/doc/configuration.adoc | 6 +
.../component/kafka/deployment/KafkaProcessor.java | 31 ++++
...Test.java => KafkaDevServicesDisabledTest.java} | 19 ++-
...dTest.java => KafkaDevServicesEnabledTest.java} | 42 +++--
...n-configuration-devservices-disabled.properties | 1 -
extensions/kafka/runtime/src/main/doc/usage.adoc | 9 +
.../component/kafka/CamelKafkaRecorder.java} | 16 +-
extensions/netty/deployment/pom.xml | 2 +-
extensions/nsq/runtime/pom.xml | 2 +-
extensions/platform-http/deployment/pom.xml | 2 +-
extensions/platform-http/runtime/pom.xml | 2 +-
.../sql/runtime/src/main/doc/configuration.adoc | 6 +-
extensions/tagsoup/deployment/pom.xml | 2 +-
extensions/vertx-websocket/deployment/pom.xml | 2 +-
extensions/vertx-websocket/runtime/pom.xml | 2 +-
integration-test-groups/aws2/aws2-cw/pom.xml | 4 +-
integration-test-groups/aws2/aws2-ddb/pom.xml | 4 +-
.../aws2/ddb/it/Aws2DdbStreamResource.java | 11 --
.../component/aws2/ddb/it/Aws2DdbStreamRoutes.java | 2 +-
.../aws2/ddb/it/TestSequenceNumberProvider.java | 38 -----
.../component/aws2/ddb/it/Aws2DdbStreamTest.java | 24 +--
integration-test-groups/aws2/aws2-kinesis/pom.xml | 4 +-
integration-test-groups/aws2/aws2-lambda/pom.xml | 4 +-
.../aws2/lambda/it/Aws2LambdaResource.java | 143 ++++++++++++++--
.../component/aws2/lambda/it/Aws2LambdaTest.java | 186 ++++++++++++++-------
integration-test-groups/aws2/aws2-s3/pom.xml | 5 +-
integration-test-groups/aws2/aws2-ses/pom.xml | 4 +-
integration-test-groups/aws2/aws2-sqs-sns/pom.xml | 4 +-
.../azure/azure-eventhubs/pom.xml | 4 +-
.../azure/azure-storage-blob/pom.xml | 4 +-
.../azure/azure-storage-queue/pom.xml | 4 +-
integration-test-groups/foundation/bean/pom.xml | 6 +-
integration-test-groups/foundation/browse/pom.xml | 4 +-
.../foundation/component-name-resolver/pom.xml | 6 +-
.../foundation/controlbus/pom.xml | 4 +-
.../foundation/core-annotations/pom.xml | 6 +-
.../foundation/core-fault-tolerance/pom.xml | 6 +-
.../foundation/core-languages/pom.xml | 6 +-
.../foundation/core-thread-pools/pom.xml | 6 +-
integration-test-groups/foundation/core/pom.xml | 6 +-
.../foundation/customized-log-component/pom.xml | 6 +-
integration-test-groups/foundation/direct/pom.xml | 6 +-
integration-test-groups/foundation/eip/pom.xml | 4 +-
.../foundation/language/pom.xml | 4 +-
integration-test-groups/foundation/log/pom.xml | 6 +-
integration-test-groups/foundation/mock/pom.xml | 4 +-
integration-test-groups/foundation/ref/pom.xml | 4 +-
.../foundation/scheduler/pom.xml | 4 +-
integration-test-groups/foundation/seda/pom.xml | 4 +-
integration-test-groups/foundation/stream/pom.xml | 4 +-
integration-test-groups/foundation/timer/pom.xml | 6 +-
.../foundation/type-converter/pom.xml | 6 +-
.../mongodb/mongodb-gridfs/pom.xml | 4 +-
integration-test-groups/mongodb/mongodb/pom.xml | 4 +-
integration-test-groups/pom.xml | 4 +-
integration-tests/activemq/pom.xml | 3 +-
integration-tests/amqp/pom.xml | 3 +-
integration-tests/arangodb/pom.xml | 4 +-
integration-tests/as2/pom.xml | 4 +-
integration-tests/atlasmap/pom.xml | 4 +-
integration-tests/avro-rpc/pom.xml | 3 +-
integration-tests/avro/pom.xml | 3 +-
integration-tests/aws2-grouped/pom.xml | 5 +-
integration-tests/aws2/pom.xml | 5 +-
integration-tests/azure-grouped/pom.xml | 5 +-
integration-tests/base64/pom.xml | 3 +-
integration-tests/bean-validator/pom.xml | 3 +-
integration-tests/bindy/pom.xml | 3 +-
integration-tests/box/pom.xml | 3 +-
integration-tests/braintree/pom.xml | 3 +-
integration-tests/caffeine/pom.xml | 3 +-
integration-tests/cassandraql/pom.xml | 4 +-
integration-tests/cbor/pom.xml | 3 +-
integration-tests/compression/pom.xml | 3 +-
integration-tests/consul/pom.xml | 3 +-
integration-tests/core-discovery-disabled/pom.xml | 5 +-
integration-tests/couchdb/pom.xml | 3 +-
integration-tests/crypto/pom.xml | 3 +-
integration-tests/csimple/pom.xml | 4 +-
integration-tests/csv/pom.xml | 3 +-
integration-tests/dataformat/pom.xml | 3 +-
integration-tests/dataformats-json/pom.xml | 5 +-
integration-tests/debezium/pom.xml | 4 +-
integration-tests/digitalocean/pom.xml | 3 +-
integration-tests/disruptor/pom.xml | 3 +-
integration-tests/dozer/pom.xml | 3 +-
integration-tests/dropbox/pom.xml | 3 +-
integration-tests/elasticsearch-rest/pom.xml | 3 +-
integration-tests/exec/pom.xml | 3 +-
integration-tests/fhir/pom.xml | 3 +-
integration-tests/file/pom.xml | 3 +-
integration-tests/flatpack/pom.xml | 4 +-
integration-tests/fop/pom.xml | 4 +-
integration-tests/foundation-grouped/pom.xml | 5 +-
integration-tests/freemarker/pom.xml | 4 +-
integration-tests/ftp/pom.xml | 3 +-
integration-tests/geocoder/pom.xml | 3 +-
integration-tests/git/pom.xml | 4 +-
integration-tests/github/pom.xml | 3 +-
integration-tests/google-bigquery/pom.xml | 3 +-
integration-tests/google-pubsub/pom.xml | 3 +-
integration-tests/google-storage/pom.xml | 4 +-
integration-tests/google/pom.xml | 3 +-
integration-tests/graphql/pom.xml | 3 +-
integration-tests/grok/pom.xml | 4 +-
integration-tests/grpc/pom.xml | 3 +-
integration-tests/hazelcast/pom.xml | 3 +-
integration-tests/headersmap/pom.xml | 3 +-
integration-tests/hl7/pom.xml | 3 +-
integration-tests/http/pom.xml | 3 +-
integration-tests/hystrix/pom.xml | 3 +-
integration-tests/infinispan/pom.xml | 5 +-
integration-tests/influxdb/pom.xml | 3 +-
integration-tests/ipfs/pom.xml | 3 +-
integration-tests/jackson-avro/pom.xml | 3 +-
integration-tests/jackson-protobuf/pom.xml | 3 +-
integration-tests/jaxb/pom.xml | 3 +-
integration-tests/jdbc/pom.xml | 5 +-
integration-tests/jing/pom.xml | 3 +-
integration-tests/jira/pom.xml | 3 +-
integration-tests/jms-artemis-client/pom.xml | 3 +-
integration-tests/jms-qpid-amqp-client/pom.xml | 3 +-
integration-tests/jolt/pom.xml | 4 +-
integration-tests/jpa/pom.xml | 4 +-
integration-tests/js-dsl/pom.xml | 5 +-
integration-tests/jsch/pom.xml | 3 +-
integration-tests/jslt/pom.xml | 3 +-
integration-tests/json-validator/pom.xml | 6 +-
integration-tests/jsonata/pom.xml | 4 +-
integration-tests/jsonpath/pom.xml | 3 +-
integration-tests/jta/pom.xml | 4 +-
integration-tests/kafka-sasl-ssl/pom.xml | 3 +-
integration-tests/kafka-sasl/pom.xml | 3 +-
integration-tests/kafka-ssl/pom.xml | 3 +-
integration-tests/kafka/pom.xml | 3 +-
integration-tests/kamelet/pom.xml | 4 +-
integration-tests/kotlin/pom.xml | 5 +-
integration-tests/kubernetes/pom.xml | 3 +-
integration-tests/kudu/pom.xml | 3 +-
integration-tests/leveldb/pom.xml | 4 +-
integration-tests/lra/pom.xml | 3 +-
integration-tests/lumberjack/pom.xml | 4 +-
integration-tests/mail/pom.xml | 5 +-
integration-tests/main-caffeine-lrucache/pom.xml | 5 +-
integration-tests/main-collector/pom.xml | 5 +-
integration-tests/main-command-mode/pom.xml | 7 +-
integration-tests/main-devmode/pom.xml | 5 +-
integration-tests/main-discovery-disabled/pom.xml | 5 +-
integration-tests/main-unknown-args-fail/pom.xml | 7 +-
integration-tests/main-unknown-args-ignore/pom.xml | 7 +-
integration-tests/main-xml-io/pom.xml | 5 +-
integration-tests/main-xml-jaxb/pom.xml | 5 +-
integration-tests/main-yaml/pom.xml | 5 +-
integration-tests/main/pom.xml | 5 +-
integration-tests/master/pom.xml | 4 +-
integration-tests/messaging/pom.xml | 3 +-
integration-tests/micrometer/pom.xml | 4 +-
integration-tests/microprofile/pom.xml | 3 +-
integration-tests/minio/pom.xml | 4 +-
integration-tests/mllp/pom.xml | 3 +-
integration-tests/mongodb-grouped/pom.xml | 5 +-
integration-tests/msv/pom.xml | 3 +-
integration-tests/mustache/pom.xml | 3 +-
integration-tests/nagios/pom.xml | 3 +-
integration-tests/nats/pom.xml | 3 +-
integration-tests/netty/pom.xml | 3 +-
integration-tests/nitrite/pom.xml | 4 +-
integration-tests/nsq/pom.xml | 3 +-
integration-tests/oaipmh/pom.xml | 4 +-
integration-tests/olingo4/pom.xml | 3 +-
integration-tests/openapi-java/pom.xml | 3 +-
integration-tests/openstack/pom.xml | 3 +-
integration-tests/opentelemetry/pom.xml | 4 +-
integration-tests/opentracing/pom.xml | 3 +-
integration-tests/optaplanner/pom.xml | 3 +-
integration-tests/paho-mqtt5/pom.xml | 4 +-
integration-tests/paho/pom.xml | 4 +-
integration-tests/pdf/pom.xml | 3 +-
integration-tests/pg-replication-slot/pom.xml | 3 +-
integration-tests/pgevent/pom.xml | 3 +-
integration-tests/platform-http-engine/pom.xml | 3 +-
integration-tests/platform-http/pom.xml | 3 +-
integration-tests/pom.xml | 4 +-
integration-tests/protobuf/pom.xml | 3 +-
integration-tests/pubnub/pom.xml | 3 +-
integration-tests/quartz/pom.xml | 3 +-
integration-tests/qute/pom.xml | 3 +-
integration-tests/rabbitmq/pom.xml | 3 +-
integration-tests/reactive-streams/pom.xml | 3 +-
integration-tests/rest-openapi/pom.xml | 3 +-
integration-tests/rest/pom.xml | 3 +-
integration-tests/saga/pom.xml | 3 +-
integration-tests/salesforce/pom.xml | 5 +-
.../component/salesforce/generated/Account.java | 20 ---
.../salesforce/generated/QueryRecordsAccount.java | 2 -
integration-tests/sap-netweaver/pom.xml | 3 +-
integration-tests/saxon/pom.xml | 3 +-
integration-tests/servicenow/pom.xml | 3 +-
integration-tests/servlet/pom.xml | 3 +-
integration-tests/shiro/pom.xml | 4 +-
integration-tests/sjms-artemis-client/pom.xml | 3 +-
integration-tests/sjms-qpid-amqp-client/pom.xml | 3 +-
integration-tests/sjms2-artemis-client/pom.xml | 3 +-
integration-tests/sjms2-qpid-amqp-client/pom.xml | 3 +-
integration-tests/slack/pom.xml | 3 +-
.../smallrye-reactive-messaging/pom.xml | 4 +-
integration-tests/soap/pom.xml | 3 +-
integration-tests/solr/pom.xml | 3 +-
integration-tests/splunk/pom.xml | 4 +-
integration-tests/spring-rabbitmq/pom.xml | 4 +-
integration-tests/sql/pom.xml | 3 +-
integration-tests/ssh/pom.xml | 3 +-
integration-tests/stax/pom.xml | 3 +-
integration-tests/stringtemplate/pom.xml | 4 +-
integration-tests/syndication/pom.xml | 3 +-
integration-tests/syslog/pom.xml | 3 +-
integration-tests/tarfile/pom.xml | 3 +-
integration-tests/telegram/pom.xml | 3 +-
integration-tests/tika/pom.xml | 4 +-
integration-tests/twilio/pom.xml | 3 +-
integration-tests/twitter/pom.xml | 5 +-
integration-tests/univocity-parsers/pom.xml | 3 +-
integration-tests/validator/pom.xml | 3 +-
integration-tests/velocity/pom.xml | 4 +-
integration-tests/vertx-kafka/pom.xml | 4 +-
integration-tests/vertx-websocket/pom.xml | 4 +-
integration-tests/vertx/pom.xml | 4 +-
integration-tests/weather/pom.xml | 3 +-
integration-tests/xchange/pom.xml | 3 +-
integration-tests/xml/pom.xml | 3 +-
integration-tests/xmlsecurity/pom.xml | 3 +-
integration-tests/xpath/pom.xml | 5 +-
integration-tests/xstream/pom.xml | 3 +-
integration-tests/zendesk/pom.xml | 3 +-
pom.xml | 10 +-
poms/bom/pom.xml | 6 +
.../integration-test-pom.xml | 4 +-
269 files changed, 1141 insertions(+), 573 deletions(-)
copy docs/modules/ROOT/partials/reference/{others/zipkin.adoc => components/hwcloud-dms.adoc} (100%)
copy docs/modules/ROOT/partials/reference/{others/zipkin.adoc => components/hwcloud-imagerecognition.adoc} (100%)
copy docs/modules/ROOT/partials/reference/{others/zipkin.adoc => components/hwcloud-obs.adoc} (100%)
create mode 100644 docs/util/jsonpath-util.js
copy extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/{QuarkusKafkaClientFactoryDisabledTest.java => KafkaDevServicesDisabledTest.java} (69%)
copy extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/{QuarkusKafkaClientFactoryEnabledTest.java => KafkaDevServicesEnabledTest.java} (55%)
copy integration-tests/kafka-sasl/src/main/resources/application.properties => extensions/kafka/deployment/src/test/resources/application-configuration-devservices-disabled.properties (99%)
create mode 100644 extensions/kafka/runtime/src/main/doc/usage.adoc
copy extensions/{freemarker/runtime/src/main/java/org/apache/camel/quarkus/component/freemarker/CamelFreemarkerRecorder.java => kafka/runtime/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaRecorder.java} (66%)
delete mode 100644 integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/TestSequenceNumberProvider.java
[camel-quarkus] 05/07: Remove redundant reflective class
registration for SunJaxb21NamespacePrefixMapper
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a2e2459cd82595ec5abc62703ccdb0eb525b7f13
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Sep 2 07:57:34 2021 +0100
Remove redundant reflective class registration for SunJaxb21NamespacePrefixMapper
---
.../camel/quarkus/component/jaxb/deployment/JaxbProcessor.java | 7 -------
1 file changed, 7 deletions(-)
diff --git a/extensions/jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/jaxb/deployment/JaxbProcessor.java b/extensions/jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/jaxb/deployment/JaxbProcessor.java
index 747dae2..c01f2f8 100644
--- a/extensions/jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/jaxb/deployment/JaxbProcessor.java
+++ b/extensions/jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/jaxb/deployment/JaxbProcessor.java
@@ -21,9 +21,7 @@ import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
-import org.apache.camel.converter.jaxb.mapper.SunJaxb21NamespacePrefixMapper;
import org.apache.camel.quarkus.component.jaxb.JaxbRecorder;
import org.apache.camel.quarkus.core.deployment.spi.CamelContextCustomizerBuildItem;
@@ -42,11 +40,6 @@ class JaxbProcessor {
}
@BuildStep
- ReflectiveClassBuildItem mapper() {
- return new ReflectiveClassBuildItem(false, false, SunJaxb21NamespacePrefixMapper.class);
- }
-
- @BuildStep
@Record(value = ExecutionTime.STATIC_INIT)
CamelContextCustomizerBuildItem contextCustomizer(JaxbRecorder recorder) {
return new CamelContextCustomizerBuildItem(recorder.newRestBindingJaxbDataFormatFactoryContextCustomizer());
[camel-quarkus] 06/07: Adapt to latest Camel API changes
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3c97bf622c71a0ab024ab4bd56a6690768b5b284
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Sep 2 08:53:34 2021 +0100
Adapt to latest Camel API changes
---
docs/modules/ROOT/pages/reference/extensions/google-sheets.adoc | 2 +-
docs/modules/ROOT/partials/reference/components/json-patch.adoc | 1 +
extensions-jvm/spark/integration-test/pom.xml | 2 +-
.../test/java/org/apache/camel/quarkus/component/as2/it/As2Sender.java | 2 +-
.../quarkus/component/google/pubsub/it/GooglePubsubTestResource.java | 1 +
5 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/google-sheets.adoc b/docs/modules/ROOT/pages/reference/extensions/google-sheets.adoc
index ff46990..541a809 100644
--- a/docs/modules/ROOT/pages/reference/extensions/google-sheets.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/google-sheets.adoc
@@ -20,7 +20,7 @@ Manage spreadsheets in Google Sheets. Poll for changes in Google Sheets.
== What's inside
* xref:{cq-camel-components}::google-sheets-component.adoc[Google Sheets component], URI syntax: `google-sheets:apiName/methodName`
-* xref:{cq-camel-components}::google-sheets-stream-component.adoc[Google Sheets Stream component], URI syntax: `google-sheets-stream:apiName`
+* xref:{cq-camel-components}::google-sheets-stream-component.adoc[Google Sheets Stream component], URI syntax: `google-sheets-stream:spreadsheetId`
Please refer to the above links for usage and configuration details.
diff --git a/docs/modules/ROOT/partials/reference/components/json-patch.adoc b/docs/modules/ROOT/partials/reference/components/json-patch.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/json-patch.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid warnings when this file is included from a Camel page
diff --git a/extensions-jvm/spark/integration-test/pom.xml b/extensions-jvm/spark/integration-test/pom.xml
index a6056d2..73df3c9 100644
--- a/extensions-jvm/spark/integration-test/pom.xml
+++ b/extensions-jvm/spark/integration-test/pom.xml
@@ -100,7 +100,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED</argLine>
+ <argLine>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Sender.java b/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Sender.java
index e8d2d9e..b7f5fb2 100644
--- a/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Sender.java
+++ b/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Sender.java
@@ -44,7 +44,7 @@ public class As2Sender {
As2Helper.AS2_NAME,
As2Helper.AS2_NAME, AS2MessageStructure.PLAIN,
ContentType.create(AS2MediaType.APPLICATION_EDIFACT, AS2Charset.US_ASCII), null, null, null, null,
- null, As2Helper.DISPOSITION_NOTIFICATION_TO, As2Helper.SIGNED_RECEIPT_MIC_ALGORITHMS, null, null);
+ null, As2Helper.DISPOSITION_NOTIFICATION_TO, As2Helper.SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null);
}
public interface As2SenderClient {
diff --git a/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubsubTestResource.java b/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubsubTestResource.java
index 6e55116..8646edc 100644
--- a/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubsubTestResource.java
+++ b/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubsubTestResource.java
@@ -61,6 +61,7 @@ public class GooglePubsubTestResource implements QuarkusTestResourceLifecycleMan
"project.id", PROJECT_ID,
"topic.name", TOPIC,
"subscription.name", SUBSCRIPTION,
+ "camel.component.google-pubsub.authenticate", "false",
"camel.component.google-pubsub.endpoint", container.getEmulatorEndpoint());
} catch (Exception e) {
throw new RuntimeException(e);
[camel-quarkus] 01/07: Upgrade Camel to 3.12.0
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f632ed39f5aa542fb8a3ea8b9c47dbd02d019f97
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Jun 29 11:56:56 2021 +0100
Upgrade Camel to 3.12.0
---
docs/antora-playbook-dev.yml | 2 +-
docs/antora-playbook.yml | 2 +-
docs/antora.yml | 2 +-
pom.xml | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/antora-playbook-dev.yml b/docs/antora-playbook-dev.yml
index 9001771..d4ab0d0 100644
--- a/docs/antora-playbook-dev.yml
+++ b/docs/antora-playbook-dev.yml
@@ -26,7 +26,7 @@ content:
start_path: docs
- url: git@github.com:apache/camel.git
branches:
- - camel-3.11.x # replace ${camel.docs.branch}
+ - camel-3.12.x # replace ${camel.docs.branch}
start_paths:
- docs/components
- url: git@github.com:apache/camel.git
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
index ac412d1..02d4a3c 100644
--- a/docs/antora-playbook.yml
+++ b/docs/antora-playbook.yml
@@ -32,7 +32,7 @@ content:
- url: https://github.com/apache/camel.git
branches:
- - camel-3.11.x # replace ${camel.docs.branch}
+ - camel-3.12.x # replace ${camel.docs.branch}
start_paths:
- docs/components
diff --git a/docs/antora.yml b/docs/antora.yml
index 1556a93..b733143 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -22,7 +22,7 @@ nav:
- modules/ROOT/nav.adoc
asciidoc:
attributes:
- cq-camel-components: 3.11.x@components # replace ${camel.docs.components.xref}
+ cq-camel-components: 3.12.x@components # replace ${camel.docs.components.xref}
min-maven-version: 3.6.2 # replace ${min-maven-version}
target-maven-version: 3.8.1 # replace ${target-maven-version}
quarkus-version: 2.3.0.CR1 # replace ${quarkus.version}
diff --git a/pom.xml b/pom.xml
index d212477..d2cbccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.11.2</version>
+ <version>3.12.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.camel.quarkus</groupId>
@@ -38,8 +38,8 @@
<properties>
<!-- Primary dependencies - maintained manually -->
- <camel.major.minor>3.11</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
- <camel.version>${camel.major.minor}.2</camel.version>
+ <camel.major.minor>3.12</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
+ <camel.version>${camel.major.minor}.0-SNAPSHOT</camel.version>
<camel.docs.components.xref>${camel.major.minor}.x@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable branch on which our Antora docs depends -->
[camel-quarkus] 02/07: Upgrade spark and hadoop versions
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3b3d35920931debef3898144bf9af14f7778aac5
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Tue Jul 6 14:30:31 2021 +0200
Upgrade spark and hadoop versions
---
.../ROOT/pages/reference/extensions/aws2-sqs.adoc | 4 +-
.../reference/extensions/elasticsearch-rest.adoc | 4 +-
.../ROOT/pages/reference/extensions/hdfs.adoc | 4 +-
.../reference/extensions/huaweicloud-smn.adoc | 2 +-
.../reference/extensions/microprofile-health.adoc | 4 +-
.../ROOT/pages/reference/extensions/netty.adoc | 4 +-
.../partials/reference/components/aws2-sqs.adoc | 2 +-
.../reference/components/elasticsearch-rest.adoc | 2 +-
.../partials/reference/components/hwcloud-smn.adoc | 2 +-
.../ROOT/partials/reference/components/netty.adoc | 2 +-
.../reference/languages/exchangeProperty.adoc | 2 +-
.../ROOT/partials/reference/languages/file.adoc | 2 +-
.../ROOT/partials/reference/languages/header.adoc | 2 +-
.../partials/reference/languages/tokenize.adoc | 2 +-
.../reference/others/microprofile-health.adoc | 2 +-
extensions-jvm/hdfs/runtime/pom.xml | 2 +-
extensions-jvm/spark/bom/pom.xml | 51 ++++++++++++++++++----
pom.xml | 9 +++-
18 files changed, 71 insertions(+), 31 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc b/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc
index 6dbebf4..be179d2 100644
--- a/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Sending and receive messages to/from AWS SQS service using AWS SDK version 2.x.
+:cq-description: Send and receive messages to/from AWS SQS service using AWS SDK version 2.x.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0##
-Sending and receive messages to/from AWS SQS service using AWS SDK version 2.x.
+Send and receive messages to/from AWS SQS service using AWS SDK version 2.x.
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/elasticsearch-rest.adoc b/docs/modules/ROOT/pages/reference/extensions/elasticsearch-rest.adoc
index b43e3eb..6a26f46 100644
--- a/docs/modules/ROOT/pages/reference/extensions/elasticsearch-rest.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/elasticsearch-rest.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Send requests to with an ElasticSearch via REST API.
+:cq-description: Send requests to ElasticSearch via REST API
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0##
-Send requests to with an ElasticSearch via REST API.
+Send requests to ElasticSearch via REST API
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/hdfs.adoc b/docs/modules/ROOT/pages/reference/extensions/hdfs.adoc
index 48bd5e5..d366cae 100644
--- a/docs/modules/ROOT/pages/reference/extensions/hdfs.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/hdfs.adoc
@@ -6,7 +6,7 @@
:cq-native-supported: false
:cq-status: Preview
:cq-status-deprecation: Preview
-:cq-description: Read and write from/to an HDFS filesystem using Hadoop 2.x.
+:cq-description: Read and write from/to an HDFS filesystem using Hadoop 3.x.
:cq-deprecated: false
:cq-jvm-since: 1.1.0
:cq-native-since: n/a
@@ -14,7 +14,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
-Read and write from/to an HDFS filesystem using Hadoop 2.x.
+Read and write from/to an HDFS filesystem using Hadoop 3.x.
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/huaweicloud-smn.adoc b/docs/modules/ROOT/pages/reference/extensions/huaweicloud-smn.adoc
index be42673..98e05f9 100644
--- a/docs/modules/ROOT/pages/reference/extensions/huaweicloud-smn.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/huaweicloud-smn.adoc
@@ -18,7 +18,7 @@ Huawei Cloud component to integrate with SimpleNotification services
== What's inside
-* xref:{cq-camel-components}::hwcloud-smn-component.adoc[Huawei Cloud Simple Message Notification (SMN) component], URI syntax: `hwcloud-smn:smnService`
+* xref:{cq-camel-components}::hwcloud-smn-component.adoc[Huawei Simple Message Notification (SMN) component], URI syntax: `hwcloud-smn:smnService`
Please refer to the above link for usage and configuration details.
diff --git a/docs/modules/ROOT/pages/reference/extensions/microprofile-health.adoc b/docs/modules/ROOT/pages/reference/extensions/microprofile-health.adoc
index a25153a..92c5e6c 100644
--- a/docs/modules/ROOT/pages/reference/extensions/microprofile-health.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/microprofile-health.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Bridging Eclipse MicroProfile Health with Camel health checks
+:cq-description: Expose Camel health checks via MicroProfile Health
:cq-deprecated: false
:cq-jvm-since: 0.3.0
:cq-native-since: 0.3.0
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##0.3.0## [.badge-key]##Native since##[.badge-supported]##0.3.0##
-Bridging Eclipse MicroProfile Health with Camel health checks
+Expose Camel health checks via MicroProfile Health
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/netty.adoc b/docs/modules/ROOT/pages/reference/extensions/netty.adoc
index 30a781b..3d42861 100644
--- a/docs/modules/ROOT/pages/reference/extensions/netty.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/netty.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Socket level networking using TCP or UDP with the Netty 4.x.
+:cq-description: Socket level networking using TCP or UDP with Netty 4.x.
:cq-deprecated: false
:cq-jvm-since: 0.4.0
:cq-native-since: 0.4.0
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##0.4.0## [.badge-key]##Native since##[.badge-supported]##0.4.0##
-Socket level networking using TCP or UDP with the Netty 4.x.
+Socket level networking using TCP or UDP with Netty 4.x.
== What's inside
diff --git a/docs/modules/ROOT/partials/reference/components/aws2-sqs.adoc b/docs/modules/ROOT/partials/reference/components/aws2-sqs.adoc
index 2a953b3..548e3ad 100644
--- a/docs/modules/ROOT/partials/reference/components/aws2-sqs.adoc
+++ b/docs/modules/ROOT/partials/reference/components/aws2-sqs.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.0.0
:cq-camel-part-name: aws2-sqs
:cq-camel-part-title: AWS Simple Queue Service (SQS)
-:cq-camel-part-description: Sending and receive messages to/from AWS SQS service using AWS SDK version 2.x.
+:cq-camel-part-description: Send and receive messages to/from AWS SQS service using AWS SDK version 2.x.
:cq-extension-page-title: AWS 2 Simple Queue Service (SQS)
diff --git a/docs/modules/ROOT/partials/reference/components/elasticsearch-rest.adoc b/docs/modules/ROOT/partials/reference/components/elasticsearch-rest.adoc
index 3daddf0..5c492ca 100644
--- a/docs/modules/ROOT/partials/reference/components/elasticsearch-rest.adoc
+++ b/docs/modules/ROOT/partials/reference/components/elasticsearch-rest.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.0.0
:cq-camel-part-name: elasticsearch-rest
:cq-camel-part-title: Elasticsearch Rest
-:cq-camel-part-description: Send requests to with an ElasticSearch via REST API.
+:cq-camel-part-description: Send requests to ElasticSearch via REST API
:cq-extension-page-title: Elasticsearch Rest
diff --git a/docs/modules/ROOT/partials/reference/components/hwcloud-smn.adoc b/docs/modules/ROOT/partials/reference/components/hwcloud-smn.adoc
index 06732e9..abc460f 100644
--- a/docs/modules/ROOT/partials/reference/components/hwcloud-smn.adoc
+++ b/docs/modules/ROOT/partials/reference/components/hwcloud-smn.adoc
@@ -8,6 +8,6 @@
:cq-jvm-since: 1.8.0
:cq-native-since: n/a
:cq-camel-part-name: hwcloud-smn
-:cq-camel-part-title: Huawei Cloud Simple Message Notification (SMN)
+:cq-camel-part-title: Huawei Simple Message Notification (SMN)
:cq-camel-part-description: To broadcast messages and connect cloud services through notifications on Huawei Cloud
:cq-extension-page-title: SimpleNotification
diff --git a/docs/modules/ROOT/partials/reference/components/netty.adoc b/docs/modules/ROOT/partials/reference/components/netty.adoc
index 559ee24..46dea2e 100644
--- a/docs/modules/ROOT/partials/reference/components/netty.adoc
+++ b/docs/modules/ROOT/partials/reference/components/netty.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.4.0
:cq-camel-part-name: netty
:cq-camel-part-title: Netty
-:cq-camel-part-description: Socket level networking using TCP or UDP with the Netty 4.x.
+:cq-camel-part-description: Socket level networking using TCP or UDP with Netty 4.x.
:cq-extension-page-title: Netty
diff --git a/docs/modules/ROOT/partials/reference/languages/exchangeProperty.adoc b/docs/modules/ROOT/partials/reference/languages/exchangeProperty.adoc
index 55b63d2..9533c59 100644
--- a/docs/modules/ROOT/partials/reference/languages/exchangeProperty.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/exchangeProperty.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.0.1
:cq-camel-part-name: exchangeProperty
:cq-camel-part-title: ExchangeProperty
-:cq-camel-part-description: Get the value of named Camel Exchange property.
+:cq-camel-part-description: Get values of named Camel Exchange properties.
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/languages/file.adoc b/docs/modules/ROOT/partials/reference/languages/file.adoc
index 51b37b3..4f56872 100644
--- a/docs/modules/ROOT/partials/reference/languages/file.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/file.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.0.1
:cq-camel-part-name: file
:cq-camel-part-title: File
-:cq-camel-part-description: For expressions and predicates using the file/simple language.
+:cq-camel-part-description: File related capabilities for the Simle language
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/languages/header.adoc b/docs/modules/ROOT/partials/reference/languages/header.adoc
index ba1066e..5611593 100644
--- a/docs/modules/ROOT/partials/reference/languages/header.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/header.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.0.1
:cq-camel-part-name: header
:cq-camel-part-title: Header
-:cq-camel-part-description: Get the value of the named Camel Message header.
+:cq-camel-part-description: Get values of Camel Message headers.
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/languages/tokenize.adoc b/docs/modules/ROOT/partials/reference/languages/tokenize.adoc
index a3b2751..fe9aa69 100644
--- a/docs/modules/ROOT/partials/reference/languages/tokenize.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/tokenize.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.0.1
:cq-camel-part-name: tokenize
:cq-camel-part-title: Tokenize
-:cq-camel-part-description: Tokenize text payloads using the specified delimiter patterns.
+:cq-camel-part-description: Tokenize text payloads using delimiter patterns.
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/others/microprofile-health.adoc b/docs/modules/ROOT/partials/reference/others/microprofile-health.adoc
index 89dc0a6..ed35e3c 100644
--- a/docs/modules/ROOT/partials/reference/others/microprofile-health.adoc
+++ b/docs/modules/ROOT/partials/reference/others/microprofile-health.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.3.0
:cq-camel-part-name: microprofile-health
:cq-camel-part-title: Microprofile Health
-:cq-camel-part-description: Bridging Eclipse MicroProfile Health with Camel health checks
+:cq-camel-part-description: Expose Camel health checks via MicroProfile Health
:cq-extension-page-title: MicroProfile Health
diff --git a/extensions-jvm/hdfs/runtime/pom.xml b/extensions-jvm/hdfs/runtime/pom.xml
index 3813f3f..3781f1e 100644
--- a/extensions-jvm/hdfs/runtime/pom.xml
+++ b/extensions-jvm/hdfs/runtime/pom.xml
@@ -28,7 +28,7 @@
<artifactId>camel-quarkus-hdfs</artifactId>
<name>Camel Quarkus :: HDFS :: Runtime</name>
- <description>Read and write from/to an HDFS filesystem using Hadoop 2.x.</description>
+ <description>Read and write from/to an HDFS filesystem using Hadoop 3.x.</description>
<properties>
<camel.quarkus.jvmSince>1.1.0</camel.quarkus.jvmSince>
diff --git a/extensions-jvm/spark/bom/pom.xml b/extensions-jvm/spark/bom/pom.xml
index 0923bbc..3675431 100644
--- a/extensions-jvm/spark/bom/pom.xml
+++ b/extensions-jvm/spark/bom/pom.xml
@@ -29,7 +29,7 @@
<artifactId>camel-quarkus-spark-bom</artifactId>
<packaging>pom</packaging>
<name>Camel Quarkus :: Spark :: BOM</name>
- <description>Camel Quarkus Spark specific dependency managament</description>
+ <description>Camel Quarkus Spark specific dependency management</description>
<dependencyManagement>
<dependencies>
@@ -73,6 +73,11 @@
</dependency>
<dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-servlet</artifactId>
+ <version>${guice-servlet.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>${jersey-sun.version}</version><!-- Replace com.sun.jersey:jersey-core:1.9 that contains old and incompatible javax.ws.rs.* classes -->
@@ -98,11 +103,36 @@
<version>${jersey-sun.version}</version><!-- Replace com.sun.jersey:jersey-core:1.9 that contains old and incompatible javax.ws.rs.* classes -->
</dependency>
<dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ <version>${jersey-sun.version}</version> <!-- Spark -->
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>${commons-net.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>${netty3.version}</version><!-- Managed here because it would conflict with netty 4 used elsewhere -->
</dependency>
<dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-json</artifactId>
+ <version>${metrics.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-jvm</artifactId>
+ <version>${metrics.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>${commons-text.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version><!-- Managed here because it is not used elsewhere -->
@@ -110,37 +140,42 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>${hadoop2.version}</version><!-- Managed here because it would conflict with Hadoop 3 used elsewhere -->
+ <version>${hadoop3.version}</version><!-- Managed here because it would conflict with Hadoop 3 used elsewhere -->
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop2.version}</version><!-- Managed here because it would conflict with Hadoop 3 used elsewhere -->
+ <version>${hadoop3.version}</version><!-- Managed here because it would conflict with Hadoop 3 used elsewhere -->
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${hadoop2.version}</version><!-- Managed here because it would conflict with Hadoop 3 used elsewhere -->
+ <version>${hadoop3.version}</version><!-- Managed here because it would conflict with Hadoop 3 used elsewhere -->
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
- <version>${hadoop2.version}</version><!-- Managed here because it would conflict with Hadoop 3 used elsewhere -->
+ <version>${hadoop3.version}</version><!-- Managed here because it would conflict with Hadoop 3 used elsewhere -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>${libthrift-version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
- <version>${scala-2.11.version}</version>
+ <version>${scala-2.12.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>${scala-2.11.version}</version>
+ <version>${scala-2.12.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
- <version>${scala-2.11.version}</version>
+ <version>${scala-2.12.version}</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
diff --git a/pom.xml b/pom.xml
index d2cbccb..af50f34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,8 @@
<commons-collections.version>3.2.2</commons-collections.version><!-- used by hbase, should be pretty stable as commons-collections are not developed actively anymore -->
<commons-lang.version>2.6</commons-lang.version><!-- used by hbase, should be pretty stable as commons-lang is not developed actively anymore -->
<commons-math3.version>3.6.1</commons-math3.version><!-- Mess in the transitive dependencies of Spark and hbase-testing-util -->
+ <commons-net.version>${commons-net-version}</commons-net.version> <!-- Spark -->
+ <commons-text.version>${commons-text-version}</commons-text.version> <!-- Spark -->
<curator.version>4.3.0</curator.version><!-- Mess in the transitive dependencies of Spark, Zookeeper and other hadoop related components -->
<derby.version>10.15.2.0</derby.version><!-- Spark -->
<eddsa.version>${eddsa-version}</eddsa.version>
@@ -78,7 +80,8 @@
<graalvm.version>21.2.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
<grpc.version>1.40.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<gson.version>2.8.6</gson.version><!-- @sync com.ibm.jsonata4java:JSONata4Java:${jsonata4java-version} dep:com.google.code.gson:gson -->
- <hadoop2.version>${hadoop2-version}</hadoop2.version><!-- Spark -->
+ <guice-servlet.version>4.0</guice-servlet.version><!-- Spark -->
+ <hadoop3.version>${hadoop3-version}</hadoop3.version><!-- Spark -->
<hapi.version>${hapi-version}</hapi.version>
<hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version>
<hbase.version>${hbase-version}</hbase.version>
@@ -99,7 +102,9 @@
<kafka.version>2.8.1</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<kudu.version>${kudu-version}</kudu.version>
<kotlin.version>1.5.30</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
+ <libthrift.version>${libthrift-version}</libthrift.version> <!-- Spark -->
<netty3.version>${netty3-version}</netty3.version><!-- Spark -->
+ <metrics.version>${metrics-version}</metrics.version><!-- Spark -->
<minio.version>${minio-version}</minio.version><!-- Keep in sync with quarkiverse-minio and Camel, preferring Camel assuming that it is more likely to be up to date -->
<mvel2.version>${mvel-version}</mvel2.version>
<nimbus-jose-jwt.version>9.10</nimbus-jose-jwt.version><!-- Mess in hdfs transitive deps, used also by io.strimzi:kafka-oauth-client recommended by https://quarkus.io/guides/kafka#authenticating-with-oauth -->
@@ -108,7 +113,7 @@
<protobuf.version>${protobuf-version}</protobuf.version>
<retrofit.version>2.5.0</retrofit.version>
<saaj.impl.version>1.5.3</saaj.impl.version>
- <scala-2.11.version>2.11.12</scala-2.11.version><!-- Spark -->
+ <scala-2.12.version>2.12.14</scala-2.12.version><!-- Spark -->
<smallrye.reactive.messaging.camel.version>3.9.1</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<spring.version>${spring5-version}</spring.version>
<snakeyaml.version>${snakeyaml-version}</snakeyaml.version>
[camel-quarkus] 03/07: Camel 3.12 : Dataformat fix attributes names
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 856983cde5d78637df4b334a217de6a333a0c079
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Tue Jul 6 17:35:09 2021 +0200
Camel 3.12 : Dataformat fix attributes names
---
.../src/main/resources/routes/gson-routes.xml | 2 +-
.../src/main/resources/routes/jackson-routes.xml | 18 +++++++++---------
.../src/main/resources/routes/johnzon-routes.xml | 2 +-
.../src/main/resources/routes/jsonb-routes.xml | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/integration-tests/dataformats-json/src/main/resources/routes/gson-routes.xml b/integration-tests/dataformats-json/src/main/resources/routes/gson-routes.xml
index edcb2f3..e9cd7ab 100644
--- a/integration-tests/dataformats-json/src/main/resources/routes/gson-routes.xml
+++ b/integration-tests/dataformats-json/src/main/resources/routes/gson-routes.xml
@@ -26,7 +26,7 @@
<route>
<from uri="direct:Gson-type-as-attribute"/>
<unmarshal>
- <json library="Gson" unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
+ <json library="Gson" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
</unmarshal>
</route>
diff --git a/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml b/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml
index bfee9c4..d0a240a 100644
--- a/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml
+++ b/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml
@@ -26,7 +26,7 @@
<route>
<from uri="direct:Jackson-type-as-attribute"/>
<unmarshal>
- <json library="Jackson" unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
+ <json library="Jackson" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
</unmarshal>
</route>
@@ -42,14 +42,14 @@
<route>
<from uri="direct:jacksonxml-unmarshal-spring-list-backPojo"/>
- <unmarshal><jacksonxml useList="true" unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal>
+ <unmarshal><jacksonxml useList="true" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal>
<to uri="mock:jacksonxml-unmarshal-spring-list-reversePojo"/>
</route>
<route>
<from uri="direct:jacksonxml-marshal-spring-enablefeature"/>
<marshal>
- <jacksonxml unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"
+ <jacksonxml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"
enableFeatures="WRAP_ROOT_VALUE"/>
</marshal>
</route>
@@ -72,35 +72,35 @@
<route>
<from uri="direct:jacksonxml-xml-inPojo"/>
- <marshal><jacksonxml unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></marshal>
+ <marshal><jacksonxml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></marshal>
</route>
<route>
<from uri="direct:jacksonxml-xml-backPojo"/>
- <unmarshal><jacksonxml unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal>
+ <unmarshal><jacksonxml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal>
<to uri="mock:jacksonxml-xml-reversePojo"/>
</route>
<route>
<from uri="direct:jacksonxml-xml-inAgeView"/>
- <marshal><jacksonxml unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView" jsonViewTypeName="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></marshal>
+ <marshal><jacksonxml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView" jsonView="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></marshal>
</route>
<route>
<from uri="direct:jacksonxml-xml-backAgeView"/>
- <unmarshal><jacksonxml unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView" jsonViewTypeName="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></unmarshal>
+ <unmarshal><jacksonxml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView" jsonView="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></unmarshal>
<to uri="mock:jacksonxml-xml-reverseAgeView"/>
</route>
<route>
<from uri="direct:jackson-xml-unmarshal-list-backPojo"/>
- <unmarshal><json library="Jackson" useList="true" unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal>
+ <unmarshal><json library="Jackson" useList="true" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal>
<to uri="mock:jackson-xml-unmarshal-list-reversePojo"/>
</route>
<route>
<from uri="direct:jackson-enablefeature-in"/>
- <marshal><json library="Jackson" unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"
+ <marshal><json library="Jackson" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"
enableFeatures="WRAP_ROOT_VALUE"/></marshal>
</route>
</routes>
diff --git a/integration-tests/dataformats-json/src/main/resources/routes/johnzon-routes.xml b/integration-tests/dataformats-json/src/main/resources/routes/johnzon-routes.xml
index 539ff1f..191ff7d 100644
--- a/integration-tests/dataformats-json/src/main/resources/routes/johnzon-routes.xml
+++ b/integration-tests/dataformats-json/src/main/resources/routes/johnzon-routes.xml
@@ -26,7 +26,7 @@
<route>
<from uri="direct:Johnzon-type-as-attribute"/>
<unmarshal>
- <json library="Johnzon" unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
+ <json library="Johnzon" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
</unmarshal>
</route>
diff --git a/integration-tests/dataformats-json/src/main/resources/routes/jsonb-routes.xml b/integration-tests/dataformats-json/src/main/resources/routes/jsonb-routes.xml
index 261e88f..c48b9b6 100644
--- a/integration-tests/dataformats-json/src/main/resources/routes/jsonb-routes.xml
+++ b/integration-tests/dataformats-json/src/main/resources/routes/jsonb-routes.xml
@@ -26,7 +26,7 @@
<route>
<from uri="direct:Jsonb-type-as-attribute"/>
<unmarshal>
- <json library="Jsonb" unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
+ <json library="Jsonb" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
</unmarshal>
</route>
[camel-quarkus] 04/07: Sync minio version with quarkiverse version
due to incompatible okhttp version between quarkus and recent minio version
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit eaefd4317f29c32b9dc234261ca90e76763944f4
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Wed Aug 4 17:10:58 2021 +0200
Sync minio version with quarkiverse version due to incompatible okhttp version between quarkus and recent minio version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index af50f34..7f9c9cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
<libthrift.version>${libthrift-version}</libthrift.version> <!-- Spark -->
<netty3.version>${netty3-version}</netty3.version><!-- Spark -->
<metrics.version>${metrics-version}</metrics.version><!-- Spark -->
- <minio.version>${minio-version}</minio.version><!-- Keep in sync with quarkiverse-minio and Camel, preferring Camel assuming that it is more likely to be up to date -->
+ <minio.version>8.2.2</minio.version><!-- Keep in sync with quarkiverse-minio and Camel, preferring Camel assuming that it is more likely to be up to date. Keep quarkiverse version, until the okhttp dependeny version inherited from quarkus-bom is resolved as described here https://github.com/quarkiverse/quarkus-minio/pull/72 -->
<mvel2.version>${mvel-version}</mvel2.version>
<nimbus-jose-jwt.version>9.10</nimbus-jose-jwt.version><!-- Mess in hdfs transitive deps, used also by io.strimzi:kafka-oauth-client recommended by https://quarkus.io/guides/kafka#authenticating-with-oauth -->
<okhttp.version>${squareup-okhttp-version}</okhttp.version>
[camel-quarkus] 07/07: Adapt to latest Camel API changes
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit b86ca5542e16d7d67d0534d71a10ecc0dbf8e851
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Sep 27 09:32:03 2021 +0100
Adapt to latest Camel API changes
---
.../ROOT/pages/reference/extensions/bean.adoc | 2 +-
.../ROOT/pages/reference/extensions/groovy.adoc | 4 +--
.../ROOT/pages/reference/extensions/jsonpath.adoc | 6 ++--
.../ROOT/pages/reference/extensions/ognl.adoc | 4 +--
.../ROOT/pages/reference/extensions/ribbon.adoc | 6 ++--
.../ROOT/pages/reference/extensions/xpath.adoc | 4 +--
.../partials/reference/components/hwcloud-dms.adoc | 1 +
.../components/hwcloud-imagerecognition.adoc | 1 +
.../partials/reference/components/hwcloud-obs.adoc | 1 +
.../ROOT/partials/reference/languages/bean.adoc | 4 +--
.../ROOT/partials/reference/languages/csimple.adoc | 2 +-
.../ROOT/partials/reference/languages/groovy.adoc | 2 +-
.../partials/reference/languages/hl7terser.adoc | 2 +-
.../ROOT/partials/reference/languages/joor.adoc | 2 +-
.../partials/reference/languages/jsonpath.adoc | 4 +--
.../ROOT/partials/reference/languages/mvel.adoc | 2 +-
.../ROOT/partials/reference/languages/ognl.adoc | 2 +-
.../ROOT/partials/reference/languages/xpath.adoc | 2 +-
.../ROOT/partials/reference/languages/xquery.adoc | 2 +-
.../ROOT/partials/reference/others/ribbon.adoc | 2 +-
.../aws2/ddb/it/Aws2DdbStreamResource.java | 11 -------
.../component/aws2/ddb/it/Aws2DdbStreamRoutes.java | 2 +-
.../aws2/ddb/it/TestSequenceNumberProvider.java | 38 ----------------------
.../component/aws2/ddb/it/Aws2DdbStreamTest.java | 24 ++++----------
.../component/salesforce/generated/Account.java | 20 ------------
.../salesforce/generated/QueryRecordsAccount.java | 2 --
26 files changed, 36 insertions(+), 116 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/bean.adoc b/docs/modules/ROOT/pages/reference/extensions/bean.adoc
index fdfc5f7..eac977b 100644
--- a/docs/modules/ROOT/pages/reference/extensions/bean.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/bean.adoc
@@ -20,7 +20,7 @@ Invoke methods of Java beans
== What's inside
* xref:{cq-camel-components}::bean-component.adoc[Bean component], URI syntax: `bean:beanName`
-* xref:{cq-camel-components}:languages:bean-language.adoc[Bean method language]
+* xref:{cq-camel-components}:languages:bean-language.adoc[Bean Method language]
* xref:{cq-camel-components}::class-component.adoc[Class component], URI syntax: `class:beanName`
Please refer to the above links for usage and configuration details.
diff --git a/docs/modules/ROOT/pages/reference/extensions/groovy.adoc b/docs/modules/ROOT/pages/reference/extensions/groovy.adoc
index f07540d..10f9047 100644
--- a/docs/modules/ROOT/pages/reference/extensions/groovy.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/groovy.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: false
:cq-status: Preview
:cq-status-deprecation: Preview
-:cq-description: Evaluate a Groovy script.
+:cq-description: Evaluates a Groovy script.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: n/a
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
-Evaluate a Groovy script.
+Evaluates a Groovy script.
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/jsonpath.adoc b/docs/modules/ROOT/pages/reference/extensions/jsonpath.adoc
index c1bf632..c71caf8 100644
--- a/docs/modules/ROOT/pages/reference/extensions/jsonpath.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/jsonpath.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Evaluate a JsonPath expression against a JSON message body.
+:cq-description: Evaluates a JSONPath expression against a JSON message body.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
@@ -15,11 +15,11 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0##
-Evaluate a JsonPath expression against a JSON message body.
+Evaluates a JSONPath expression against a JSON message body.
== What's inside
-* xref:{cq-camel-components}:languages:jsonpath-language.adoc[JsonPath language]
+* xref:{cq-camel-components}:languages:jsonpath-language.adoc[JSONPath language]
Please refer to the above link for usage and configuration details.
diff --git a/docs/modules/ROOT/pages/reference/extensions/ognl.adoc b/docs/modules/ROOT/pages/reference/extensions/ognl.adoc
index fa12a79..ea19278 100644
--- a/docs/modules/ROOT/pages/reference/extensions/ognl.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/ognl.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: false
:cq-status: Preview
:cq-status-deprecation: Preview
-:cq-description: Evaluate an Apache Commons Object Graph Navigation Library (OGNL) expression against the Camel Exchange.
+:cq-description: Evaluates an OGNL expression (Apache Commons OGNL).
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: n/a
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
-Evaluate an Apache Commons Object Graph Navigation Library (OGNL) expression against the Camel Exchange.
+Evaluates an OGNL expression (Apache Commons OGNL).
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/ribbon.adoc b/docs/modules/ROOT/pages/reference/extensions/ribbon.adoc
index 2ec28b0..0521300 100644
--- a/docs/modules/ROOT/pages/reference/extensions/ribbon.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/ribbon.adoc
@@ -5,14 +5,14 @@
:cq-artifact-id: camel-quarkus-ribbon
:cq-native-supported: false
:cq-status: Preview
-:cq-status-deprecation: Preview
+:cq-status-deprecation: Preview Deprecated
:cq-description: Using Netflix Ribbon for client side load balancing
-:cq-deprecated: false
+:cq-deprecated: true
:cq-jvm-since: 1.2.0
:cq-native-since: n/a
[.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.2.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##1.2.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated##
Using Netflix Ribbon for client side load balancing
diff --git a/docs/modules/ROOT/pages/reference/extensions/xpath.adoc b/docs/modules/ROOT/pages/reference/extensions/xpath.adoc
index 404da3e..bf8011e 100644
--- a/docs/modules/ROOT/pages/reference/extensions/xpath.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/xpath.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Evaluate an XPath expression against an XML payload.
+:cq-description: Evaluates an XPath expression against an XML payload.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0##
-Evaluate an XPath expression against an XML payload.
+Evaluates an XPath expression against an XML payload.
== What's inside
diff --git a/docs/modules/ROOT/partials/reference/components/hwcloud-dms.adoc b/docs/modules/ROOT/partials/reference/components/hwcloud-dms.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/hwcloud-dms.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid warnings when this file is included from a Camel page
diff --git a/docs/modules/ROOT/partials/reference/components/hwcloud-imagerecognition.adoc b/docs/modules/ROOT/partials/reference/components/hwcloud-imagerecognition.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/hwcloud-imagerecognition.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid warnings when this file is included from a Camel page
diff --git a/docs/modules/ROOT/partials/reference/components/hwcloud-obs.adoc b/docs/modules/ROOT/partials/reference/components/hwcloud-obs.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/hwcloud-obs.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid warnings when this file is included from a Camel page
diff --git a/docs/modules/ROOT/partials/reference/languages/bean.adoc b/docs/modules/ROOT/partials/reference/languages/bean.adoc
index 932cf92..6b11621 100644
--- a/docs/modules/ROOT/partials/reference/languages/bean.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/bean.adoc
@@ -8,6 +8,6 @@
:cq-jvm-since: 0.1.0
:cq-native-since: 0.1.0
:cq-camel-part-name: bean
-:cq-camel-part-title: Bean method
-:cq-camel-part-description: Call a method of the specified Java bean passing the Exchange, Body or specific headers to it.
+:cq-camel-part-title: Bean Method
+:cq-camel-part-description: Calls a Java bean method.
:cq-extension-page-title: Bean
diff --git a/docs/modules/ROOT/partials/reference/languages/csimple.adoc b/docs/modules/ROOT/partials/reference/languages/csimple.adoc
index 877eeba..9d30386 100644
--- a/docs/modules/ROOT/partials/reference/languages/csimple.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/csimple.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.5.0
:cq-camel-part-name: csimple
:cq-camel-part-title: CSimple
-:cq-camel-part-description: Evaluate a compile simple expression language.
+:cq-camel-part-description: Evaluate a compiled simple expression.
:cq-extension-page-title: CSimple
diff --git a/docs/modules/ROOT/partials/reference/languages/groovy.adoc b/docs/modules/ROOT/partials/reference/languages/groovy.adoc
index 84435f8..e86f87b 100644
--- a/docs/modules/ROOT/partials/reference/languages/groovy.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/groovy.adoc
@@ -9,5 +9,5 @@
:cq-native-since: n/a
:cq-camel-part-name: groovy
:cq-camel-part-title: Groovy
-:cq-camel-part-description: Evaluate a Groovy script.
+:cq-camel-part-description: Evaluates a Groovy script.
:cq-extension-page-title: Groovy
diff --git a/docs/modules/ROOT/partials/reference/languages/hl7terser.adoc b/docs/modules/ROOT/partials/reference/languages/hl7terser.adoc
index 4d05135..e0a7236 100644
--- a/docs/modules/ROOT/partials/reference/languages/hl7terser.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/hl7terser.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.8.0
:cq-camel-part-name: hl7terser
:cq-camel-part-title: HL7 Terser
-:cq-camel-part-description: Get the value of an HL7 message field specified by terse location specification syntax.
+:cq-camel-part-description: Get the value of a HL7 message field specified by terse location specification syntax.
:cq-extension-page-title: HL7
diff --git a/docs/modules/ROOT/partials/reference/languages/joor.adoc b/docs/modules/ROOT/partials/reference/languages/joor.adoc
index bb5888c..f382099 100644
--- a/docs/modules/ROOT/partials/reference/languages/joor.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/joor.adoc
@@ -9,5 +9,5 @@
:cq-native-since: n/a
:cq-camel-part-name: joor
:cq-camel-part-title: jOOR
-:cq-camel-part-description: Evaluate a jOOR (Java compiled once at runtime) expression language.
+:cq-camel-part-description: Evaluates a jOOR (Java compiled once at runtime) expression.
:cq-extension-page-title: jOOR
diff --git a/docs/modules/ROOT/partials/reference/languages/jsonpath.adoc b/docs/modules/ROOT/partials/reference/languages/jsonpath.adoc
index ea924fd..1734b0e 100644
--- a/docs/modules/ROOT/partials/reference/languages/jsonpath.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/jsonpath.adoc
@@ -8,6 +8,6 @@
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
:cq-camel-part-name: jsonpath
-:cq-camel-part-title: JsonPath
-:cq-camel-part-description: Evaluate a JsonPath expression against a JSON message body.
+:cq-camel-part-title: JSONPath
+:cq-camel-part-description: Evaluates a JSONPath expression against a JSON message body.
:cq-extension-page-title: JSON Path
diff --git a/docs/modules/ROOT/partials/reference/languages/mvel.adoc b/docs/modules/ROOT/partials/reference/languages/mvel.adoc
index 362199e..d247ab1 100644
--- a/docs/modules/ROOT/partials/reference/languages/mvel.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/mvel.adoc
@@ -9,5 +9,5 @@
:cq-native-since: n/a
:cq-camel-part-name: mvel
:cq-camel-part-title: MVEL
-:cq-camel-part-description: Evaluate an MVEL template against the Camel Exchange.
+:cq-camel-part-description: Evaluates a MVEL template.
:cq-extension-page-title: MVEL
diff --git a/docs/modules/ROOT/partials/reference/languages/ognl.adoc b/docs/modules/ROOT/partials/reference/languages/ognl.adoc
index 10da17a..57229a2 100644
--- a/docs/modules/ROOT/partials/reference/languages/ognl.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/ognl.adoc
@@ -9,5 +9,5 @@
:cq-native-since: n/a
:cq-camel-part-name: ognl
:cq-camel-part-title: OGNL
-:cq-camel-part-description: Evaluate an Apache Commons Object Graph Navigation Library (OGNL) expression against the Camel Exchange.
+:cq-camel-part-description: Evaluates an OGNL expression (Apache Commons OGNL).
:cq-extension-page-title: OGNL
diff --git a/docs/modules/ROOT/partials/reference/languages/xpath.adoc b/docs/modules/ROOT/partials/reference/languages/xpath.adoc
index 58c3099..cdebabb 100644
--- a/docs/modules/ROOT/partials/reference/languages/xpath.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/xpath.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.0.0
:cq-camel-part-name: xpath
:cq-camel-part-title: XPath
-:cq-camel-part-description: Evaluate an XPath expression against an XML payload.
+:cq-camel-part-description: Evaluates an XPath expression against an XML payload.
:cq-extension-page-title: XPath
diff --git a/docs/modules/ROOT/partials/reference/languages/xquery.adoc b/docs/modules/ROOT/partials/reference/languages/xquery.adoc
index b609bca..9bc6e85 100644
--- a/docs/modules/ROOT/partials/reference/languages/xquery.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/xquery.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 2.0.0
:cq-camel-part-name: xquery
:cq-camel-part-title: XQuery
-:cq-camel-part-description: Evaluate an XQuery expressions against an XML payload.
+:cq-camel-part-description: Evaluates an XQuery expressions against an XML payload.
:cq-extension-page-title: XQuery
diff --git a/docs/modules/ROOT/partials/reference/others/ribbon.adoc b/docs/modules/ROOT/partials/reference/others/ribbon.adoc
index af55164..1e77b26 100644
--- a/docs/modules/ROOT/partials/reference/others/ribbon.adoc
+++ b/docs/modules/ROOT/partials/reference/others/ribbon.adoc
@@ -4,7 +4,7 @@
:cq-artifact-id-base: ribbon
:cq-native-supported: false
:cq-status: Preview
-:cq-deprecated: false
+:cq-deprecated: true
:cq-jvm-since: 1.2.0
:cq-native-since: n/a
:cq-camel-part-name: ribbon
diff --git a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamResource.java b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamResource.java
index 27d890b..7a113e3 100644
--- a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamResource.java
+++ b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamResource.java
@@ -23,7 +23,6 @@ import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.inject.Named;
import javax.ws.rs.GET;
-import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@@ -39,10 +38,6 @@ public class Aws2DdbStreamResource {
CamelContext camelContext;
@Inject
- @Named("aws2DdbStreamSequenceNumberProvider")
- TestSequenceNumberProvider sequenceNumberProvider;
-
- @Inject
@Named("aws2DdbStreamReceivedEvents")
List<Map<String, String>> aws2DdbStreamReceivedEvents;
@@ -59,12 +54,6 @@ public class Aws2DdbStreamResource {
aws2DdbStreamReceivedEvents.clear();
}
- @Path("/setSequenceNumber")
- @POST
- public void setSequenceNumber(String newSn) {
- sequenceNumberProvider.setLastSequenceNumber(newSn);
- }
-
@GET
@Path("/route/{routeId}/{operation}")
@Produces(MediaType.TEXT_PLAIN)
diff --git a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java
index b7671d8..8d73b81 100644
--- a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java
+++ b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java
@@ -44,7 +44,7 @@ public class Aws2DdbStreamRoutes extends RouteBuilder {
@Override
public void configure() throws Exception {
from("aws2-ddbstream://" + streamTableName
- + "?sequenceNumberProvider=#aws2DdbStreamSequenceNumberProvider&iteratorType=AT_SEQUENCE_NUMBER")
+ + "?streamIteratorType=FROM_LATEST")
.id("aws2DdbStreamRoute")
.process(e -> {
Record record = e.getMessage().getBody(Record.class);
diff --git a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/TestSequenceNumberProvider.java b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/TestSequenceNumberProvider.java
deleted file mode 100644
index e276715..0000000
--- a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/TestSequenceNumberProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.quarkus.component.aws2.ddb.it;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
-
-import org.apache.camel.component.aws2.ddbstream.SequenceNumberProvider;
-
-@ApplicationScoped
-@Named("aws2DdbStreamSequenceNumberProvider")
-public class TestSequenceNumberProvider implements SequenceNumberProvider {
-
- private String lastSn = "0";
-
- @Override
- public String getSequenceNumber() {
- return lastSn;
- }
-
- public void setLastSequenceNumber(String newSn) {
- lastSn = newSn;
- }
-}
diff --git a/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamTest.java b/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamTest.java
index de0b7ab..26b3f29 100644
--- a/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamTest.java
+++ b/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamTest.java
@@ -116,8 +116,6 @@ class Aws2DdbStreamTest {
&& put2SeqNumber.length() > 0);
- /* SequenceNumber */
-
RestAssured.given()
.get("/aws2-ddbstream/clear")
.then()
@@ -127,12 +125,6 @@ class Aws2DdbStreamTest {
routeController("stop", null);
routeController("status", ServiceStatus.Stopped.name());
- RestAssured.given()
- .body(put2SeqNumber.toString())
- .post("/aws2-ddbstream/setSequenceNumber")
- .then()
- .statusCode(204);
-
routeController("start", null);
routeController("status", ServiceStatus.Started.name());
waitForStreamConsumerToStart();
@@ -153,7 +145,7 @@ class Aws2DdbStreamTest {
.then()
.statusCode(204);
- /* There should be only key2 and key3, because route is started with parameter "AT_SEQUENCE_NUMBER" of put #2. */
+ /* There should be put & update events for key 3 */
Awaitility.await().pollInterval(1, TimeUnit.SECONDS).atMost(120, TimeUnit.SECONDS).until(
() -> {
ExtractableResponse<Response> result = RestAssured.get("/aws2-ddbstream/change")
@@ -167,20 +159,16 @@ class Aws2DdbStreamTest {
retVal = retVal.stream().filter(m -> !String.valueOf(m.get("key")).startsWith("initKey"))
.collect(Collectors.toList());
- LOG.info("Expecting 3 events, got " + result.statusCode() + ": " + retVal);
+ LOG.info("Expecting 2 events, got " + result.statusCode() + ": " + retVal);
return retVal;
},
- list -> list.size() == 3
-
- && key2.equals(list.get(0).get("key"))
- && msg2.equals(list.get(0).get("new"))
+ list -> list.size() == 2
+ && key3.equals(list.get(0).get("key"))
+ && msg3.equals(list.get(0).get("new"))
&& key3.equals(list.get(1).get("key"))
- && msg3.equals(list.get(1).get("new"))
-
- && key3.equals(list.get(2).get("key"))
- && msg3.equals(list.get(2).get("old")));
+ && msg3.equals(list.get(1).get("old")));
}
private void waitForStreamConsumerToStart() {
diff --git a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java
index d4785ca..479b2c5 100644
--- a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java
+++ b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java
@@ -24,12 +24,8 @@ import javax.annotation.Generated;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamConverter;
-import org.apache.camel.component.salesforce.api.MultiSelectPicklistConverter;
import org.apache.camel.component.salesforce.api.MultiSelectPicklistDeserializer;
import org.apache.camel.component.salesforce.api.MultiSelectPicklistSerializer;
-import org.apache.camel.component.salesforce.api.PicklistEnumConverter;
import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls;
@@ -39,7 +35,6 @@ import org.apache.camel.component.salesforce.api.dto.SObjectField;
* Salesforce DTO for SObject Account
*/
@Generated("org.apache.camel.maven.CamelSalesforceMojo")
-@XStreamAlias("Account")
public class Account extends AbstractDescribedSObjectBase {
public Account() {
@@ -60,7 +55,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.MasterRecordId = MasterRecordId;
}
- @XStreamAlias("MasterRecord")
private Account MasterRecord;
@JsonProperty("MasterRecord")
@@ -73,7 +67,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.MasterRecord = MasterRecord;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_TypeEnum Type;
@JsonProperty("Type")
@@ -98,7 +91,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.ParentId = ParentId;
}
- @XStreamAlias("Parent")
private Account Parent;
@JsonProperty("Parent")
@@ -195,7 +187,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.BillingLongitude = BillingLongitude;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_BillingGeocodeAccuracyEnum BillingGeocodeAccuracy;
@JsonProperty("BillingGeocodeAccuracy")
@@ -304,7 +295,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.ShippingLongitude = ShippingLongitude;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_ShippingGeocodeAccuracyEnum ShippingGeocodeAccuracy;
@JsonProperty("ShippingGeocodeAccuracy")
@@ -401,7 +391,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.Sic = Sic;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_IndustryEnum Industry;
@JsonProperty("Industry")
@@ -438,7 +427,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.NumberOfEmployees = NumberOfEmployees;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_OwnershipEnum Ownership;
@JsonProperty("Ownership")
@@ -475,7 +463,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.Description = Description;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_RatingEnum Rating;
@JsonProperty("Rating")
@@ -524,7 +511,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.JigsawCompanyId = JigsawCompanyId;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_CleanStatusEnum CleanStatus;
@JsonProperty("CleanStatus")
@@ -537,7 +523,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.CleanStatus = CleanStatus;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_AccountSourceEnum AccountSource;
@JsonProperty("AccountSource")
@@ -634,7 +619,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.DandbCompanyId = DandbCompanyId;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_CustomerPriorityEnum CustomerPriority__c;
@JsonProperty("CustomerPriority__c")
@@ -647,7 +631,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.CustomerPriority__c = CustomerPriority__c;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_SLAEnum SLA__c;
@JsonProperty("SLA__c")
@@ -660,7 +643,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.SLA__c = SLA__c;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_ActiveEnum Active__c;
@JsonProperty("Active__c")
@@ -685,7 +667,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.NumberofLocations__c = NumberofLocations__c;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_UpsellOpportunityEnum UpsellOpportunity__c;
@JsonProperty("UpsellOpportunity__c")
@@ -722,7 +703,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.SLAExpirationDate__c = SLAExpirationDate__c;
}
- @XStreamConverter(MultiSelectPicklistConverter.class)
private Account_MyMultiselectEnum[] MyMultiselect__c;
@JsonProperty("MyMultiselect__c")
diff --git a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/QueryRecordsAccount.java b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/QueryRecordsAccount.java
index 78cab0f..569227e 100644
--- a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/QueryRecordsAccount.java
+++ b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/QueryRecordsAccount.java
@@ -20,7 +20,6 @@ import java.util.List;
import javax.annotation.Generated;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
/**
@@ -29,7 +28,6 @@ import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
@Generated("org.apache.camel.maven.CamelSalesforceMojo")
public class QueryRecordsAccount extends AbstractQueryRecordsBase {
- @XStreamImplicit
private List<Account> records;
public List<Account> getRecords() {