You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2021/09/20 06:39:49 UTC
[camel-quarkus] branch quarkus-main updated (0edebad -> 66185e1)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard 0edebad Temporarily add netty-tcnative-boringssl-static to the BOM to work around netty-bom issues
discard 51d2e6d Work around cassandraql depending on Quarkus Vert.x extensions that no longer exist
discard d2c72c5 Upgrade Quarkus to 2.3.0.CR1
add 1343047 Test platform-http with SSL enabled
add 1137e00 Salesforce: Enable Platform Event custom fields in native mode Fixes #3067
add f4f992f Update Salesforce testCDCAndStreamingEvents test to wait for consuming the right Document Fixes #3103
add 6290af8 Fixup 0be98ea Use test grouping for MongoDB extensions #3089
new 159aafa Upgrade Quarkus to 2.3.0.CR1
new 6ae2f7d Work around cassandraql depending on Quarkus Vert.x extensions that no longer exist
new 66185e1 Temporarily add netty-tcnative-boringssl-static to the BOM to work around netty-bom issues
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 (0edebad)
\
N -- N -- N refs/heads/quarkus-main (66185e1)
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 3 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:
.../salesforce/deployment/SalesforceProcessor.java | 3 ++
integration-test-groups/pom.xml | 1 +
integration-tests/platform-http/README.adoc | 15 ++++++++
.../platform/http/it/PlatformHttpRouteBuilder.java | 2 +-
.../src/main/resources/application.properties | 7 +++-
.../src/main/resources/server-cert.pem | 17 +++++++++
.../src/main/resources/server-key.pem | 28 ++++++++++++++
.../component/http/server/it/PlatformHttpTest.java | 7 ++++
.../src/test/resources/truststore.p12 | Bin 0 -> 2285 bytes
integration-tests/salesforce/README.adoc | 2 +-
.../component/salesforce/SalesforceRoutes.java | 2 +-
.../salesforce/SalesforceIntegrationTest.java | 42 ++++++++++++---------
poms/build-parent-it/pom.xml | 4 ++
13 files changed, 108 insertions(+), 22 deletions(-)
create mode 100644 integration-tests/platform-http/README.adoc
create mode 100644 integration-tests/platform-http/src/main/resources/server-cert.pem
create mode 100644 integration-tests/platform-http/src/main/resources/server-key.pem
create mode 100644 integration-tests/platform-http/src/test/resources/truststore.p12
[camel-quarkus] 01/03: Upgrade Quarkus to 2.3.0.CR1
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 159aafaabe77754b4f71293b25199356192efa2a
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Aug 19 09:56:45 2021 +0100
Upgrade Quarkus to 2.3.0.CR1
---
docs/antora.yml | 2 +-
extensions/platform-http/deployment/pom.xml | 2 +-
extensions/platform-http/runtime/pom.xml | 2 +-
extensions/vertx-websocket/deployment/pom.xml | 2 +-
extensions/vertx-websocket/runtime/pom.xml | 2 +-
integration-tests/main-command-mode/pom.xml | 2 +-
integration-tests/main-unknown-args-fail/pom.xml | 2 +-
integration-tests/main-unknown-args-ignore/pom.xml | 2 +-
pom.xml | 6 +++---
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 404a84b..67cdace 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -25,4 +25,4 @@ asciidoc:
cq-camel-components: 3.11.x@components # replace ${camel.docs.components.xref}
min-maven-version: 3.6.2 # replace ${min-maven-version}
target-maven-version: 3.8.1 # replace ${target-maven-version}
- quarkus-version: 2.2.2.Final # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
diff --git a/extensions/platform-http/deployment/pom.xml b/extensions/platform-http/deployment/pom.xml
index b8de420..10165a6 100644
--- a/extensions/platform-http/deployment/pom.xml
+++ b/extensions/platform-http/deployment/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-vertx-web-deployment</artifactId>
+ <artifactId>quarkus-vertx-http-deployment</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/platform-http/runtime/pom.xml b/extensions/platform-http/runtime/pom.xml
index 6b87554..925af4f 100644
--- a/extensions/platform-http/runtime/pom.xml
+++ b/extensions/platform-http/runtime/pom.xml
@@ -62,7 +62,7 @@
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-vertx-web</artifactId>
+ <artifactId>quarkus-vertx-http</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/vertx-websocket/deployment/pom.xml b/extensions/vertx-websocket/deployment/pom.xml
index 76b73c4..87899fd 100644
--- a/extensions/vertx-websocket/deployment/pom.xml
+++ b/extensions/vertx-websocket/deployment/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-vertx-web-deployment</artifactId>
+ <artifactId>quarkus-vertx-http-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/vertx-websocket/runtime/pom.xml b/extensions/vertx-websocket/runtime/pom.xml
index e22ee47..59fc252 100644
--- a/extensions/vertx-websocket/runtime/pom.xml
+++ b/extensions/vertx-websocket/runtime/pom.xml
@@ -50,7 +50,7 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-vertx-web</artifactId>
+ <artifactId>quarkus-vertx-http</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/integration-tests/main-command-mode/pom.xml b/integration-tests/main-command-mode/pom.xml
index 3bccf69..a2247a1 100644
--- a/integration-tests/main-command-mode/pom.xml
+++ b/integration-tests/main-command-mode/pom.xml
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-vertx-web</artifactId>
+ <artifactId>quarkus-vertx-http</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/integration-tests/main-unknown-args-fail/pom.xml b/integration-tests/main-unknown-args-fail/pom.xml
index fb8b4aa..f44d0f8 100644
--- a/integration-tests/main-unknown-args-fail/pom.xml
+++ b/integration-tests/main-unknown-args-fail/pom.xml
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-vertx-web</artifactId>
+ <artifactId>quarkus-vertx-http</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/integration-tests/main-unknown-args-ignore/pom.xml b/integration-tests/main-unknown-args-ignore/pom.xml
index 9fc4250..dc1b238 100644
--- a/integration-tests/main-unknown-args-ignore/pom.xml
+++ b/integration-tests/main-unknown-args-ignore/pom.xml
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-vertx-web</artifactId>
+ <artifactId>quarkus-vertx-http</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/pom.xml b/pom.xml
index 7c1ae32..5b4af4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,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.0.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
- <quarkus.version>2.2.2.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-google-cloud.version>0.10.0</quarkus-google-cloud.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/googlecloudservices/quarkus-google-cloud-services-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.27.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -76,7 +76,7 @@
<github-api.version>1.111</github-api.version><!-- Used in a Groovy script bellow -->
<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.38.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <grpc.version>1.40.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<gson.version>2.8.6</gson.version><!-- @sync com.ibm.jsonata4java:JSONata4Java:${jsonata4java-version} dep:com.google.code.gson:gson -->
<hadoop2.version>${hadoop2-version}</hadoop2.version><!-- Spark -->
<hapi.version>${hapi-version}</hapi.version>
@@ -98,7 +98,7 @@
<json-smart.version>2.4.7</json-smart.version>
<kafka.version>2.8.0</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<kudu.version>${kudu-version}</kudu.version>
- <kotlin.version>1.5.21</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
+ <kotlin.version>1.5.30</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
<netty3.version>${netty3-version}</netty3.version><!-- Spark -->
<minio.version>${minio-version}</minio.version><!-- Keep in sync with quarkiverse-minio and Camel, preferring Camel assuming that it is more likely to be up to date -->
<mvel2.version>${mvel-version}</mvel2.version>
[camel-quarkus] 03/03: Temporarily add
netty-tcnative-boringssl-static to the BOM to work around netty-bom issues
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 66185e1d1e6436674a33ce6e5df46f5f5c009c68
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Sep 17 15:47:34 2021 +0100
Temporarily add netty-tcnative-boringssl-static to the BOM to work around netty-bom issues
---
pom.xml | 2 ++
poms/bom/pom.xml | 6 ++++++
2 files changed, 8 insertions(+)
diff --git a/pom.xml b/pom.xml
index 5b4af4f..3da981d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,6 +113,8 @@
<spring.version>${spring5-version}</spring.version>
<snakeyaml.version>${snakeyaml-version}</snakeyaml.version>
<snappy.version>1.1.7.7</snappy.version><!-- Spark -->
+ <!-- TODO: Remove this when netty-bom issues are resolved https://github.com/apache/camel-quarkus/issues/3115 -->
+ <tcnative.version>2.0.43.Final</tcnative.version>
<threetenbp.version>1.4.0</threetenbp.version>
<xalan.version>${xalan-version}</xalan.version>
<xchange.version>${xchange-version}</xchange.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index ce3198b..d5d41b3 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5859,6 +5859,12 @@
<artifactId>minio</artifactId>
<version>${minio.version}</version>
</dependency>
+ <!-- TODO: Remove this when netty-bom issues are resolved https://github.com/apache/camel-quarkus/issues/3115 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-tcnative-boringssl-static</artifactId>
+ <version>${tcnative.version}</version>
+ </dependency>
<dependency>
<groupId>io.quarkiverse.freemarker</groupId>
<artifactId>quarkus-freemarker</artifactId>
[camel-quarkus] 02/03: Work around cassandraql depending on Quarkus
Vert.x extensions that no longer exist
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 6ae2f7d46a27d5130afdb40972fc99316d09d8fa
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Sep 14 15:48:37 2021 +0100
Work around cassandraql depending on Quarkus Vert.x extensions that no longer exist
---
extensions/cassandraql/deployment/pom.xml | 10 ++++++++++
extensions/cassandraql/runtime/pom.xml | 10 ++++++++++
2 files changed, 20 insertions(+)
diff --git a/extensions/cassandraql/deployment/pom.xml b/extensions/cassandraql/deployment/pom.xml
index 9de768a..b20ef80 100644
--- a/extensions/cassandraql/deployment/pom.xml
+++ b/extensions/cassandraql/deployment/pom.xml
@@ -31,6 +31,10 @@
<dependencies>
<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-vertx-deployment</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core-deployment</artifactId>
</dependency>
@@ -41,6 +45,12 @@
<dependency>
<groupId>com.datastax.oss.quarkus</groupId>
<artifactId>cassandra-quarkus-client-deployment</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-vertx-core-deployment</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/extensions/cassandraql/runtime/pom.xml b/extensions/cassandraql/runtime/pom.xml
index 1a7817d..9554ae0 100644
--- a/extensions/cassandraql/runtime/pom.xml
+++ b/extensions/cassandraql/runtime/pom.xml
@@ -49,6 +49,10 @@
<dependencies>
<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-vertx</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core</artifactId>
</dependency>
@@ -59,6 +63,12 @@
<dependency>
<groupId>com.datastax.oss.quarkus</groupId>
<artifactId>cassandra-quarkus-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-vertx-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.datastax.oss</groupId>