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 2022/02/10 08:54:10 UTC
[camel-quarkus] branch quarkus-main updated (db0ec81 -> e403adb)
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 db0ec81 Upgrade to Quarkus 2.8.0.CR1
add c8db766 Fix #3251 expose REST DSL services to quarkus openapis
add 328c70b update usage.adoc
add 5c29625 Upgrade to Camel 3.15.0
add e3a4140 deadLetterChannel does not work in BaseRouteBuilder configure method #3436
add 785dac4 Disable ConsulIT due to #3509
add 90f3d3f Fix groovy antora update script execution
add e23f1df Remove IPFS and Weka extensions temporarily, workaround #3532
add 5d71f25 Update extension metadata files
add d65dff2 Fix failing RESTOpenAPITest
add c8c39c0 Work around components with unexpectedly different adoc file names
add 31e416e #3503 Add xslt.features support
add 7b31903 Exclude json-simple from camel-slack, workaround for CAMEL-17619
add 74271cc Upgrade to Quarkus 2.7.1
add 0866f9f Incorrect version of quarkus-maven-plugin may be resolved #3520
add 12d696a Updated CHANGELOG.md
add 9953f2d Sync versions in antora.yml
add 143ee21 Fix #1384 camel-mybatis native support
add 59a0611 Disable CamelMainRoutesIncludePatternWithAbsoluteFilePrefixDevModeTest on Windows due to #3529
add 74f254a Disable FileTest.charset on Windows due to #3530
add 5c78622 Add capability to skip testcontainers tests
add 86d954a Fix build on windows
add dabf905 Run integration tests on Windows
add dc137fc Updated CHANGELOG.md
new e403adb Upgrade to Quarkus 2.8.0.CR1
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 (db0ec81)
\
N -- N -- N refs/heads/quarkus-main (e403adb)
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 1 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:
.gitattributes | 3 +
.github/workflows/ci-build.yaml | 51 +++++-
CHANGELOG.md | 25 +++
catalog/pom.xml | 39 ----
.../quarkus/QuarkusRuntimeProviderTest.java | 4 +-
docs/antora.yml | 8 +-
.../ROOT/examples/components/atomix-map.yml | 2 +-
.../ROOT/examples/components/atomix-messaging.yml | 2 +-
.../ROOT/examples/components/atomix-multimap.yml | 2 +-
.../ROOT/examples/components/atomix-queue.yml | 2 +-
.../ROOT/examples/components/atomix-set.yml | 2 +-
.../ROOT/examples/components/atomix-value.yml | 2 +-
.../ROOT/examples/components/azure-eventhubs.yml | 2 +-
.../examples/components/azure-storage-blob.yml | 2 +-
.../examples/components/azure-storage-datalake.yml | 2 +-
.../examples/components/azure-storage-queue.yml | 2 +-
.../modules/ROOT/examples/components/beanstalk.yml | 2 +-
docs/modules/ROOT/examples/components/elsql.yml | 2 +-
.../modules/ROOT/examples/components/etcd-keys.yml | 2 +-
.../ROOT/examples/components/etcd-stats.yml | 2 +-
.../ROOT/examples/components/etcd-watch.yml | 2 +-
docs/modules/ROOT/examples/components/ganglia.yml | 2 +-
docs/modules/ROOT/examples/components/ipfs.yml | 13 --
docs/modules/ROOT/examples/components/jing.yml | 2 +-
.../ROOT/examples/components/json-patch.yml | 2 +-
.../ROOT/examples/components/kamelet-reify.yml | 13 --
.../ROOT/examples/components/milo-browse.yml | 13 ++
docs/modules/ROOT/examples/components/msv.yml | 2 +-
.../ROOT/examples/components/mybatis-bean.yml | 6 +-
docs/modules/ROOT/examples/components/mybatis.yml | 6 +-
docs/modules/ROOT/examples/components/nagios.yml | 2 +-
docs/modules/ROOT/examples/components/nsq.yml | 2 +-
docs/modules/ROOT/examples/components/sip.yml | 2 +-
docs/modules/ROOT/examples/components/soroush.yml | 2 +-
docs/modules/ROOT/examples/components/yammer.yml | 2 +-
.../{avro-jackson.yml => avroJackson.yml} | 2 +-
docs/modules/ROOT/examples/dataformats/beanio.yml | 2 +-
docs/modules/ROOT/examples/dataformats/bindy.yml | 2 +-
.../{json-fastjson.yml => fastjson.yml} | 2 +-
.../dataformats/{json-gson.yml => gson.yml} | 2 +-
.../{gzipdeflater.yml => gzipDeflater.yml} | 2 +-
.../dataformats/{json-jackson.yml => jackson.yml} | 2 +-
.../dataformats/{jacksonxml.yml => jacksonXml.yml} | 4 +-
.../dataformats/{json-johnzon.yml => johnzon.yml} | 2 +-
.../dataformats/{json-jsonb.yml => jsonb.yml} | 2 +-
.../{mime-multipart.yml => mimeMultipart.yml} | 2 +-
.../{protobuf-jackson.yml => protobufJackson.yml} | 2 +-
.../{yaml-snakeyaml.yml => snakeYaml.yml} | 2 +-
.../dataformats/{soapjaxb.yml => soap.yml} | 2 +-
.../dataformats/{tarfile.yml => tarFile.yml} | 2 +-
.../{univocity-csv.yml => univocityCsv.yml} | 2 +-
.../{univocity-fixed.yml => univocityFixed.yml} | 2 +-
.../{univocity-tsv.yml => univocityTsv.yml} | 2 +-
.../dataformats/{secureXML.yml => xmlSecurity.yml} | 2 +-
.../{json-xstream.yml => xstreamJson.yml} | 2 +-
.../{zipdeflater.yml => zipDeflater.yml} | 4 +-
.../dataformats/{zipfile.yml => zipFile.yml} | 2 +-
docs/modules/ROOT/examples/others/groovy-dsl.yml | 13 ++
.../modules/ROOT/examples/others/java-joor-dsl.yml | 13 ++
docs/modules/ROOT/examples/others/jfr.yml | 2 +-
docs/modules/ROOT/examples/others/js-dsl.yml | 13 ++
docs/modules/ROOT/examples/others/kotlin-dsl.yml | 13 ++
.../{components/weka.yml => others/management.yml} | 12 +-
docs/modules/ROOT/examples/others/opentracing.yml | 2 +-
docs/modules/ROOT/examples/others/xml-io-dsl.yml | 13 ++
docs/modules/ROOT/examples/others/yaml-dsl.yml | 13 ++
docs/modules/ROOT/nav.adoc | 3 -
.../ROOT/pages/reference/extensions/atomix.adoc | 6 +-
.../ROOT/pages/reference/extensions/beanio.adoc | 6 +-
.../ROOT/pages/reference/extensions/beanstalk.adoc | 6 +-
.../ROOT/pages/reference/extensions/elsql.adoc | 6 +-
.../ROOT/pages/reference/extensions/etcd.adoc | 6 +-
.../ROOT/pages/reference/extensions/fastjson.adoc | 2 +-
.../ROOT/pages/reference/extensions/ganglia.adoc | 6 +-
.../pages/reference/extensions/groovy-dsl.adoc | 6 +
.../ROOT/pages/reference/extensions/gson.adoc | 2 +-
.../ROOT/pages/reference/extensions/ipfs.adoc | 39 ----
.../pages/reference/extensions/jackson-avro.adoc | 2 +-
.../reference/extensions/jackson-protobuf.adoc | 2 +-
.../ROOT/pages/reference/extensions/jackson.adoc | 2 +-
.../pages/reference/extensions/jacksonxml.adoc | 2 +-
.../pages/reference/extensions/java-joor-dsl.adoc | 6 +
.../ROOT/pages/reference/extensions/jfr.adoc | 2 +-
.../ROOT/pages/reference/extensions/jing.adoc | 6 +-
.../ROOT/pages/reference/extensions/johnzon.adoc | 2 +-
.../ROOT/pages/reference/extensions/js-dsl.adoc | 6 +
.../ROOT/pages/reference/extensions/jsonb.adoc | 2 +-
.../pages/reference/extensions/kamelet-reify.adoc | 35 ----
.../pages/reference/extensions/kotlin-dsl.adoc | 6 +
.../ROOT/pages/reference/extensions/mail.adoc | 2 +-
.../ROOT/pages/reference/extensions/milo.adoc | 1 +
.../ROOT/pages/reference/extensions/msv.adoc | 6 +-
.../ROOT/pages/reference/extensions/mybatis.adoc | 27 ++-
.../ROOT/pages/reference/extensions/nagios.adoc | 6 +-
.../ROOT/pages/reference/extensions/nsq.adoc | 6 +-
.../pages/reference/extensions/openapi-java.adoc | 20 ++
.../pages/reference/extensions/opentracing.adoc | 6 +-
.../ROOT/pages/reference/extensions/sip.adoc | 6 +-
.../ROOT/pages/reference/extensions/snakeyaml.adoc | 2 +-
.../ROOT/pages/reference/extensions/soap.adoc | 2 +-
.../ROOT/pages/reference/extensions/soroush.adoc | 6 +-
.../ROOT/pages/reference/extensions/tarfile.adoc | 2 +-
.../reference/extensions/univocity-parsers.adoc | 6 +-
.../ROOT/pages/reference/extensions/weka.adoc | 35 ----
.../pages/reference/extensions/xml-io-dsl.adoc | 6 +
.../pages/reference/extensions/xmlsecurity.adoc | 2 +-
.../ROOT/pages/reference/extensions/xslt.adoc | 26 +++
.../ROOT/pages/reference/extensions/xstream.adoc | 2 +-
.../ROOT/pages/reference/extensions/yaml-dsl.adoc | 6 +
.../ROOT/pages/reference/extensions/yammer.adoc | 6 +-
.../pages/reference/extensions/zip-deflater.adoc | 4 +-
.../ROOT/pages/reference/extensions/zipfile.adoc | 2 +-
docs/pom.xml | 16 +-
.../quarkus/core/deployment/CamelProcessor.java | 3 +-
.../quarkus/core/deployment/util/PathFilter.java | 4 +-
.../core/deployment/util/PathFilterTest.java | 21 ++-
.../apache/camel/quarkus/core/util/FileUtils.java | 52 ++++++
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
extensions-jvm/kamelet-reify/deployment/pom.xml | 61 -------
.../reify/deployment/KameletReifyProcessor.java | 46 -----
extensions-jvm/kamelet-reify/runtime/pom.xml | 110 -----------
.../main/resources/META-INF/quarkus-extension.yaml | 33 ----
.../mybatis/deployment/MybatisProcessor.java | 46 -----
extensions-jvm/pom.xml | 3 -
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
extensions-jvm/spark/bom/pom.xml | 12 ++
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
.../csimple/deployment/CSimpleProcessor.java | 3 +-
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
extensions/jta/runtime/pom.xml | 6 +
extensions/kafka/deployment/pom.xml | 21 +++
.../deployment/MicroProfileHealthProcessor.java | 54 ++----
.../deployment/MicroProfileHealthEnabledTest.java | 15 +-
.../runtime/CamelMicroProfileHealthRecorder.java | 22 ++-
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
.../mybatis/deployment/pom.xml | 4 +
.../mybatis/deployment/MybatisProcessor.java | 67 +++++++
{extensions-jvm => extensions}/mybatis/pom.xml | 2 +-
.../mybatis/runtime/pom.xml | 5 +
.../runtime/src/main/doc/configuration.adoc | 9 +
.../mybatis/runtime/CamelMyBatisRecorder.java} | 25 ++-
.../main/resources/META-INF/quarkus-extension.yaml | 3 +-
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
.../component/netty/deployment/NettyProcessor.java | 7 +
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
extensions/openapi-java/deployment/pom.xml | 29 +++
...cessor.java => OpenApiJavaBuildTimeConfig.java} | 20 +-
.../java/deployment/OpenApiJavaProcessor.java | 203 +++++++++++++++++++++
.../openapi/java/deployment/QuarkusResource.java | 23 ++-
.../openapi/java/deployment/RESTOpenAPITest.java | 84 +++++++++
.../openapi/java/deployment/RestRoutes.java} | 20 +-
.../src/test}/resources/application.properties | 10 +-
.../src/test/resources/routes/my-route.xml | 26 +--
.../openapi-java/runtime/src/main/doc/usage.adoc | 16 ++
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
extensions/pom.xml | 2 +-
extensions/qute/component/pom.xml | 2 +-
.../component/qute/QuteEndpointUriFactory.java | 7 +
.../rabbitmq/deployment/RabbitmqProcessor.java | 9 +-
.../component/xslt/deployment/XsltProcessor.java | 6 +
.../xslt/runtime/src/main/doc/configuration.adoc | 20 ++
.../quarkus/component/xslt/CamelXsltConfig.java | 7 +
.../quarkus/component/xslt/CamelXsltRecorder.java | 20 +-
.../aws2-quarkus-client/aws2-ddb/pom.xml | 13 +-
.../aws2-quarkus-client/aws2-s3/pom.xml | 13 +-
.../aws2-quarkus-client/aws2-ses/pom.xml | 13 +-
.../aws2-quarkus-client/aws2-sqs-sns/pom.xml | 13 +-
.../aws2-quarkus-client/aws2-sqs/pom.xml | 13 +-
.../it/Aws2SqsQuarkusClientTestEnvCustomizer.java | 3 +
integration-test-groups/aws2/aws2-cw/pom.xml | 11 ++
integration-test-groups/aws2/aws2-ddb/pom.xml | 11 ++
integration-test-groups/aws2/aws2-kinesis/pom.xml | 11 ++
integration-test-groups/aws2/aws2-lambda/pom.xml | 11 ++
integration-test-groups/aws2/aws2-s3/pom.xml | 13 +-
integration-test-groups/aws2/aws2-ses/pom.xml | 11 ++
integration-test-groups/aws2/aws2-sqs-sns/pom.xml | 11 ++
integration-test-groups/aws2/aws2-sqs/pom.xml | 11 ++
.../component/aws2/sqs/it/DeadLetterBuilder.java | 41 +++++
.../quarkus/component/aws2/sqs/it/Aws2SqsTest.java | 20 ++
.../aws2/sqs/it/Aws2SqsTestEnvCustomizer.java | 23 ++-
.../azure/azure-eventhubs/pom.xml | 11 ++
.../azure/azure-storage-blob/pom.xml | 11 ++
.../azure/azure-storage-queue/pom.xml | 11 ++
.../src/main/resources/yaml/routes.yaml | 11 +-
.../mongodb/mongodb-gridfs/pom.xml | 11 ++
integration-test-groups/mongodb/mongodb/pom.xml | 11 ++
integration-tests-jvm/couchbase/pom.xml | 11 ++
.../component/fastjson/it/FastjsonResource.java | 2 +-
integration-tests-jvm/hbase/pom.xml | 11 ++
integration-tests-jvm/kamelet-reify/pom.xml | 82 ---------
.../kamelet/reify/it/KameletReifyResource.java | 51 ------
integration-tests-jvm/mybatis/pom.xml | 83 ---------
.../component/mybatis/it/MybatisResource.java | 64 -------
integration-tests-jvm/pom.xml | 3 -
integration-tests-jvm/redis/pom.xml | 11 ++
integration-tests-support/pom.xml | 1 +
.../xslt-support}/pom.xml | 14 +-
.../camel/quarkus/test/support/xslt/Functions.java | 10 +-
integration-tests/activemq/pom.xml | 11 ++
integration-tests/amqp/pom.xml | 11 ++
integration-tests/arangodb/pom.xml | 11 ++
integration-tests/avro/pom.xml | 1 +
integration-tests/aws2-grouped/pom.xml | 13 +-
.../aws2-quarkus-client-grouped/pom.xml | 23 ++-
integration-tests/aws2/pom.xml | 11 ++
integration-tests/azure-grouped/pom.xml | 13 +-
integration-tests/cassandraql/pom.xml | 11 ++
integration-tests/consul/pom.xml | 11 ++
.../quarkus/component/consul/it/ConsulIT.java | 2 +
integration-tests/couchdb/pom.xml | 11 ++
.../component/dataformat/it/DataformatRoute.java | 4 +-
.../dataformats/jackson/xml/JacksonXmlRoute.java | 14 +-
.../dataformats/json/JsonDataformatsRoute.java | 4 +-
.../component/dataformats/json/ParamType.java | 36 ----
.../src/main/resources/routes/jackson-routes.xml | 18 +-
.../dataformats/json/JsonComponentsTest.java | 4 +-
integration-tests/debezium/pom.xml | 11 ++
.../quarkus/component/dozer/it/DozerTest.java | 4 +-
integration-tests/elasticsearch-rest/pom.xml | 11 ++
integration-tests/fhir/pom.xml | 11 ++
.../camel/quarkus/component/file/it/FileTest.java | 12 +-
.../component/flatpack/it/FlatpackTest.java | 3 +-
integration-tests/foundation-grouped/pom.xml | 2 +-
integration-tests/google-pubsub/pom.xml | 11 ++
integration-tests/google-storage/pom.xml | 11 ++
integration-tests/http/pom.xml | 11 ++
integration-tests/infinispan/pom.xml | 11 ++
integration-tests/influxdb/pom.xml | 11 ++
integration-tests/ipfs/pom.xml | 11 ++
integration-tests/jms-artemis-client/pom.xml | 11 ++
integration-tests/jms-qpid-amqp-client/pom.xml | 11 ++
integration-tests/jsch/pom.xml | 11 ++
.../camel/quarkus/component/jslt/it/JsltTest.java | 6 +
integration-tests/jta/pom.xml | 11 ++
integration-tests/kafka-oauth/pom.xml | 11 ++
.../kafka/oauth/it/container/KafkaContainer.java | 28 +--
integration-tests/kafka-sasl-ssl/pom.xml | 11 ++
integration-tests/kafka-sasl/pom.xml | 11 ++
integration-tests/kafka-ssl/pom.xml | 11 ++
integration-tests/kafka/pom.xml | 11 ++
.../quarkus/component/kafka/CamelKafkaRoutes.java | 4 +-
integration-tests/kudu/pom.xml | 11 ++
integration-tests/lra/pom.xml | 11 ++
...dePatternWithAbsoluteFilePrefixDevModeTest.java | 3 +
.../src/main/resources/routes/my-rests.yaml | 9 +-
.../src/main/resources/routes/my-routes.yaml | 11 +-
integration-tests/messaging/pom.xml | 1 +
.../microprofile/it/health/LivenessCheck.java | 1 +
.../it/health/MicroProfileHealthResource.java | 12 +-
.../microprofile/it/health/ReadinessCheck.java | 1 +
.../it/health/MicroProfileHealthTest.java | 61 +++----
integration-tests/minio/pom.xml | 11 ++
integration-tests/mongodb-grouped/pom.xml | 13 +-
integration-tests/{lra => mybatis}/pom.xml | 59 +++---
.../quarkus/component/mybatis/it/MyBatisRoute.java | 38 ++--
.../component/mybatis/it/MybatisResource.java | 75 ++++++++
.../component/mybatis/it/bean/AccountService.java | 0
.../component/mybatis/it/entity/Account.java | 0
.../mybatis/src/main/resources/SqlMapConfig.xml | 11 +-
.../src/main/resources/application.properties | 18 +-
.../mybatis/src/main/resources/insert.sql | 29 +++
.../component/mybatis/it/entity/Account.xml | 0
.../quarkus/component/mybatis/it/MyBatisIT.java} | 4 +-
.../quarkus/component/mybatis/it/MyBatisTest.java | 86 +++++++++
integration-tests/nats/pom.xml | 11 ++
integration-tests/nsq/pom.xml | 11 ++
integration-tests/paho-mqtt5/pom.xml | 11 ++
integration-tests/paho/pom.xml | 11 ++
integration-tests/pg-replication-slot/pom.xml | 11 ++
integration-tests/pgevent/pom.xml | 11 ++
integration-tests/pom.xml | 2 +-
integration-tests/protobuf/pom.xml | 1 +
integration-tests/rabbitmq/pom.xml | 11 ++
.../component/salesforce/SalesforceResource.java | 7 +-
.../component/salesforce/SalesforceTest.java | 13 +-
integration-tests/sjms-artemis-client/pom.xml | 11 ++
integration-tests/sjms-qpid-amqp-client/pom.xml | 11 ++
integration-tests/sjms2-artemis-client/pom.xml | 11 ++
integration-tests/sjms2-qpid-amqp-client/pom.xml | 11 ++
.../quarkus/component/soap/it/SoapRoutes.java | 26 +--
integration-tests/solr/pom.xml | 12 +-
integration-tests/splunk/pom.xml | 11 ++
integration-tests/spring-rabbitmq/pom.xml | 11 ++
integration-tests/ssh/pom.xml | 11 ++
.../stringtemplate/it/StringtemplateTest.java | 2 +-
.../UniVocityFixedWidthDataFormatMarshalRoute.java | 8 +-
...niVocityFixedWidthDataFormatUnmarshalRoute.java | 12 +-
integration-tests/xml/pom.xml | 4 +
.../component/xml/it/FunctionsConfiguration.java} | 8 +-
.../quarkus/component/xml/it/XmlResource.java | 9 +-
.../xml/src/main/resources/application.properties | 3 +-
.../src/main/resources/xslt/extension-function.xsl | 30 ++-
.../camel/quarkus/component/xml/it/XmlTest.java | 14 ++
.../xmlsecurity/it/XmlsecurityRoutes.java | 8 +-
pom.xml | 16 +-
poms/bom-test/pom.xml | 5 +
poms/bom/pom.xml | 61 ++-----
poms/build-parent/pom.xml | 2 +-
.../quarkus/maven/UpdateExtensionDocPageMojo.java | 7 +-
tooling/scripts/test-categories.yaml | 2 +-
tooling/scripts/validate-github-workflows.groovy | 2 +-
307 files changed, 2507 insertions(+), 1370 deletions(-)
create mode 100644 .gitattributes
delete mode 100644 docs/modules/ROOT/examples/components/ipfs.yml
delete mode 100644 docs/modules/ROOT/examples/components/kamelet-reify.yml
create mode 100644 docs/modules/ROOT/examples/components/milo-browse.yml
rename docs/modules/ROOT/examples/dataformats/{avro-jackson.yml => avroJackson.yml} (93%)
rename docs/modules/ROOT/examples/dataformats/{json-fastjson.yml => fastjson.yml} (92%)
rename docs/modules/ROOT/examples/dataformats/{json-gson.yml => gson.yml} (93%)
rename docs/modules/ROOT/examples/dataformats/{gzipdeflater.yml => gzipDeflater.yml} (93%)
rename docs/modules/ROOT/examples/dataformats/{json-jackson.yml => jackson.yml} (92%)
rename docs/modules/ROOT/examples/dataformats/{jacksonxml.yml => jacksonXml.yml} (87%)
rename docs/modules/ROOT/examples/dataformats/{json-johnzon.yml => johnzon.yml} (92%)
rename docs/modules/ROOT/examples/dataformats/{json-jsonb.yml => jsonb.yml} (93%)
rename docs/modules/ROOT/examples/dataformats/{mime-multipart.yml => mimeMultipart.yml} (92%)
rename docs/modules/ROOT/examples/dataformats/{protobuf-jackson.yml => protobufJackson.yml} (92%)
rename docs/modules/ROOT/examples/dataformats/{yaml-snakeyaml.yml => snakeYaml.yml} (93%)
rename docs/modules/ROOT/examples/dataformats/{soapjaxb.yml => soap.yml} (93%)
rename docs/modules/ROOT/examples/dataformats/{tarfile.yml => tarFile.yml} (94%)
rename docs/modules/ROOT/examples/dataformats/{univocity-csv.yml => univocityCsv.yml} (93%)
rename docs/modules/ROOT/examples/dataformats/{univocity-fixed.yml => univocityFixed.yml} (93%)
rename docs/modules/ROOT/examples/dataformats/{univocity-tsv.yml => univocityTsv.yml} (94%)
rename docs/modules/ROOT/examples/dataformats/{secureXML.yml => xmlSecurity.yml} (93%)
rename docs/modules/ROOT/examples/dataformats/{json-xstream.yml => xstreamJson.yml} (92%)
rename docs/modules/ROOT/examples/dataformats/{zipdeflater.yml => zipDeflater.yml} (86%)
rename docs/modules/ROOT/examples/dataformats/{zipfile.yml => zipFile.yml} (94%)
create mode 100644 docs/modules/ROOT/examples/others/groovy-dsl.yml
create mode 100644 docs/modules/ROOT/examples/others/java-joor-dsl.yml
create mode 100644 docs/modules/ROOT/examples/others/js-dsl.yml
create mode 100644 docs/modules/ROOT/examples/others/kotlin-dsl.yml
rename docs/modules/ROOT/examples/{components/weka.yml => others/management.yml} (50%)
create mode 100644 docs/modules/ROOT/examples/others/xml-io-dsl.yml
create mode 100644 docs/modules/ROOT/examples/others/yaml-dsl.yml
delete mode 100644 docs/modules/ROOT/pages/reference/extensions/ipfs.adoc
delete mode 100644 docs/modules/ROOT/pages/reference/extensions/kamelet-reify.adoc
delete mode 100644 docs/modules/ROOT/pages/reference/extensions/weka.adoc
create mode 100644 extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/util/FileUtils.java
delete mode 100644 extensions-jvm/kamelet-reify/deployment/pom.xml
delete mode 100644 extensions-jvm/kamelet-reify/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/reify/deployment/KameletReifyProcessor.java
delete mode 100644 extensions-jvm/kamelet-reify/runtime/pom.xml
delete mode 100644 extensions-jvm/kamelet-reify/runtime/src/main/resources/META-INF/quarkus-extension.yaml
delete mode 100644 extensions-jvm/mybatis/deployment/src/main/java/org/apache/camel/quarkus/component/mybatis/deployment/MybatisProcessor.java
rename {extensions-jvm => extensions}/mybatis/deployment/pom.xml (93%)
create mode 100644 extensions/mybatis/deployment/src/main/java/org/apache/camel/quarkus/component/mybatis/deployment/MybatisProcessor.java
copy {extensions-jvm => extensions}/mybatis/pom.xml (96%)
rename {extensions-jvm => extensions}/mybatis/runtime/pom.xml (95%)
create mode 100644 extensions/mybatis/runtime/src/main/doc/configuration.adoc
copy extensions/{microprofile-health/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/health/runtime/CamelMicroProfileHealthRecorder.java => mybatis/runtime/src/main/java/org/apache/camel/quarkus/component/mybatis/runtime/CamelMyBatisRecorder.java} (50%)
rename {extensions-jvm => extensions}/mybatis/runtime/src/main/resources/META-INF/quarkus-extension.yaml (97%)
copy extensions/openapi-java/deployment/src/main/java/org/apache/camel/quarkus/component/openapi/java/deployment/{OpenApiJavaProcessor.java => OpenApiJavaBuildTimeConfig.java} (67%)
rename integration-tests-jvm/kamelet-reify/src/test/java/org/apache/camel/quarkus/component/kamelet/reify/it/KameletReifyTest.java => extensions/openapi-java/deployment/src/test/java/org/apache/camel/quarkus/component/openapi/java/deployment/QuarkusResource.java (65%)
create mode 100644 extensions/openapi-java/deployment/src/test/java/org/apache/camel/quarkus/component/openapi/java/deployment/RESTOpenAPITest.java
copy extensions/openapi-java/deployment/src/{main/java/org/apache/camel/quarkus/component/openapi/java/deployment/OpenApiJavaProcessor.java => test/java/org/apache/camel/quarkus/component/openapi/java/deployment/RestRoutes.java} (68%)
copy {integration-tests/xml/src/main => extensions/openapi-java/deployment/src/test}/resources/application.properties (82%)
copy extensions-jvm/mybatis/pom.xml => extensions/openapi-java/deployment/src/test/resources/routes/my-route.xml (51%)
create mode 100644 extensions/openapi-java/runtime/src/main/doc/usage.adoc
create mode 100644 integration-test-groups/aws2/aws2-sqs/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/DeadLetterBuilder.java
delete mode 100644 integration-tests-jvm/kamelet-reify/pom.xml
delete mode 100644 integration-tests-jvm/kamelet-reify/src/main/java/org/apache/camel/quarkus/component/kamelet/reify/it/KameletReifyResource.java
delete mode 100644 integration-tests-jvm/mybatis/pom.xml
delete mode 100644 integration-tests-jvm/mybatis/src/main/java/org/apache/camel/quarkus/component/mybatis/it/MybatisResource.java
rename {extensions-jvm/kamelet-reify => integration-tests-support/xslt-support}/pom.xml (80%)
copy integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulIT.java => integration-tests-support/xslt-support/src/main/java/org/apache/camel/quarkus/test/support/xslt/Functions.java (81%)
copy integration-tests/{lra => mybatis}/pom.xml (82%)
rename integration-tests-jvm/mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MybatisTest.java => integration-tests/mybatis/src/main/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisRoute.java (55%)
create mode 100644 integration-tests/mybatis/src/main/java/org/apache/camel/quarkus/component/mybatis/it/MybatisResource.java
rename {integration-tests-jvm => integration-tests}/mybatis/src/main/java/org/apache/camel/quarkus/component/mybatis/it/bean/AccountService.java (100%)
rename {integration-tests-jvm => integration-tests}/mybatis/src/main/java/org/apache/camel/quarkus/component/mybatis/it/entity/Account.java (100%)
rename {integration-tests-jvm => integration-tests}/mybatis/src/main/resources/SqlMapConfig.xml (83%)
copy integration-tests/{xml => mybatis}/src/main/resources/application.properties (73%)
create mode 100644 integration-tests/mybatis/src/main/resources/insert.sql
rename {integration-tests-jvm => integration-tests}/mybatis/src/main/resources/org/apache/camel/quarkus/component/mybatis/it/entity/Account.xml (100%)
copy integration-tests/{consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulIT.java => mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisIT.java} (89%)
create mode 100644 integration-tests/mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisTest.java
copy integration-tests/{consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulIT.java => xml/src/main/java/org/apache/camel/quarkus/component/xml/it/FunctionsConfiguration.java} (76%)
rename extensions-jvm/mybatis/pom.xml => integration-tests/xml/src/main/resources/xslt/extension-function.xsl (52%)
[camel-quarkus] 01/01: Upgrade to Quarkus 2.8.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 e403adbb50db40b27d30d6c00a82269793218c8c
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Jan 20 07:52:37 2022 +0000
Upgrade to Quarkus 2.8.0.CR1
---
docs/antora.yml | 4 +--
integration-tests/http/pom.xml | 2 +-
.../kafka/oauth/it/container/KafkaContainer.java | 30 +++++++++++++---------
integration-tests/vertx-websocket/pom.xml | 2 +-
pom.xml | 7 ++---
poms/build-parent/pom.xml | 9 +++++++
6 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 1413755..1db4eff 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,8 +31,8 @@ asciidoc:
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.15.0 # replace ${camel.version}
camel-docs-version: 3.15.x # replace ${camel.docs.components.version}
- quarkus-version: 2.7.1.Final # replace ${quarkus.version}
- graalvm-version: 21.3.1 # replace ${graalvm.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
+ graalvm-version: 22.0.0.2 # replace ${graalvm.version}
graalvm-docs-version: 21.3
# attributes used in xrefs to other Antora components
cq-camel-components: 3.15.x@components # replace ${camel.docs.components.xref}
diff --git a/integration-tests/http/pom.xml b/integration-tests/http/pom.xml
index 0bb8a2a..793de20 100644
--- a/integration-tests/http/pom.xml
+++ b/integration-tests/http/pom.xml
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-undertow-websockets</artifactId>
+ <artifactId>quarkus-websockets</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
index 31885bf..e95e062 100644
--- a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
+++ b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
@@ -16,17 +16,20 @@
*/
package org.apache.camel.quarkus.kafka.oauth.it.container;
-import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import javax.json.Json;
+import javax.json.stream.JsonParser;
+
import com.github.dockerjava.api.command.InspectContainerResponse;
-import io.strimzi.StrimziKafkaContainer;
+import io.strimzi.test.container.StrimziKafkaContainer;
+import org.apache.commons.io.IOUtils;
import org.jboss.logging.Logger;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.Network;
@@ -45,19 +48,22 @@ public class KafkaContainer extends FixedHostPortGenericContainer<KafkaContainer
private static final int KAFKA_PORT = 9092;
private static final String LATEST_KAFKA_VERSION;
- private static final List<String> supportedKafkaVersions = new ArrayList<>(3);
+ private static final List<String> supportedKafkaVersions = new ArrayList<>();
static {
- InputStream inputStream = StrimziKafkaContainer.class.getResourceAsStream("/kafka-versions.txt");
- InputStreamReader streamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
-
- try (BufferedReader bufferedReader = new BufferedReader(streamReader)) {
- String kafkaVersion;
- while ((kafkaVersion = bufferedReader.readLine()) != null) {
- supportedKafkaVersions.add(kafkaVersion);
+ InputStream inputStream = StrimziKafkaContainer.class.getResourceAsStream("/kafka_versions.json");
+ try {
+ String json = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
+ try (JsonParser parser = Json.createParser(new StringReader(json))) {
+ parser.next();
+ parser.getObject()
+ .get("kafkaVersions")
+ .asJsonObject()
+ .keySet()
+ .forEach(supportedKafkaVersions::add);
}
} catch (IOException e) {
- LOGGER.error("Unable to load the supported Kafka versions", e);
+ throw new RuntimeException(e);
}
// sort kafka version from low to high
diff --git a/integration-tests/vertx-websocket/pom.xml b/integration-tests/vertx-websocket/pom.xml
index 7947fe5..abd5e2a 100644
--- a/integration-tests/vertx-websocket/pom.xml
+++ b/integration-tests/vertx-websocket/pom.xml
@@ -39,7 +39,7 @@
<!-- test dependencies -->
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-undertow-websockets</artifactId>
+ <artifactId>quarkus-websockets</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 20b39be..4269b7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
<quarkiverse-minio.version>2.3.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-mybatis.version>1.0.0</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-tika.version>1.0.3</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>2.7.1.Final</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>2.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>0.32.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -66,6 +66,7 @@
<animal-sniffer.version>1.18</animal-sniffer.version>
<antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others -->
<avro.version>1.11.0</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
+ <assertj.version>3.22.0</assertj.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version -->
<awssdk.version>2.17.103</awssdk.version><!-- @sync io.quarkiverse.amazonservices:quarkus-amazon-services-parent:${quarkiverse-amazonservices.version} prop:awssdk.version -->
<aws-java-sdk.version>1.11.714</aws-java-sdk.version>
<azure-sdk-bom.version>1.0.5</azure-sdk-bom.version><!-- Keep in sync with camel-azure component versions -->
@@ -86,8 +87,8 @@
<github-api.version>1.111</github-api.version><!-- Used in a Groovy script bellow -->
<google-native-image-support.version>0.8.0</google-native-image-support.version>
<google-auth-library-credentials.version>0.22.2</google-auth-library-credentials.version><!-- @sync io.grpc:grpc-auth:${grpc.version} dep:com.google.auth:google-auth-library-credentials -->
- <graalvm.version>21.3.1</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
- <grpc.version>1.43.2</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <graalvm.version>22.0.0.2</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
+ <grpc.version>1.44.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<guice-servlet.version>4.0</guice-servlet.version><!-- Spark -->
<hadoop3.version>${hadoop3-version}</hadoop3.version><!-- Spark -->
<hapi.version>${hapi-version}</hapi.version>
diff --git a/poms/build-parent/pom.xml b/poms/build-parent/pom.xml
index dee891f..6651378 100644
--- a/poms/build-parent/pom.xml
+++ b/poms/build-parent/pom.xml
@@ -37,6 +37,15 @@
<!-- maven-surefire-plugin -->
<failIfNoTests>false</failIfNoTests>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
<pluginManagement>
<plugins>