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/10/10 06:31:36 UTC
[camel-quarkus] branch quarkus-main updated (943a796039 -> 2ce32b9297)
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 943a796039 Disable XStream native tests due to #4149
discard ce37a72fe0 Disable tests for native mode serialization due to #4148
discard 6375740cf9 Disable OptaPlanner tests due to #4116
discard 97a80ea020 Upgrade Quarkus to 2.14.0.CR1
add 28474794d4 Fix Netty integration tests on FIPS system
add 882faa3b96 Deprecated parameters in several annotations are ignored - inconsistent with other annotations.
add 46197de96c Add cloudEvents and knative extensions Fixes #3459
add 657ca87152 Inherit Azure SDK BOM version from Camel
add 69b6301483 Sync Azure Vert.x HTTP client from azure-sdk project
add f14f834b04 Regenerate BOM with correct knative component versions
add 66aab8d41d Upgrade Quarkus to 2.13.1.Final
add 6b483e8fe7 Disable tests for native mode serialization due to #4148
add 2f24671fe4 Disable XStream native tests due to #4149
add e91eb3943d Add sync tag for ahc.version property
add 53f762ae61 Updated CHANGELOG.md
new 02c43eb353 Upgrade Quarkus to 2.14.0.CR1
new 2ce32b9297 Disable OptaPlanner tests due to #4116
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 (943a796039)
\
N -- N -- N refs/heads/quarkus-main (2ce32b9297)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.md | 10 +
catalog/pom.xml | 52 +++
docs/modules/ROOT/examples/components/knative.yml | 13 +
docs/modules/ROOT/examples/others/cloudevents.yml | 13 +
docs/modules/ROOT/nav.adoc | 4 +
.../pages/reference/extensions/cloudevents.adoc | 45 ++
.../reference/extensions/knative-consumer.adoc | 38 ++
.../reference/extensions/knative-producer.adoc | 38 ++
.../ROOT/pages/reference/extensions/knative.adoc | 45 ++
.../quarkus/core/deployment/ConsumeProcessor.java | 3 +
.../core/deployment/InjectionPointsProcessor.java | 25 +-
.../main/CamelMainDeprecatedConsumeTest.java | 40 ++
.../CamelMainDeprecatedEndpointInjectTest.java | 48 +++
.../main/CamelMainDeprecatedProduceTest.java | 48 +++
.../deployment/pom.xml | 5 +
.../vertx/AzureCoreHttpClientVertxProcessor.java | 10 +
.../azure/core/http/vertx/DeadlockTests.java | 25 +-
.../http/vertx/SimpleBasicAuthHttpProxyServer.java | 132 ++++++
.../http/vertx/VertxAsyncClientTestHelper.java | 47 +++
... VertxAsyncHttpClientAsyncHttpClientTests.java} | 37 +-
.../vertx/VertxAsyncHttpClientBuilderTests.java | 464 +++++++++++++++++++++
.../vertx/VertxAsyncHttpClientProviderTests.java | 213 ++++++++++
...> VertxAsyncHttpClientResponseTransformer.java} | 6 +-
.../vertx/VertxAsyncHttpClientRestProxyTests.java | 145 +++++++
...HttpClientRestProxyWithAsyncHttpProxyTests.java | 192 +++++++++
.../vertx/VertxAsyncHttpClientSingletonTests.java | 83 ++++
...ntTests.java => VertxAsyncHttpClientTests.java} | 144 +++++--
.../http/vertx/VertxHttpClientBuilderTests.java | 183 --------
.../http/vertx/VertxHttpClientProviderTests.java | 114 -----
.../http/vertx/VertxHttpClientRestProxyTests.java | 65 ---
...VertxHttpClientRestProxyWithHttpProxyTests.java | 88 ----
.../azure-core-http-client-vertx/runtime/pom.xml | 4 -
...ientProvider.java => QuarkusVertxProvider.java} | 35 +-
.../core/http/vertx/VertxAsyncHttpClient.java | 139 ++++++
.../http/vertx/VertxAsyncHttpClientBuilder.java | 288 +++++++++++++
.../http/vertx/VertxAsyncHttpClientProvider.java | 82 ++++
.../core/http/vertx/VertxHttpAsyncResponse.java | 52 ---
.../azure/core/http/vertx/VertxHttpClient.java | 133 ------
.../core/http/vertx/VertxHttpClientBuilder.java | 264 ------------
.../core/http/vertx/VertxHttpResponseHandler.java | 59 ---
.../{VertxHttpRequest.java => VertxProvider.java} | 25 +-
.../BufferedVertxHttpResponse.java | 34 +-
.../implementation/VertxHttpAsyncResponse.java | 61 +++
.../VertxHttpResponseBase.java} | 24 +-
.../com.azure.core.http.HttpClientProvider | 2 +-
...kus.support.azure.core.http.vertx.VertxProvider | 1 +
extensions-support/azure-core/runtime/pom.xml | 10 +-
.../cloudevents/deployment}/pom.xml | 38 +-
.../deployment/CloudeventsProcessor.java | 23 +-
extensions/cloudevents/pom.xml | 39 ++
.../cloudevents}/runtime/pom.xml | 64 ++-
.../main/resources/META-INF/quarkus-extension.yaml | 31 ++
.../knative-consumer/deployment}/pom.xml | 39 +-
.../deployment/KnativeConsumerProcessor.java | 24 +-
extensions/knative-consumer/pom.xml | 40 ++
.../knative-consumer}/runtime/pom.xml | 58 ++-
.../main/resources/META-INF/quarkus-extension.yaml | 31 ++
.../knative-producer/deployment}/pom.xml | 36 +-
.../deployment/KnativeProducerProcessor.java | 23 +-
extensions/knative-producer/pom.xml | 39 ++
.../knative-producer}/runtime/pom.xml | 59 ++-
.../main/resources/META-INF/quarkus-extension.yaml | 31 ++
.../knative/deployment}/pom.xml | 40 +-
.../knative/deployment/KnativeProcessor.java | 103 +++++
extensions/knative/pom.xml | 39 ++
extensions/knative/runtime/pom.xml | 124 ++++++
.../component/knative/KnativeConsumerRecorder.java | 44 ++
.../component/knative/KnativeProducerRecorder.java | 46 ++
.../quarkus/component/knative/KnativeRecorder.java | 25 +-
.../main/resources/META-INF/quarkus-extension.yaml | 31 ++
extensions/pom.xml | 4 +
.../knative-channel-consumer/Readme.adoc | 8 +
.../{netty => knative-channel-consumer}/pom.xml | 40 +-
.../it/KnativeChannelConsumerResource.java | 30 +-
.../component/knative/consumer/it/Route.java | 24 +-
.../src/main/resources/application.properties | 5 +-
.../consumer/it/KnativeChannelConsumerIT.java | 22 +-
.../consumer/it/KnativeChannelConsumerTest.java | 60 +++
.../knative-endpoint-consumer/Readme.adoc | 8 +
.../{netty => knative-endpoint-consumer}/pom.xml | 41 +-
.../it/KnativeEndpointConsumerResource.java | 31 +-
.../component/knative/consumer/it/Route.java | 23 +-
.../src}/src/main/resources/application.properties | 6 +-
.../consumer/it/KnativeEndpointConsumerIT.java | 22 +-
.../consumer/it/KnativeEndpointConsumerTest.java | 61 +++
.../knative-event-consumer/Readme.adoc | 11 +
.../{netty => knative-event-consumer}/pom.xml | 41 +-
.../it/KnativeChannelConsumerResource.java | 31 +-
.../component/knative/consumer/it/Route.java | 24 +-
.../src}/src/main/resources/application.properties | 5 +-
.../consumer/it/KnativeEventConsumerIT.java | 22 +-
.../consumer/it/KnativeEventConsumerTest.java | 63 +++
integration-tests/knative-producer/Readme.adoc | 11 +
.../{netty => knative-producer}/pom.xml | 58 ++-
.../producer/it/KnativeProducerResource.java | 124 ++++++
.../component/knative/producer/it/Routes.java | 72 ++++
.../src/main/resources/application.properties | 40 ++
.../knative/producer/it/KnativeProducerIT.java | 22 +-
.../knative/producer/it/KnativeProducerTest.java | 134 ++++++
.../knative/producer/it/KnativeTestResource.java | 50 +++
.../src/test/resources/mappings/sendToBroker.json | 17 +
.../src/test/resources/mappings/sendToChannel.json | 17 +
.../src/test/resources/mappings/sendToService.json | 17 +
integration-tests/{netty => knative}/pom.xml | 60 +--
.../component/knative/it/KnativeResource.java | 49 +++
.../quarkus/component/knative/it/KnativeIT.java | 21 +-
.../quarkus/component/knative/it/KnativeTest.java | 50 +++
integration-tests/netty/README.adoc | 12 +
integration-tests/netty/pom.xml | 39 ++
.../quarkus/component/netty/NettyProducers.java | 18 +-
.../src/main/resources/application.properties | 11 +-
.../src/main/resources/ssl/fips-keystore.bcfks | Bin 0 -> 2579 bytes
.../src/main/resources/ssl/fips-truststore.bcfks | Bin 0 -> 1188 bytes
integration-tests/pom.xml | 5 +
pom.xml | 20 +-
poms/bom/pom.xml | 60 +++
poms/bom/src/main/generated/flattened-full-pom.xml | 357 +++++++++-------
.../src/main/generated/flattened-reduced-pom.xml | 92 +++-
.../generated/flattened-reduced-verbose-pom.xml | 148 +++++--
tooling/scripts/test-categories.yaml | 5 +
120 files changed, 4783 insertions(+), 1923 deletions(-)
create mode 100644 docs/modules/ROOT/examples/components/knative.yml
create mode 100644 docs/modules/ROOT/examples/others/cloudevents.yml
create mode 100644 docs/modules/ROOT/pages/reference/extensions/cloudevents.adoc
create mode 100644 docs/modules/ROOT/pages/reference/extensions/knative-consumer.adoc
create mode 100644 docs/modules/ROOT/pages/reference/extensions/knative-producer.adoc
create mode 100644 docs/modules/ROOT/pages/reference/extensions/knative.adoc
create mode 100644 extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/main/CamelMainDeprecatedConsumeTest.java
create mode 100644 extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/main/CamelMainDeprecatedEndpointInjectTest.java
create mode 100644 extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/main/CamelMainDeprecatedProduceTest.java
create mode 100644 extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/SimpleBasicAuthHttpProxyServer.java
create mode 100644 extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxAsyncClientTestHelper.java
rename extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/{VertxHttpClientHttpClientTests.java => VertxAsyncHttpClientAsyncHttpClientTests.java} (60%)
create mode 100644 extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxAsyncHttpClientBuilderTests.java
create mode 100644 extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxAsyncHttpClientProviderTests.java
rename extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/{VertxHttpClientResponseTransformer.java => VertxAsyncHttpClientResponseTransformer.java} (89%)
create mode 100644 extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxAsyncHttpClientRestProxyTests.java
create mode 100644 extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxAsyncHttpClientRestProxyWithAsyncHttpProxyTests.java
create mode 100644 extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxAsyncHttpClientSingletonTests.java
rename extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/{VertxHttpClientTests.java => VertxAsyncHttpClientTests.java} (68%)
delete mode 100644 extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientBuilderTests.java
delete mode 100644 extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientProviderTests.java
delete mode 100644 extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientRestProxyTests.java
delete mode 100644 extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientRestProxyWithHttpProxyTests.java
rename extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/{VertxHttpClientProvider.java => QuarkusVertxProvider.java} (57%)
create mode 100644 extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxAsyncHttpClient.java
create mode 100644 extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxAsyncHttpClientBuilder.java
create mode 100644 extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxAsyncHttpClientProvider.java
delete mode 100644 extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpAsyncResponse.java
delete mode 100644 extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClient.java
delete mode 100644 extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientBuilder.java
delete mode 100644 extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpResponseHandler.java
copy extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/{VertxHttpRequest.java => VertxProvider.java} (62%)
rename extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/{ => implementation}/BufferedVertxHttpResponse.java (64%)
create mode 100644 extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/implementation/VertxHttpAsyncResponse.java
rename extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/{VertxHttpResponse.java => implementation/VertxHttpResponseBase.java} (71%)
create mode 100644 extensions-support/azure-core-http-client-vertx/runtime/src/main/resources/META-INF/services/org.apache.camel.quarkus.support.azure.core.http.vertx.VertxProvider
copy {extensions-support/azure-core-http-client-vertx/runtime => extensions/cloudevents/deployment}/pom.xml (58%)
copy extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpRequest.java => extensions/cloudevents/deployment/src/main/java/org/apache/camel/quarkus/component/cloudevents/deployment/CloudeventsProcessor.java (59%)
create mode 100644 extensions/cloudevents/pom.xml
copy {extensions-support/azure-core-http-client-vertx => extensions/cloudevents}/runtime/pom.xml (54%)
create mode 100644 extensions/cloudevents/runtime/src/main/resources/META-INF/quarkus-extension.yaml
copy {extensions-support/azure-core-http-client-vertx/runtime => extensions/knative-consumer/deployment}/pom.xml (63%)
copy extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpRequest.java => extensions/knative-consumer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/consumer/deployment/KnativeConsumerProcessor.java (59%)
create mode 100644 extensions/knative-consumer/pom.xml
copy {extensions-support/azure-core-http-client-vertx => extensions/knative-consumer}/runtime/pom.xml (61%)
create mode 100644 extensions/knative-consumer/runtime/src/main/resources/META-INF/quarkus-extension.yaml
copy {extensions-support/azure-core-http-client-vertx/runtime => extensions/knative-producer/deployment}/pom.xml (64%)
copy extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpRequest.java => extensions/knative-producer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/producer/deployment/KnativeProducerProcessor.java (59%)
create mode 100644 extensions/knative-producer/pom.xml
copy {extensions-support/azure-core-http-client-vertx => extensions/knative-producer}/runtime/pom.xml (61%)
create mode 100644 extensions/knative-producer/runtime/src/main/resources/META-INF/quarkus-extension.yaml
copy {extensions-support/azure-core-http-client-vertx/runtime => extensions/knative/deployment}/pom.xml (62%)
create mode 100644 extensions/knative/deployment/src/main/java/org/apache/camel/quarkus/component/knative/deployment/KnativeProcessor.java
create mode 100644 extensions/knative/pom.xml
create mode 100644 extensions/knative/runtime/pom.xml
create mode 100644 extensions/knative/runtime/src/main/java/org/apache/camel/quarkus/component/knative/KnativeConsumerRecorder.java
create mode 100644 extensions/knative/runtime/src/main/java/org/apache/camel/quarkus/component/knative/KnativeProducerRecorder.java
copy extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpRequest.java => extensions/knative/runtime/src/main/java/org/apache/camel/quarkus/component/knative/KnativeRecorder.java (58%)
create mode 100644 extensions/knative/runtime/src/main/resources/META-INF/quarkus-extension.yaml
create mode 100644 integration-tests/knative-channel-consumer/Readme.adoc
copy integration-tests/{netty => knative-channel-consumer}/pom.xml (75%)
copy extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpRequest.java => integration-tests/knative-channel-consumer/src/main/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerResource.java (59%)
copy extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpRequest.java => integration-tests/knative-channel-consumer/src/main/java/org/apache/camel/quarkus/component/knative/consumer/it/Route.java (58%)
copy integration-tests/{netty => knative-channel-consumer}/src/main/resources/application.properties (80%)
copy extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpRequest.java => integration-tests/knative-channel-consumer/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerIT.java (58%)
create mode 100644 integration-tests/knative-channel-consumer/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerTest.java
create mode 100644 integration-tests/knative-endpoint-consumer/Readme.adoc
copy integration-tests/{netty => knative-endpoint-consumer}/pom.xml (75%)
copy extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpRequest.java => integration-tests/knative-endpoint-consumer/src/src/main/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeEndpointConsumerResource.java (59%)
copy extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpRequest.java => integration-tests/knative-endpoint-consumer/src/src/main/java/org/apache/camel/quarkus/component/knative/consumer/it/Route.java (59%)
copy integration-tests/{netty => knative-endpoint-consumer/src}/src/main/resources/application.properties (76%)
copy extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpRequest.java => integration-tests/knative-endpoint-consumer/src/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeEndpointConsumerIT.java (58%)
create mode 100644 integration-tests/knative-endpoint-consumer/src/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeEndpointConsumerTest.java
create mode 100644 integration-tests/knative-event-consumer/Readme.adoc
copy integration-tests/{netty => knative-event-consumer}/pom.xml (75%)
copy extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpRequest.java => integration-tests/knative-event-consumer/src/src/main/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerResource.java (59%)
copy extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpRequest.java => integration-tests/knative-event-consumer/src/src/main/java/org/apache/camel/quarkus/component/knative/consumer/it/Route.java (58%)
copy integration-tests/{netty => knative-event-consumer/src}/src/main/resources/application.properties (81%)
copy extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpRequest.java => integration-tests/knative-event-consumer/src/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeEventConsumerIT.java (58%)
create mode 100644 integration-tests/knative-event-consumer/src/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeEventConsumerTest.java
create mode 100644 integration-tests/knative-producer/Readme.adoc
copy integration-tests/{netty => knative-producer}/pom.xml (73%)
create mode 100644 integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeProducerResource.java
create mode 100644 integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/Routes.java
create mode 100644 integration-tests/knative-producer/src/main/resources/application.properties
copy extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpRequest.java => integration-tests/knative-producer/src/test/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeProducerIT.java (58%)
create mode 100644 integration-tests/knative-producer/src/test/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeProducerTest.java
create mode 100644 integration-tests/knative-producer/src/test/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeTestResource.java
create mode 100644 integration-tests/knative-producer/src/test/resources/mappings/sendToBroker.json
create mode 100644 integration-tests/knative-producer/src/test/resources/mappings/sendToChannel.json
create mode 100644 integration-tests/knative-producer/src/test/resources/mappings/sendToService.json
copy integration-tests/{netty => knative}/pom.xml (61%)
create mode 100644 integration-tests/knative/src/main/java/org/apache/camel/quarkus/component/knative/it/KnativeResource.java
rename extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpRequest.java => integration-tests/knative/src/test/java/org/apache/camel/quarkus/component/knative/it/KnativeIT.java (58%)
create mode 100644 integration-tests/knative/src/test/java/org/apache/camel/quarkus/component/knative/it/KnativeTest.java
create mode 100644 integration-tests/netty/src/main/resources/ssl/fips-keystore.bcfks
create mode 100644 integration-tests/netty/src/main/resources/ssl/fips-truststore.bcfks
[camel-quarkus] 01/02: Upgrade Quarkus to 2.14.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 02c43eb353d14efb95583b718fe784f2306a7bd0
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Sep 15 13:34:36 2022 +0100
Upgrade Quarkus to 2.14.0.CR1
---
docs/antora.yml | 2 +-
.../quarkus/core/deployment/ConsumeProcessor.java | 2 +-
.../core/deployment/InjectionPointsProcessor.java | 2 +-
.../component/grpc/deployment/GrpcProcessor.java | 11 +++--
integration-tests/kubernetes/pom.xml | 55 +++++++++++-----------
integration-tests/master-openshift/pom.xml | 3 --
pom.xml | 13 ++++-
7 files changed, 48 insertions(+), 40 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 4306f51936..66590918f5 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,7 +30,7 @@ asciidoc:
# Project versions
camel-version: 3.18.2 # replace ${camel.version}
camel-docs-version: 3.18.x # replace ${camel.docs.components.version}
- quarkus-version: 2.13.1.Final # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 22.2.0 # replace ${graalvm.version}
graalvm-docs-version: 22.2
min-maven-version: 3.8.2 # replace ${min-maven-version}
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ConsumeProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ConsumeProcessor.java
index caa397c872..13f14d584c 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ConsumeProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ConsumeProcessor.java
@@ -101,7 +101,7 @@ public class ConsumeProcessor {
/* If there is @Consume on a method, make the declaring class a named injectable bean */
String beanName = namedValue(classInfo);
final Transformation transform = ctx.transform();
- if (!classInfo.annotations().keySet().stream().anyMatch(BEAN_DEFINING_ANNOTATIONS::contains)) {
+ if (!classInfo.annotationsMap().keySet().stream().anyMatch(BEAN_DEFINING_ANNOTATIONS::contains)) {
/* Only add @Singleton if there is no other bean defining annotation yet */
transform.add(Singleton.class);
}
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/InjectionPointsProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/InjectionPointsProcessor.java
index e37c6a9399..5e4b471dd1 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/InjectionPointsProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/InjectionPointsProcessor.java
@@ -124,7 +124,7 @@ public class InjectionPointsProcessor {
if (injectionPoint.getTarget().kind() == AnnotationTarget.Kind.METHOD) {
final MethodInfo target = injectionPoint.getTarget().asMethod();
- final List<Type> types = target.parameters();
+ final List<Type> types = target.parameterTypes();
for (int i = 0; i < types.size(); i++) {
Type type = types.get(0);
diff --git a/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java b/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java
index ec0efa729e..10a0d20e0c 100644
--- a/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java
+++ b/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java
@@ -48,6 +48,7 @@ import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
import org.jboss.jandex.IndexView;
import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.MethodParameterInfo;
import org.jboss.jandex.Type;
class GrpcProcessor {
@@ -157,7 +158,9 @@ class GrpcProcessor {
if (isCandidateServiceMethod(method)) {
String[] params = method.parameters()
.stream()
- .map(type -> type.name().toString())
+ .map(MethodParameterInfo::type)
+ .map(Type::name)
+ .map(DotName::toString)
.toArray(String[]::new);
ClassInfo classInfo = index
@@ -188,11 +191,11 @@ class GrpcProcessor {
}
private boolean isCandidateServiceMethod(MethodInfo method) {
- List<Type> parameters = method.parameters();
+ List<MethodParameterInfo> parameters = method.parameters();
if (parameters.size() == 1) {
- return parameters.get(0).name().toString().equals(StreamObserver.class.getName());
+ return parameters.get(0).type().name().toString().equals(StreamObserver.class.getName());
} else if (parameters.size() == 2) {
- return parameters.get(1).name().toString().equals(StreamObserver.class.getName());
+ return parameters.get(1).type().name().toString().equals(StreamObserver.class.getName());
}
return false;
}
diff --git a/integration-tests/kubernetes/pom.xml b/integration-tests/kubernetes/pom.xml
index ebc7a72b68..42d0a59cc1 100644
--- a/integration-tests/kubernetes/pom.xml
+++ b/integration-tests/kubernetes/pom.xml
@@ -71,34 +71,33 @@
<profiles>
-<!-- Disabled because of https://github.com/apache/camel-quarkus/issues/4095-->
-<!-- <profile>-->
-<!-- <id>native</id>-->
-<!-- <activation>-->
-<!-- <property>-->
-<!-- <name>native</name>-->
-<!-- </property>-->
-<!-- </activation>-->
-<!-- <properties>-->
-<!-- <quarkus.package.type>native</quarkus.package.type>-->
-<!-- </properties>-->
-<!-- <build>-->
-<!-- <plugins>-->
-<!-- <plugin>-->
-<!-- <groupId>org.apache.maven.plugins</groupId>-->
-<!-- <artifactId>maven-failsafe-plugin</artifactId>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <goals>-->
-<!-- <goal>integration-test</goal>-->
-<!-- <goal>verify</goal>-->
-<!-- </goals>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- </plugin>-->
-<!-- </plugins>-->
-<!-- </build>-->
-<!-- </profile>-->
+ <profile>
+ <id>native</id>
+ <activation>
+ <property>
+ <name>native</name>
+ </property>
+ </activation>
+ <properties>
+ <quarkus.package.type>native</quarkus.package.type>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/integration-tests/master-openshift/pom.xml b/integration-tests/master-openshift/pom.xml
index 6c4b36439a..0ba05a8f6c 100644
--- a/integration-tests/master-openshift/pom.xml
+++ b/integration-tests/master-openshift/pom.xml
@@ -145,8 +145,6 @@
</plugins>
</build>
</profile>
-
- <!-- TODO: https://github.com/apache/camel-quarkus/issues/4095
<profile>
<id>native</id>
<activation>
@@ -184,7 +182,6 @@
</plugins>
</build>
</profile>
- -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/pom.xml b/pom.xml
index 4b4fdbf45c..fb89ce7eb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
<quarkiverse-minio.version>2.9.2</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-mybatis.version>1.0.4</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.13.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>3.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>0.38.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -94,12 +94,16 @@
<google-auth-library-credentials.version>1.7.0</google-auth-library-credentials.version><!-- TODO: Revert back to using Camel's version when gRPC versions are in sync -->
<google-oauth-client.version>${google-oauth-client-version}</google-oauth-client.version><!-- TODO: Fix this in Camel https://github.com/apache/camel-quarkus/issues/4139 -->
<graalvm.version>22.2.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
- <grpc.version>1.49.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <grpc.version>1.49.2</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<hapi.version>${hapi-version}</hapi.version>
<hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version>
<hbase.version>${hbase-version}</hbase.version>
<htrace.version>4.2.0-incubating</htrace.version><!-- Mess in hbase transitive deps -->
+<<<<<<< HEAD
<infinispan.version>13.0.11.Final</infinispan.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.infinispan:infinispan-core -->
+=======
+ <infinispan.version>14.0.0.Final</infinispan.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.infinispan:infinispan-core -->
+>>>>>>> 97a80ea020 (Upgrade Quarkus to 2.14.0.CR1)
<influxdb.version>${influx-java-driver-version}</influxdb.version>
<jackson1.version>1.9.13</jackson1.version><!-- Mess in the transitive dependencies of hbase-testing-util -->
<jackson-asl.version>${jackson1.version}</jackson-asl.version><!-- Can be different from jackson1.version on some occasions -->
@@ -127,8 +131,13 @@
<okio.version>${squareup-okio-version}</okio.version>
<opencensus.version>0.31.0</opencensus.version><!-- Mess in Google cloud. Keep in sync with version used in com.google.http-client:google-http-client -->
<perfmark-api.version>0.25.0</perfmark-api.version><!-- @sync io.grpc:grpc-netty-shaded:${grpc.version} dep:io.perfmark:perfmark-api -->
+<<<<<<< HEAD
<protobuf.version>3.19.3</protobuf.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java -->
<reactor-core.version>3.4.22</reactor-core.version><!-- @sync com.azure:azure-core:${azure-core.version} dep:io.projectreactor:reactor-core -->
+=======
+ <protobuf.version>3.19.6</protobuf.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java -->
+ <reactor-core.version>3.4.21</reactor-core.version><!-- @sync com.azure:azure-core:${azure-core.version} dep:io.projectreactor:reactor-core -->
+>>>>>>> 97a80ea020 (Upgrade Quarkus to 2.14.0.CR1)
<reactor-netty.version>${reactor-netty-version}</reactor-netty.version>
<retrofit.version>2.5.0</retrofit.version>
<smallrye.reactive.messaging.camel.version>3.20.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
[camel-quarkus] 02/02: Disable OptaPlanner tests due to #4116
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 2ce32b9297d1810c5ab27fca3f407f4f64729da8
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Sep 21 09:40:20 2022 +0100
Disable OptaPlanner tests due to #4116
---
integration-tests/optaplanner/pom.xml | 18 ++++++++++++++++++
.../component/optaplanner/it/OptaplannerIT.java | 2 ++
.../component/optaplanner/it/OptaplannerTest.java | 2 ++
3 files changed, 22 insertions(+)
diff --git a/integration-tests/optaplanner/pom.xml b/integration-tests/optaplanner/pom.xml
index 2719048892..98d629bdcf 100644
--- a/integration-tests/optaplanner/pom.xml
+++ b/integration-tests/optaplanner/pom.xml
@@ -70,7 +70,24 @@
</dependency>
</dependencies>
+ <!-- TODO: Remove this: https://github.com/apache/camel-quarkus/issues/4116 -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>quarkus-maven-plugin-disabled</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
+ <!-- TODO: https://github.com/apache/camel-quarkus/issues/4116
<profile>
<id>native</id>
<activation>
@@ -98,6 +115,7 @@
</plugins>
</build>
</profile>
+ -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/integration-tests/optaplanner/src/test/java/org/apache/camel/quarkus/component/optaplanner/it/OptaplannerIT.java b/integration-tests/optaplanner/src/test/java/org/apache/camel/quarkus/component/optaplanner/it/OptaplannerIT.java
index ccb592c74e..ea74452cda 100644
--- a/integration-tests/optaplanner/src/test/java/org/apache/camel/quarkus/component/optaplanner/it/OptaplannerIT.java
+++ b/integration-tests/optaplanner/src/test/java/org/apache/camel/quarkus/component/optaplanner/it/OptaplannerIT.java
@@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.optaplanner.it;
import io.quarkus.test.junit.QuarkusIntegrationTest;
+import org.junit.jupiter.api.Disabled;
+@Disabled("https://github.com/apache/camel-quarkus/issues/4116")
@QuarkusIntegrationTest
class OptaplannerIT extends OptaplannerTest {
diff --git a/integration-tests/optaplanner/src/test/java/org/apache/camel/quarkus/component/optaplanner/it/OptaplannerTest.java b/integration-tests/optaplanner/src/test/java/org/apache/camel/quarkus/component/optaplanner/it/OptaplannerTest.java
index 70ca5d0b1d..6e890febf8 100644
--- a/integration-tests/optaplanner/src/test/java/org/apache/camel/quarkus/component/optaplanner/it/OptaplannerTest.java
+++ b/integration-tests/optaplanner/src/test/java/org/apache/camel/quarkus/component/optaplanner/it/OptaplannerTest.java
@@ -21,10 +21,12 @@ import java.util.concurrent.TimeUnit;
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.awaitility.Awaitility.await;
+@Disabled("https://github.com/apache/camel-quarkus/issues/4116")
@QuarkusTest
class OptaplannerTest {