You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ji...@apache.org on 2023/06/23 07:39:49 UTC
[camel-quarkus] 01/01: Merge branch 'main' of github.com:apache/camel-quarkus into camel-main
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 7454e040db1f5a084ea58a36011f455f45a6048d
Merge: ae2f0f5c67 4e7d3f5898
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Fri Jun 23 09:28:51 2023 +0200
Merge branch 'main' of github.com:apache/camel-quarkus into camel-main
.github/workflows/assign-issue-milestone.yaml | 5 +-
.../workflows/assign-wontfix-issue-milestone.yaml | 2 +
.github/workflows/label-issue.yaml | 1 +
CHANGELOG.md | 9 +++
docs/antora.yml | 4 +-
extensions-jvm/drill/deployment/pom.xml | 4 ++
extensions-jvm/drill/runtime/pom.xml | 4 ++
extensions/jira/deployment/pom.xml | 4 --
.../component/jira/deployment/JiraProcessor.java | 43 +++++++++++-
extensions/jira/runtime/pom.xml | 4 --
.../jta/MockTransactionManagerProducer.java | 2 +-
.../component/kudu/deployment/KuduProcessor.java | 26 ++++++--
.../component/ldap/deployment/LdapProcessor.java | 7 +-
integration-tests/cxf-soap-grouped/pom.xml | 2 +
integration-tests/fop/pom.xml | 2 -
integration-tests/google-bigquery/pom.xml | 2 +
integration-tests/google-pubsub/pom.xml | 2 +
integration-tests/kubernetes/pom.xml | 58 ++++++++--------
integration-tests/master-openshift/pom.xml | 78 +++++++++++-----------
pom.xml | 16 ++---
poms/bom/pom.xml | 4 ++
poms/bom/src/main/generated/flattened-full-pom.xml | 22 +++---
.../src/main/generated/flattened-reduced-pom.xml | 22 +++---
.../generated/flattened-reduced-verbose-pom.xml | 22 +++---
24 files changed, 218 insertions(+), 127 deletions(-)
diff --cc docs/antora.yml
index 3a5a76a1bf,bd94cfd27a..7d7927136b
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@@ -28,9 -28,9 +28,9 @@@ asciidoc
requires: "'util=camel-website-util,quarkus=xref:js/quarkus.js'"
# Project versions
- camel-version: 4.0.0-M3 # replace ${camel.version}
+ camel-version: 4.0.0-SNAPSHOT # replace ${camel.version}
camel-docs-version: ""
- quarkus-version: 3.1.0.Final # replace ${quarkus.version}
+ quarkus-version: 3.2.0.CR1 # replace ${quarkus.version}
graalvm-version: 22.3.2 # replace ${graalvm.version}
graalvm-docs-version: 22.3
min-maven-version: 3.8.2 # replace ${min-maven-version}
diff --cc pom.xml
index 7462f743f9,03c0237e9d..20a8e2f911
--- a/pom.xml
+++ b/pom.xml
@@@ -77,11 -77,11 +77,11 @@@
<assertj.version>3.24.2</assertj.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version -->
<aws-java-sdk.version>1.11.714</aws-java-sdk.version>
<azure-sdk-bom.version>${azure-sdk-bom-version}</azure-sdk-bom.version>
- <azure-core.version>1.37.0</azure-core.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-core -->
- <azure-identity.version>1.8.1</azure-identity.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-identity -->
+ <azure-core.version>1.39.0</azure-core.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-core -->
+ <azure-identity.version>1.9.0</azure-identity.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-identity -->
<azure-core-http-vertx.version>1.0.0-beta.3</azure-core-http-vertx.version> <!-- TODO: https://github.com/apache/camel-quarkus/issues/4181 -->
<cassandra-driver-test.version>3.7.1</cassandra-driver-test.version><!-- Keep in sync with testcontainers instead of Debezium bom -->
- <bouncycastle.version>1.73</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on -->
+ <bouncycastle.version>1.74</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on -->
<brotli.version>0.1.2</brotli.version><!-- @sync org.apache.httpcomponents.client5:httpclient5-parent:${httpclient5.version} prop:brotli.version -->
<caffeine.version>3.1.5</caffeine.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.github.ben-manes.caffeine:caffeine -->
<commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version>
diff --cc poms/bom/src/main/generated/flattened-full-pom.xml
index 11002f7c8b,fa7f55007b..e9cfbb0759
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@@ -1767,8 -1761,12 +1767,12 @@@
<dependency>
<groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-microprofile-health</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>4.0.0-M3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.0.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
+ <exclusion>
+ <groupId>org.eclipse.parsson</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
<exclusion>
<groupId>org.glassfish</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jakarta.json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@@ -6282,28 -6224,8 +6286,28 @@@
<dependency>
<groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>4.5.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>io.swagger.core.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>swagger-models</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.2.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
+ <dependency>
+ <groupId>io.swagger.parser.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>swagger-parser</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.1.14</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jsr305</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>checker-qual</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>jakarta.jms</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jakarta.jms-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --cc poms/bom/src/main/generated/flattened-reduced-pom.xml
index 5d13f9e81a,4b64ea299f..26cb30e39b
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@@ -1767,8 -1761,12 +1767,12 @@@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-microprofile-health</artifactId>
- <version>4.0.0-M3</version>
+ <version>4.0.0-SNAPSHOT</version>
<exclusions>
+ <exclusion>
+ <groupId>org.eclipse.parsson</groupId>
+ <artifactId>jakarta.json</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
@@@ -6282,28 -6224,8 +6286,28 @@@
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-reactive-messaging-camel</artifactId>
- <version>4.5.0</version>
+ <version>4.6.0</version>
</dependency>
+ <dependency>
+ <groupId>io.swagger.core.v3</groupId>
+ <artifactId>swagger-models</artifactId>
+ <version>2.2.10</version>
+ </dependency>
+ <dependency>
+ <groupId>io.swagger.parser.v3</groupId>
+ <artifactId>swagger-parser</artifactId>
+ <version>2.1.14</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
diff --cc poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index e63e4ffa6f,90bf85476d..840453fbf1
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@@ -1767,8 -1761,12 +1767,12 @@@
<dependency>
<groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-microprofile-health</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>4.0.0-M3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.0.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
+ <exclusion>
+ <groupId>org.eclipse.parsson</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
<exclusion>
<groupId>org.glassfish</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jakarta.json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@@ -6282,28 -6224,8 +6286,28 @@@
<dependency>
<groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>4.5.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>io.swagger.core.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>swagger-models</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.2.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
+ <dependency>
+ <groupId>io.swagger.parser.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>swagger-parser</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.1.14</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jsr305</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>checker-qual</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>jakarta.jms</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jakarta.jms-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->