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/11/08 08:27:33 UTC
[camel-quarkus] branch quarkus-main updated (581ba8c -> a546bd1)
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 581ba8c Re-enable Kafka ssl sasl tests (#3252)
discard 869f7c2 Temporarily disable kafka-sasl & kafka-ssl tests due to #3239
discard 16b9534 Fix #3227 to remove the workaround in KafkaDevServicesDisabledTest
discard 657ac76 Revert "Fix #3206 to produce RunTimeConfigurationDefaultBuildItem with camel.component.kafka.brokers property"
discard 7530b47 Upgrade Quarkus to 2.5.0.CR1
add a2f9cf8 Expand route configurations test coverage #2978
add 4bebde1 Updated CHANGELOG.md
add dc433f7 Sql - enable stored procedure test for different db types #3080
add 218bef4 Cannot run tests against alternative BOMs #3258
add 5f666c7 Fixup 218bef4 Deactivate the virtualDepenencies profile via -DnoVirtualDependencies rather than !virtualDependencies #3258
add 2874a60 Remove not needed anymore BeansWeakCache substitution. Closes #3226 (#3264)
add bb1b3dc Updated CHANGELOG.md
add a331a0d5 avro: Fix the documentation about avro schema build time parsing #3270
add 86e69db Updated CHANGELOG.md
new 25c0c59 Upgrade Quarkus to 2.5.0.CR1
new f96c117 Revert "Fix #3206 to produce RunTimeConfigurationDefaultBuildItem with camel.component.kafka.brokers property"
new dc5be32 Fix #3227 to remove the workaround in KafkaDevServicesDisabledTest
new 46535d7 Temporarily disable kafka-sasl & kafka-ssl tests due to #3239
new a546bd1 Re-enable Kafka ssl sasl tests (#3252)
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 (581ba8c)
\
N -- N -- N refs/heads/quarkus-main (a546bd1)
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 5 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 | 10 +
.../ROOT/pages/reference/extensions/avro.adoc | 2 +-
.../runtime/graal/SubstituteBeansIntrospector.java | 30 --
.../runtime/graal/SubstituteBeansWeakCache.java | 65 ----
.../avro/runtime/src/main/doc/configuration.adoc | 2 +-
.../deployment/OptaplannerProcessor.java | 1 +
.../aws2-quarkus-client/aws2-ddb/pom.xml | 39 +-
.../aws2-quarkus-client/aws2-s3/pom.xml | 65 ++--
.../aws2-quarkus-client/aws2-ses/pom.xml | 39 +-
.../aws2-quarkus-client/aws2-sqs-sns/pom.xml | 65 ++--
integration-test-groups/aws2/aws2-cw/pom.xml | 39 +-
integration-test-groups/aws2/aws2-ddb/pom.xml | 39 +-
integration-test-groups/aws2/aws2-kinesis/pom.xml | 39 +-
integration-test-groups/aws2/aws2-lambda/pom.xml | 39 +-
integration-test-groups/aws2/aws2-s3/pom.xml | 65 ++--
integration-test-groups/aws2/aws2-ses/pom.xml | 39 +-
integration-test-groups/aws2/aws2-sqs-sns/pom.xml | 65 ++--
.../azure/azure-eventhubs/pom.xml | 65 ++--
.../azure/azure-storage-blob/pom.xml | 39 +-
.../azure/azure-storage-queue/pom.xml | 39 +-
integration-test-groups/foundation/bean/pom.xml | 65 ++--
integration-test-groups/foundation/browse/pom.xml | 65 ++--
.../foundation/component-name-resolver/pom.xml | 91 +++--
.../foundation/controlbus/pom.xml | 65 ++--
.../foundation/core-annotations/pom.xml | 65 ++--
.../foundation/core-fault-tolerance/pom.xml | 65 ++--
.../foundation/core-languages/pom.xml | 65 ++--
.../foundation/core-thread-pools/pom.xml | 39 +-
integration-test-groups/foundation/core/pom.xml | 39 +-
integration-test-groups/foundation/direct/pom.xml | 39 +-
integration-test-groups/foundation/eip/pom.xml | 65 ++--
.../foundation/language/pom.xml | 65 ++--
integration-test-groups/foundation/log/pom.xml | 39 +-
integration-test-groups/foundation/mock/pom.xml | 91 +++--
integration-test-groups/foundation/pom.xml | 1 +
integration-test-groups/foundation/ref/pom.xml | 65 ++--
.../foundation/route-configurations}/pom.xml | 133 ++-----
.../RouteConfigurationsConfigurationBuilder.java} | 18 +-
.../RouteConfigurationsException.java | 21 +-
.../RouteConfigurationsResource.java | 35 +-
.../RouteConfigurationsRouteBuilder.java | 56 +++
.../src/main}/resources/application.properties | 3 +-
.../src/main/resources/xml/routeConfigurations.xml | 15 +-
.../src/main/resources/xml/routes.xml | 12 +-
.../main/resources/yaml/routeConfigurations.yaml | 24 +-
.../src/main/resources/yaml/routes.yaml | 14 +-
.../routeconfigurations/RouteConfigurationsIT.java | 4 +-
.../RouteConfigurationsTest.java | 89 +++++
.../foundation/scheduler/pom.xml | 39 +-
integration-test-groups/foundation/seda/pom.xml | 39 +-
integration-test-groups/foundation/stream/pom.xml | 39 +-
integration-test-groups/foundation/timer/pom.xml | 39 +-
.../foundation/type-converter/pom.xml | 39 +-
.../mongodb/mongodb-gridfs/pom.xml | 39 +-
integration-test-groups/mongodb/mongodb/pom.xml | 39 +-
integration-tests-jvm/asn1/pom.xml | 42 ++-
integration-tests-jvm/asterisk/pom.xml | 42 ++-
integration-tests-jvm/atmos/pom.xml | 42 ++-
integration-tests-jvm/atomix/pom.xml | 42 ++-
integration-tests-jvm/aws-secrets-manager/pom.xml | 42 ++-
integration-tests-jvm/aws-xray/pom.xml | 42 ++-
integration-tests-jvm/azure-cosmosdb/pom.xml | 42 ++-
.../azure-storage-datalake/pom.xml | 42 ++-
integration-tests-jvm/barcode/pom.xml | 42 ++-
integration-tests-jvm/beanio/pom.xml | 42 ++-
integration-tests-jvm/beanstalk/pom.xml | 42 ++-
integration-tests-jvm/bonita/pom.xml | 42 ++-
integration-tests-jvm/chatscript/pom.xml | 42 ++-
integration-tests-jvm/chunk/pom.xml | 42 ++-
integration-tests-jvm/cm-sms/pom.xml | 42 ++-
integration-tests-jvm/cmis/pom.xml | 42 ++-
integration-tests-jvm/coap/pom.xml | 42 ++-
integration-tests-jvm/cometd/pom.xml | 42 ++-
integration-tests-jvm/corda/pom.xml | 42 ++-
integration-tests-jvm/couchbase/pom.xml | 42 ++-
integration-tests-jvm/djl/pom.xml | 42 ++-
integration-tests-jvm/dns/pom.xml | 42 ++-
integration-tests-jvm/drill/pom.xml | 42 ++-
integration-tests-jvm/ehcache/pom.xml | 42 ++-
integration-tests-jvm/elsql/pom.xml | 42 ++-
integration-tests-jvm/etcd/pom.xml | 42 ++-
integration-tests-jvm/etcd3/pom.xml | 42 ++-
integration-tests-jvm/facebook/pom.xml | 42 ++-
integration-tests-jvm/fastjson/pom.xml | 42 ++-
integration-tests-jvm/flink/pom.xml | 42 ++-
integration-tests-jvm/ganglia/pom.xml | 42 ++-
integration-tests-jvm/google-functions/pom.xml | 42 ++-
integration-tests-jvm/groovy-dsl/pom.xml | 68 ++--
integration-tests-jvm/groovy/pom.xml | 68 ++--
integration-tests-jvm/guava-eventbus/pom.xml | 42 ++-
integration-tests-jvm/hbase/pom.xml | 42 ++-
integration-tests-jvm/hdfs/pom.xml | 42 ++-
integration-tests-jvm/huaweicloud-smn/pom.xml | 42 ++-
integration-tests-jvm/iec60870/pom.xml | 42 ++-
integration-tests-jvm/ignite/pom.xml | 42 ++-
integration-tests-jvm/iota/pom.xml | 42 ++-
integration-tests-jvm/irc/pom.xml | 42 ++-
integration-tests-jvm/jasypt/pom.xml | 42 ++-
integration-tests-jvm/java-joor-dsl/pom.xml | 68 ++--
integration-tests-jvm/jbpm/pom.xml | 42 ++-
integration-tests-jvm/jcache/pom.xml | 42 ++-
integration-tests-jvm/jclouds/pom.xml | 42 ++-
integration-tests-jvm/jcr/pom.xml | 42 ++-
integration-tests-jvm/jfr/pom.xml | 94 +++--
integration-tests-jvm/jgroups-raft/pom.xml | 42 ++-
integration-tests-jvm/jgroups/pom.xml | 42 ++-
integration-tests-jvm/jooq/pom.xml | 42 ++-
integration-tests-jvm/joor/pom.xml | 42 ++-
integration-tests-jvm/jsonapi/pom.xml | 42 ++-
integration-tests-jvm/jt400/pom.xml | 42 ++-
integration-tests-jvm/kamelet-reify/pom.xml | 42 ++-
integration-tests-jvm/kotlin-dsl/pom.xml | 68 ++--
integration-tests-jvm/ldap/pom.xml | 42 ++-
integration-tests-jvm/ldif/pom.xml | 42 ++-
integration-tests-jvm/lucene/pom.xml | 42 ++-
integration-tests-jvm/management/pom.xml | 68 ++--
integration-tests-jvm/milo/pom.xml | 42 ++-
integration-tests-jvm/mvel/pom.xml | 42 ++-
integration-tests-jvm/mybatis/pom.xml | 42 ++-
integration-tests-jvm/ognl/pom.xml | 42 ++-
integration-tests-jvm/printer/pom.xml | 42 ++-
integration-tests-jvm/pulsar/pom.xml | 42 ++-
integration-tests-jvm/quickfix/pom.xml | 42 ++-
integration-tests-jvm/redis/pom.xml | 94 +++--
integration-tests-jvm/ribbon/pom.xml | 42 ++-
integration-tests-jvm/robotframework/pom.xml | 42 ++-
integration-tests-jvm/schematron/pom.xml | 42 ++-
integration-tests-jvm/sip/pom.xml | 42 ++-
integration-tests-jvm/smpp/pom.xml | 42 ++-
integration-tests-jvm/snmp/pom.xml | 42 ++-
integration-tests-jvm/soroush/pom.xml | 42 ++-
integration-tests-jvm/spark/pom.xml | 39 +-
integration-tests-jvm/splunk-hec/pom.xml | 42 ++-
integration-tests-jvm/stitch/pom.xml | 42 ++-
integration-tests-jvm/stomp/pom.xml | 42 ++-
integration-tests-jvm/stub/pom.xml | 42 ++-
integration-tests-jvm/thrift/pom.xml | 42 ++-
integration-tests-jvm/web3j/pom.xml | 42 ++-
integration-tests-jvm/weka/pom.xml | 42 ++-
integration-tests-jvm/wordpress/pom.xml | 42 ++-
integration-tests-jvm/workday/pom.xml | 42 ++-
integration-tests-jvm/xj/pom.xml | 42 ++-
integration-tests-jvm/xmpp/pom.xml | 42 ++-
integration-tests-jvm/xslt-saxon/pom.xml | 42 ++-
integration-tests-jvm/yammer/pom.xml | 42 ++-
integration-tests-jvm/zookeeper-master/pom.xml | 42 ++-
integration-tests-jvm/zookeeper/pom.xml | 42 ++-
integration-tests/activemq/pom.xml | 39 +-
integration-tests/amqp/pom.xml | 39 +-
integration-tests/arangodb/pom.xml | 39 +-
integration-tests/as2/pom.xml | 39 +-
integration-tests/atlasmap/pom.xml | 91 +++--
integration-tests/avro-rpc/pom.xml | 39 +-
integration-tests/avro/pom.xml | 65 ++--
integration-tests/aws2-grouped/pom.xml | 247 +++++++------
.../aws2-quarkus-client-grouped/pom.xml | 169 +++++----
integration-tests/aws2/pom.xml | 377 ++++++++++---------
integration-tests/azure-grouped/pom.xml | 117 +++---
integration-tests/base64/pom.xml | 65 ++--
integration-tests/bean-validator/pom.xml | 65 ++--
integration-tests/bindy/pom.xml | 65 ++--
integration-tests/box/pom.xml | 65 ++--
integration-tests/braintree/pom.xml | 39 +-
integration-tests/caffeine/pom.xml | 39 +-
integration-tests/cassandraql/pom.xml | 39 +-
integration-tests/cbor/pom.xml | 91 +++--
integration-tests/compression/pom.xml | 117 +++---
integration-tests/consul/pom.xml | 39 +-
integration-tests/core-discovery-disabled/pom.xml | 65 ++--
integration-tests/couchdb/pom.xml | 39 +-
integration-tests/crypto/pom.xml | 65 ++--
integration-tests/csimple/pom.xml | 91 +++--
integration-tests/csv/pom.xml | 65 ++--
integration-tests/dataformat/pom.xml | 117 +++---
integration-tests/dataformats-json/pom.xml | 301 +++++++--------
integration-tests/debezium/pom.xml | 65 ++--
integration-tests/digitalocean/pom.xml | 91 +++--
integration-tests/disruptor/pom.xml | 65 ++--
integration-tests/dozer/pom.xml | 65 ++--
integration-tests/dropbox/pom.xml | 39 +-
integration-tests/elasticsearch-rest/pom.xml | 65 ++--
integration-tests/exec/pom.xml | 65 ++--
integration-tests/fhir/pom.xml | 65 ++--
integration-tests/file/pom.xml | 143 +++----
integration-tests/flatpack/pom.xml | 91 +++--
integration-tests/fop/pom.xml | 39 +-
integration-tests/foundation-grouped/pom.xml | 411 ++++++++++++---------
integration-tests/freemarker/pom.xml | 39 +-
integration-tests/ftp/pom.xml | 65 ++--
integration-tests/geocoder/pom.xml | 39 +-
integration-tests/git/pom.xml | 39 +-
integration-tests/github/pom.xml | 39 +-
integration-tests/google-bigquery/pom.xml | 39 +-
integration-tests/google-pubsub/pom.xml | 39 +-
integration-tests/google-storage/pom.xml | 65 ++--
integration-tests/google/pom.xml | 117 +++---
integration-tests/graphql/pom.xml | 39 +-
integration-tests/grok/pom.xml | 91 +++--
integration-tests/grpc/pom.xml | 91 +++--
integration-tests/hazelcast/pom.xml | 65 ++--
integration-tests/headersmap/pom.xml | 39 +-
integration-tests/hl7/pom.xml | 143 +++----
integration-tests/http/pom.xml | 169 +++++----
integration-tests/hystrix/pom.xml | 91 +++--
integration-tests/infinispan/pom.xml | 91 +++--
integration-tests/influxdb/pom.xml | 39 +-
integration-tests/ipfs/pom.xml | 39 +-
integration-tests/jackson-avro/pom.xml | 65 ++--
integration-tests/jackson-protobuf/pom.xml | 65 ++--
integration-tests/jaxb/pom.xml | 65 ++--
integration-tests/jdbc/pom.xml | 65 ++--
integration-tests/jing/pom.xml | 65 ++--
integration-tests/jira/pom.xml | 65 ++--
integration-tests/jms-artemis-client/pom.xml | 39 +-
integration-tests/jms-qpid-amqp-client/pom.xml | 39 +-
integration-tests/jolt/pom.xml | 39 +-
integration-tests/jpa/pom.xml | 39 +-
integration-tests/js-dsl/pom.xml | 65 ++--
integration-tests/jsch/pom.xml | 39 +-
integration-tests/jslt/pom.xml | 39 +-
integration-tests/json-validator/pom.xml | 65 ++--
integration-tests/jsonata/pom.xml | 65 ++--
integration-tests/jsonpath/pom.xml | 117 +++---
integration-tests/jta/pom.xml | 169 +++++----
integration-tests/kafka-sasl-ssl/pom.xml | 65 ++--
integration-tests/kafka-sasl/pom.xml | 65 ++--
integration-tests/kafka-ssl/pom.xml | 65 ++--
integration-tests/kafka/pom.xml | 143 +++----
integration-tests/kamelet/pom.xml | 143 +++----
integration-tests/kotlin/pom.xml | 91 +++--
integration-tests/kubernetes/pom.xml | 39 +-
integration-tests/kudu/pom.xml | 117 +++---
integration-tests/leveldb/pom.xml | 91 +++--
integration-tests/lra/pom.xml | 117 +++---
integration-tests/lumberjack/pom.xml | 65 ++--
integration-tests/mail/pom.xml | 65 ++--
integration-tests/main-caffeine-lrucache/pom.xml | 39 +-
integration-tests/main-collector/pom.xml | 94 +++--
integration-tests/main-command-mode/pom.xml | 65 ++--
integration-tests/main-devmode/pom.xml | 120 +++---
integration-tests/main-discovery-disabled/pom.xml | 65 ++--
integration-tests/main-unknown-args-fail/pom.xml | 65 ++--
integration-tests/main-unknown-args-ignore/pom.xml | 65 ++--
integration-tests/main-xml-io/pom.xml | 169 +++++----
integration-tests/main-xml-jaxb/pom.xml | 195 +++++-----
integration-tests/main-yaml/pom.xml | 169 +++++----
integration-tests/main/pom.xml | 143 +++----
integration-tests/master/pom.xml | 143 +++----
integration-tests/micrometer/pom.xml | 91 +++--
integration-tests/microprofile/pom.xml | 143 +++----
integration-tests/minio/pom.xml | 39 +-
integration-tests/mllp/pom.xml | 91 +++--
integration-tests/mongodb-grouped/pom.xml | 65 ++--
integration-tests/msv/pom.xml | 65 ++--
integration-tests/mustache/pom.xml | 39 +-
integration-tests/nagios/pom.xml | 39 +-
integration-tests/nats/pom.xml | 65 ++--
integration-tests/netty/pom.xml | 91 +++--
integration-tests/nitrite/pom.xml | 39 +-
integration-tests/nsq/pom.xml | 65 ++--
integration-tests/oaipmh/pom.xml | 117 +++---
integration-tests/olingo4/pom.xml | 39 +-
integration-tests/openapi-java/pom.xml | 169 +++++----
integration-tests/openstack/pom.xml | 39 +-
integration-tests/opentelemetry/pom.xml | 117 +++---
integration-tests/opentracing/pom.xml | 91 +++--
integration-tests/optaplanner/pom.xml | 91 +++--
integration-tests/paho-mqtt5/pom.xml | 39 +-
integration-tests/paho/pom.xml | 39 +-
integration-tests/pdf/pom.xml | 39 +-
integration-tests/pg-replication-slot/pom.xml | 39 +-
integration-tests/pgevent/pom.xml | 91 +++--
integration-tests/platform-http-engine/pom.xml | 39 +-
integration-tests/platform-http/pom.xml | 117 +++---
integration-tests/protobuf/pom.xml | 65 ++--
integration-tests/pubnub/pom.xml | 91 +++--
integration-tests/quartz/pom.xml | 91 +++--
integration-tests/qute/pom.xml | 65 ++--
integration-tests/rabbitmq/pom.xml | 39 +-
integration-tests/reactive-streams/pom.xml | 65 ++--
integration-tests/rest-openapi/pom.xml | 91 +++--
integration-tests/rest/pom.xml | 169 +++++----
integration-tests/saga/pom.xml | 91 +++--
integration-tests/salesforce/pom.xml | 95 ++---
integration-tests/sap-netweaver/pom.xml | 91 +++--
integration-tests/saxon/pom.xml | 91 +++--
integration-tests/servicenow/pom.xml | 39 +-
integration-tests/servlet/pom.xml | 91 +++--
integration-tests/shiro/pom.xml | 91 +++--
integration-tests/sjms-artemis-client/pom.xml | 39 +-
integration-tests/sjms-qpid-amqp-client/pom.xml | 39 +-
integration-tests/sjms2-artemis-client/pom.xml | 39 +-
integration-tests/sjms2-qpid-amqp-client/pom.xml | 39 +-
integration-tests/slack/pom.xml | 65 ++--
.../smallrye-reactive-messaging/pom.xml | 91 +++--
integration-tests/soap/pom.xml | 65 ++--
integration-tests/solr/pom.xml | 39 +-
integration-tests/splunk/pom.xml | 65 ++--
integration-tests/spring-rabbitmq/pom.xml | 67 ++--
integration-tests/sql/README.adoc | 2 +-
integration-tests/sql/pom.xml | 91 +++--
.../quarkus/component/sql/it/SqlDbInitializer.java | 2 +-
.../quarkus/component/sql/it/SqlResource.java | 16 +-
.../sql/src/main/resources/sql/db2/initDb.sql | 7 +
.../sql/src/main/resources/sql/mariadb/initDb.sql | 8 +
.../sql/src/main/resources/sql/mssql/initDb.sql | 9 +-
.../sql/src/main/resources/sql/mysql/initDb.sql | 7 +
.../src/main/resources/sql/postgresql/initDb.sql | 1 +
.../camel/quarkus/component/sql/it/SqlTest.java | 2 +-
integration-tests/ssh/pom.xml | 39 +-
integration-tests/stax/pom.xml | 117 +++---
integration-tests/stringtemplate/pom.xml | 39 +-
integration-tests/syndication/pom.xml | 91 +++--
integration-tests/syslog/pom.xml | 65 ++--
integration-tests/tarfile/pom.xml | 65 ++--
integration-tests/telegram/pom.xml | 91 +++--
integration-tests/tika/pom.xml | 39 +-
integration-tests/twilio/pom.xml | 39 +-
integration-tests/twitter/pom.xml | 39 +-
integration-tests/univocity-parsers/pom.xml | 65 ++--
integration-tests/validator/pom.xml | 65 ++--
integration-tests/velocity/pom.xml | 39 +-
integration-tests/vertx-kafka/pom.xml | 39 +-
integration-tests/vertx-websocket/pom.xml | 39 +-
integration-tests/vertx/pom.xml | 65 ++--
integration-tests/weather/pom.xml | 39 +-
integration-tests/xchange/pom.xml | 39 +-
integration-tests/xml/pom.xml | 169 +++++----
integration-tests/xmlsecurity/pom.xml | 65 ++--
integration-tests/xpath/pom.xml | 91 +++--
integration-tests/xstream/pom.xml | 91 +++--
integration-tests/zendesk/pom.xml | 39 +-
pom.xml | 6 +-
poms/build-parent-it/pom.xml | 3 +-
334 files changed, 11824 insertions(+), 8725 deletions(-)
delete mode 100644 extensions-support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansIntrospector.java
delete mode 100644 extensions-support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansWeakCache.java
copy {integration-tests/debezium => integration-test-groups/foundation/route-configurations}/pom.xml (53%)
copy integration-test-groups/{aws2-quarkus-client/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3QuarkusClientIT.java => foundation/route-configurations/src/main/java/org/apache/camel/quarkus/core/it/routeconfigurations/RouteConfigurationsConfigurationBuilder.java} (55%)
copy integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/json/model/AnotherObject.java => integration-test-groups/foundation/route-configurations/src/main/java/org/apache/camel/quarkus/core/it/routeconfigurations/RouteConfigurationsException.java (66%)
copy integration-tests/saxon/src/main/java/org/apache/camel/quarkus/component/saxon/it/SaxonXPathResource.java => integration-test-groups/foundation/route-configurations/src/main/java/org/apache/camel/quarkus/core/it/routeconfigurations/RouteConfigurationsResource.java (59%)
create mode 100644 integration-test-groups/foundation/route-configurations/src/main/java/org/apache/camel/quarkus/core/it/routeconfigurations/RouteConfigurationsRouteBuilder.java
copy {extensions/kafka/deployment/src/test => integration-test-groups/foundation/route-configurations/src/main}/resources/application.properties (85%)
copy integration-tests/kamelet/src/main/resources/kamelets-runtime/upper-kamelet.xml => integration-test-groups/foundation/route-configurations/src/main/resources/xml/routeConfigurations.xml (69%)
copy integration-tests/kamelet/src/main/resources/kamelets-runtime/upper-kamelet.xml => integration-test-groups/foundation/route-configurations/src/main/resources/xml/routes.xml (74%)
copy .asf.yaml => integration-test-groups/foundation/route-configurations/src/main/resources/yaml/routeConfigurations.yaml (67%)
copy integration-tests/main-yaml/src/main/resources/routes/my-rests.yaml => integration-test-groups/foundation/route-configurations/src/main/resources/yaml/routes.yaml (72%)
copy integration-tests/digitalocean/src/test/java/org/apache/camel/quarkus/component/digitalocean/it/DigitaloceanDropletIT.java => integration-test-groups/foundation/route-configurations/src/test/java/org/apache/camel/quarkus/core/it/routeconfigurations/RouteConfigurationsIT.java (87%)
create mode 100644 integration-test-groups/foundation/route-configurations/src/test/java/org/apache/camel/quarkus/core/it/routeconfigurations/RouteConfigurationsTest.java
[camel-quarkus] 03/05: Fix #3227 to remove the workaround in
KafkaDevServicesDisabledTest
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 dc5be32f7ad77890e7bd006bb098b83f956d3639
Author: Amos Feng <zf...@redhat.com>
AuthorDate: Mon Oct 25 22:20:51 2021 +0800
Fix #3227 to remove the workaround in KafkaDevServicesDisabledTest
---
.../component/kafka/deployment/KafkaDevServicesDisabledTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java
index 75daa19..14883db 100644
--- a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java
+++ b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java
@@ -34,8 +34,7 @@ public class KafkaDevServicesDisabledTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
.withConfigurationResource("application-configuration-devservices-disabled.properties")
- .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class))
- .overrideConfigKey("camel.component.kafka.brokers", "");
+ .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
@Inject
CamelContext context;
[camel-quarkus] 04/05: Temporarily disable kafka-sasl & kafka-ssl
tests due to #3239
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 46535d7e7b9c68ffa3708958031cc2ab97c79774
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Oct 27 10:35:20 2021 +0100
Temporarily disable kafka-sasl & kafka-ssl tests due to #3239
---
.../test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java | 2 ++
.../java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java | 2 ++
.../src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java | 2 ++
.../src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java | 2 ++
4 files changed, 8 insertions(+)
diff --git a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
index 947a7ee..71d482b 100644
--- a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
+++ b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
@@ -22,10 +22,12 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
+@Disabled("https://github.com/apache/camel-quarkus/issues/3239")
@QuarkusTest
@QuarkusTestResource(KafkaSaslSslTestResource.class)
public class KafkaSaslSslTest {
diff --git a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
index c4a246b..968749a 100644
--- a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
+++ b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
@@ -22,10 +22,12 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+@Disabled("https://github.com/apache/camel-quarkus/issues/3239")
@QuarkusTest
@QuarkusTestResource(KafkaSaslTestResource.class)
public class KafkaSaslBindingTest {
diff --git a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
index 6b25cb4..297a3f4 100644
--- a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
+++ b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
@@ -16,8 +16,10 @@
*/
package org.apache.camel.quarkus.kafka.sasl;
+import io.quarkus.test.junit.DisabledOnNativeImage;
import io.quarkus.test.junit.NativeImageTest;
+@DisabledOnNativeImage("https://github.com/apache/camel-quarkus/issues/3239")
@NativeImageTest
public class KafkaSaslIT extends KafkaSaslBindingTest {
}
diff --git a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java
index 8cc3a89..f25e8c0 100644
--- a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java
+++ b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java
@@ -22,11 +22,13 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.is;
+@Disabled("https://github.com/apache/camel-quarkus/issues/3239")
@QuarkusTest
@QuarkusTestResource(KafkaSslTestResource.class)
public class KafkaSslTest {
[camel-quarkus] 01/05: Upgrade Quarkus to 2.5.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 25c0c59e0bb427496b475f0a81ddb5f8b9e3c025
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Oct 14 07:49:19 2021 +0100
Upgrade Quarkus to 2.5.0.CR1
---
docs/antora.yml | 2 +-
.../core/deployment/CamelContextCustomizerTest.java | 2 +-
.../optaplanner/deployment/OptaplannerProcessor.java | 1 +
integration-tests-support/azure/pom.xml | 6 ++++++
.../camel/quarkus/component/fop/it/FopResource.java | 16 ++++++----------
.../quarkus/component/salesforce/SalesforceResource.java | 4 ++--
pom.xml | 8 ++++----
poms/bom/pom.xml | 2 +-
8 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 30b5114..114a808 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -27,7 +27,7 @@ asciidoc:
min-maven-version: 3.6.2 # replace ${min-maven-version}
target-maven-version: 3.8.1 # replace ${target-maven-version}
camel-version: 3.12.0 # replace ${camel.version}
- quarkus-version: 2.4.0.Final # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
# attributes used in xrefs to other Antora components
cq-camel-components: 3.12.x@components # replace ${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
index d059d74..69f04c3 100644
--- a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
+++ b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
@@ -53,7 +53,7 @@ public class CamelContextCustomizerTest {
public void execute(BuildContext context) {
String methodName = "execute";
BytecodeRecorderImpl bri = new BytecodeRecorderImpl(true, getClass().getSimpleName(), methodName,
- Integer.toString(methodName.hashCode()), true);
+ Integer.toString(methodName.hashCode()), true, s -> null);
RuntimeValue<CamelContextCustomizer> value = bri
.newInstance(RestConfigurationCustomizer.class.getName());
context.produce(new CamelContextCustomizerBuildItem(value));
diff --git a/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java b/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
index 497bfa3..488752b 100644
--- a/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
+++ b/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
@@ -35,5 +35,6 @@ class OptaplannerProcessor {
runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem("org.drools.core.util.Drools$XSTreamChekcer"));
runtimeInitializedClass
.produce(new RuntimeInitializedClassBuildItem("org.drools.compiler.kproject.models.KieModuleMarshaller"));
+ runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem("org.drools.core.rule.JavaDialectRuntimeData"));
}
}
diff --git a/integration-tests-support/azure/pom.xml b/integration-tests-support/azure/pom.xml
index 42ed843..bca5eff 100644
--- a/integration-tests-support/azure/pom.xml
+++ b/integration-tests-support/azure/pom.xml
@@ -41,6 +41,12 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
diff --git a/integration-tests/fop/src/main/java/org/apache/camel/quarkus/component/fop/it/FopResource.java b/integration-tests/fop/src/main/java/org/apache/camel/quarkus/component/fop/it/FopResource.java
index 54319ee..b04ba56 100644
--- a/integration-tests/fop/src/main/java/org/apache/camel/quarkus/component/fop/it/FopResource.java
+++ b/integration-tests/fop/src/main/java/org/apache/camel/quarkus/component/fop/it/FopResource.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.quarkus.component.fop.it;
-import java.io.InputStream;
import java.net.URI;
import javax.enterprise.context.ApplicationScoped;
@@ -52,14 +51,11 @@ public class FopResource {
public Response post(String message, @QueryParam("userConfigURL") String userConfigURL) throws Exception {
LOG.infof("Sending to fop: %s", message);
String endpointUri = userConfigURL == null ? "fop:pdf" : "fop:application/pdf?userConfigURL=" + userConfigURL;
- try (InputStream response = producerTemplate.requestBody(
- endpointUri, message, InputStream.class)) {
- LOG.info("Got response from fop.");
- return Response
- .created(new URI("https://camel.apache.org/"))
- .entity(response)
- .build();
- }
-
+ byte[] bytes = producerTemplate.requestBody(endpointUri, message, byte[].class);
+ LOG.info("Got response from fop.");
+ return Response
+ .created(new URI("https://camel.apache.org/"))
+ .entity(bytes)
+ .build();
}
}
diff --git a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java
index 01632a9..1a55d67 100644
--- a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java
+++ b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java
@@ -74,12 +74,12 @@ public class SalesforceResource {
@Path("/document/{id}")
@GET
@Produces(MediaType.APPLICATION_JSON)
- public Object getDocument(@PathParam("id") String id) {
+ public String getDocument(@PathParam("id") String id) {
return template.withBody(id)
.withHeader(SalesforceEndpointConfig.SOBJECT_EXT_ID_NAME, "Name")
.withHeader(SalesforceEndpointConfig.SOBJECT_NAME, "Document")
.to("salesforce:getSObjectWithId?rawPayload=true")
- .request();
+ .request(String.class);
}
@Path("/account")
diff --git a/pom.xml b/pom.xml
index 5c6d9a6..d1e1e5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<optaplanner.version>8.9.1.Final</optaplanner.version><!-- May go back to Camel's ${optaplanner-version} when they are in sync https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ -->
<quarkiverse.freemarker.version>0.3.0</quarkiverse.freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ -->
<quarkiverse-minio.version>2.3.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
- <quarkus.version>2.4.0.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.29.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -81,8 +81,8 @@
<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 -->
<guava.version>29.0-jre</guava.version>
- <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 -->
+ <graalvm.version>21.3.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
+ <grpc.version>1.42.0</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 -->
<guice-servlet.version>4.0</guice-servlet.version><!-- Spark -->
<hadoop3.version>${hadoop3-version}</hadoop3.version><!-- Spark -->
@@ -117,7 +117,7 @@
<retrofit.version>2.5.0</retrofit.version>
<saaj.impl.version>1.5.3</saaj.impl.version>
<scala-2.12.version>2.12.15</scala-2.12.version><!-- Spark -->
- <smallrye.reactive.messaging.camel.version>3.10.1</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
+ <smallrye.reactive.messaging.camel.version>3.11.0</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>
<snappy.version>1.1.7.7</snappy.version><!-- Spark -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 9cf7449..678db54 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -1171,7 +1171,7 @@
<exclusions>
<exclusion>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
[camel-quarkus] 02/05: Revert "Fix #3206 to produce
RunTimeConfigurationDefaultBuildItem with camel.component.kafka.brokers
property"
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 f96c117e3179621726af06dc23dcefe6efd4e103
Author: Amos Feng <zf...@redhat.com>
AuthorDate: Mon Oct 25 22:18:23 2021 +0800
Revert "Fix #3206 to produce RunTimeConfigurationDefaultBuildItem with camel.component.kafka.brokers property"
This reverts commit 03b6dbb4be7ddd0320ecb9b06100c9a6a089925a.
---
.../camel/quarkus/component/kafka/deployment/KafkaProcessor.java | 6 +++---
.../component/kafka/deployment/KafkaDevServicesDisabledTest.java | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java b/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
index 9acafda..6aab15e 100644
--- a/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
+++ b/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
@@ -24,8 +24,8 @@ import io.quarkus.deployment.Capability;
import io.quarkus.deployment.IsNormal;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem;
import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
import io.quarkus.kafka.client.deployment.DevServicesKafkaBrokerBuildItem;
import io.quarkus.kafka.client.deployment.KafkaBuildTimeConfig;
@@ -55,13 +55,13 @@ class KafkaProcessor {
public void configureKafkaComponentForDevServices(
DevServicesKafkaBrokerBuildItem kafkaBrokerBuildItem,
KafkaBuildTimeConfig kafkaBuildTimeConfig,
- BuildProducer<RunTimeConfigurationDefaultBuildItem> runTimeConfig) {
+ BuildProducer<DevServicesConfigResultBuildItem> devServiceConfig) {
Config config = ConfigProvider.getConfig();
Optional<String> brokers = config.getOptionalValue(CAMEL_KAFKA_BROKERS, String.class);
if (brokers.isEmpty() && kafkaBuildTimeConfig.devservices.enabled.orElse(true)) {
- runTimeConfig.produce(new RunTimeConfigurationDefaultBuildItem(CAMEL_KAFKA_BROKERS,
+ devServiceConfig.produce(new DevServicesConfigResultBuildItem(CAMEL_KAFKA_BROKERS,
kafkaBrokerBuildItem.getBootstrapServers()));
}
}
diff --git a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java
index 14883db..75daa19 100644
--- a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java
+++ b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java
@@ -34,7 +34,8 @@ public class KafkaDevServicesDisabledTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
.withConfigurationResource("application-configuration-devservices-disabled.properties")
- .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+ .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class))
+ .overrideConfigKey("camel.component.kafka.brokers", "");
@Inject
CamelContext context;
[camel-quarkus] 05/05: Re-enable Kafka ssl sasl tests (#3252)
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 a546bd1e616a03ebf0db134c9d7c25bac105788c
Author: Amos Feng <zh...@gmail.com>
AuthorDate: Tue Nov 2 17:30:33 2021 +0800
Re-enable Kafka ssl sasl tests (#3252)
* Revert "Temporarily disable kafka-sasl & kafka-ssl tests due to #3239"
This reverts commit 25a3d41b578c610224a0126f52e2176fd05fdf53.
* Fix #3239 to override KAFKA_ADVERTISED_LISTENERS env
* sync avro.version
---
.../org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java | 2 --
.../camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java | 9 +++++++++
.../apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java | 2 --
.../java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java | 2 --
.../camel/quarkus/kafka/sasl/KafkaSaslTestResource.java | 11 ++++++++++-
.../java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java | 2 --
.../apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java | 9 +++++++++
pom.xml | 2 +-
8 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
index 71d482b..947a7ee 100644
--- a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
+++ b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
@@ -22,12 +22,10 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
-@Disabled("https://github.com/apache/camel-quarkus/issues/3239")
@QuarkusTest
@QuarkusTestResource(KafkaSaslSslTestResource.class)
public class KafkaSaslSslTest {
diff --git a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
index a6f55b9..ac807d3 100644
--- a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
+++ b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
@@ -129,6 +129,15 @@ public class KafkaSaslSslTestResource extends KafkaTestResource {
}
@Override
+ protected void configure() {
+ super.configure();
+
+ String host = getNetwork() != null ? getNetworkAliases().get(0) : "localhost";
+ withEnv("KAFKA_ADVERTISED_LISTENERS",
+ String.format("SASL_SSL://%s:9093,BROKER://%s:9092", host, host));
+ }
+
+ @Override
protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
super.containerIsStarting(containerInfo, reused);
copyFileToContainer(
diff --git a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
index 968749a..c4a246b 100644
--- a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
+++ b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
@@ -22,12 +22,10 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-@Disabled("https://github.com/apache/camel-quarkus/issues/3239")
@QuarkusTest
@QuarkusTestResource(KafkaSaslTestResource.class)
public class KafkaSaslBindingTest {
diff --git a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
index 297a3f4..6b25cb4 100644
--- a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
+++ b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
@@ -16,10 +16,8 @@
*/
package org.apache.camel.quarkus.kafka.sasl;
-import io.quarkus.test.junit.DisabledOnNativeImage;
import io.quarkus.test.junit.NativeImageTest;
-@DisabledOnNativeImage("https://github.com/apache/camel-quarkus/issues/3239")
@NativeImageTest
public class KafkaSaslIT extends KafkaSaslBindingTest {
}
diff --git a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslTestResource.java b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslTestResource.java
index b42ac32..66c2fe7 100644
--- a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslTestResource.java
+++ b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslTestResource.java
@@ -83,7 +83,7 @@ public class KafkaSaslTestResource extends KafkaTestResource {
SaslKafkaContainer(final DockerImageName dockerImageName) {
super(dockerImageName);
- String protocolMap = "SASL_PLAINTEXT:SASL_PLAINTEXT,BROKER:SASL_PLAINTEXT";
+ String protocolMap = "SASL_PLAINTEXT:SASL_PLAINTEXT,BROKER:PLAINTEXT";
String listeners = "SASL_PLAINTEXT://0.0.0.0:" + KAFKA_PORT + ",BROKER://0.0.0.0:9092";
withEnv("KAFKA_OPTS", "-Djava.security.auth.login.config=/etc/kafka/kafka_server_jaas.conf");
@@ -103,6 +103,15 @@ public class KafkaSaslTestResource extends KafkaTestResource {
}
@Override
+ protected void configure() {
+ super.configure();
+
+ String host = getNetwork() != null ? getNetworkAliases().get(0) : "localhost";
+ withEnv("KAFKA_ADVERTISED_LISTENERS",
+ String.format("SASL_PLAINTEXT://%s:9093,BROKER://%s:9092", host, host));
+ }
+
+ @Override
protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
super.containerIsStarting(containerInfo, reused);
copyFileToContainer(
diff --git a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java
index f25e8c0..8cc3a89 100644
--- a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java
+++ b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java
@@ -22,13 +22,11 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.is;
-@Disabled("https://github.com/apache/camel-quarkus/issues/3239")
@QuarkusTest
@QuarkusTestResource(KafkaSslTestResource.class)
public class KafkaSslTest {
diff --git a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java
index ea775dd..ed0e0da 100644
--- a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java
+++ b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java
@@ -122,6 +122,15 @@ public class KafkaSslTestResource extends KafkaTestResource {
}
@Override
+ protected void configure() {
+ super.configure();
+
+ String host = getNetwork() != null ? getNetworkAliases().get(0) : "localhost";
+ withEnv("KAFKA_ADVERTISED_LISTENERS",
+ String.format("SSL://%s:9093,BROKER://%s:9092", host, host));
+ }
+
+ @Override
protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
super.containerIsStarting(containerInfo, reused);
copyFileToContainer(
diff --git a/pom.xml b/pom.xml
index d1e1e5f..0da79dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
<ahc.version>${ahc-version}</ahc.version>
<animal-sniffer.version>1.18</animal-sniffer.version>
<antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others -->
- <avro.version>1.10.2</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
+ <avro.version>1.11.0</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
<aws-java-sdk.version>1.11.714</aws-java-sdk.version>
<azure-sdk-bom.version>${azure-sdk-bom-version}</azure-sdk-bom.version>
<bouncycastle.version>1.69</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk15on -->