This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 92d3532f45c72ea463b659ddeee165bc5dbd5ee8
Author: JiriOndrusek <ondrusek.j...@gmail.com>
AuthorDate: Thu Aug 29 09:11:34 2024 +0200
rabased, generated, fixed twilio
---
.../component/twilio/it/TwilioResource.java | 3 +-
pom.xml | 8 ++--
poms/bom/src/main/generated/flattened-full-pom.xml | 55 +++++++++-------------
.../src/main/generated/flattened-reduced-pom.xml | 39 ++++++++-------
.../generated/flattened-reduced-verbose-pom.xml | 39 ++++++++-------
5 files changed, 71 insertions(+), 73 deletions(-)
diff --git
a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java
b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java
index 4b38c2db23..f58f6732e0 100644
---
a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java
+++
b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java
@@ -22,7 +22,6 @@ import java.util.Optional;
import com.twilio.constant.EnumConstants;
import com.twilio.http.HttpClient;
-import com.twilio.http.IRequest;
import com.twilio.http.NetworkHttpClient;
import com.twilio.http.Request;
import com.twilio.http.TwilioRestClient;
@@ -83,7 +82,7 @@ public class TwilioResource {
HttpClient client = new NetworkHttpClient() {
@Override
- public <T extends IRequest> com.twilio.http.Response
makeRequest(T r) {
+ public com.twilio.http.Response makeRequest(Request r) {
Request originalRequest = (Request) r;
String url = originalRequest.getUrl();
diff --git a/pom.xml b/pom.xml
index 468ed1ff54..476f53dd1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,11 +98,11 @@
<freemarker.version>2.3.33</freemarker.version><!-- @sync
io.quarkiverse.freemarker:quarkus-freemarker-parent:${quarkiverse-freemarker.version}
prop:freemarker.version -->
<geny.version>0.6.2</geny.version>
<github-api.version>1.313</github-api.version><!-- Used in a Groovy
script bellow -->
- <google-auth-library.version>1.24.0</google-auth-library.version><!--
@sync com.google.cloud:google-cloud-pubsub:${google-cloud-pubsub.version}
dep:com.google.auth:google-auth-library-oauth2-http -->
+ <google-auth-library.version>1.24.1</google-auth-library.version><!--
@sync com.google.cloud:google-cloud-pubsub:${google-cloud-pubsub.version}
dep:com.google.auth:google-auth-library-oauth2-http -->
<google-oauth-client.version>${google-oauth-client-version}</google-oauth-client.version>
- <google-cloud-bom.version>0.225.0</google-cloud-bom.version><!-- @sync
com.google.cloud:libraries-bom:${google-cloud-bom-version}
dep:com.google.cloud:google-cloud-bom -->
-
<google-cloud-pubsub-bom.version>1.132.0</google-cloud-pubsub-bom.version><!--
@sync com.google.cloud:google-cloud-bom:${google-cloud-bom.version}
dep:com.google.cloud:google-cloud-pubsub-bom -->
- <google-cloud-pubsub.version>1.132.0</google-cloud-pubsub.version><!--
@sync
com.google.cloud:google-cloud-pubsub-bom:${google-cloud-pubsub-bom.version}
dep:com.google.cloud:google-cloud-pubsub -->
+ <google-cloud-bom.version>0.226.0</google-cloud-bom.version><!-- @sync
com.google.cloud:libraries-bom:${google-cloud-bom-version}
dep:com.google.cloud:google-cloud-bom -->
+
<google-cloud-pubsub-bom.version>1.132.1</google-cloud-pubsub-bom.version><!--
@sync com.google.cloud:google-cloud-bom:${google-cloud-bom.version}
dep:com.google.cloud:google-cloud-pubsub-bom -->
+ <google-cloud-pubsub.version>1.132.1</google-cloud-pubsub.version><!--
@sync
com.google.cloud:google-cloud-pubsub-bom:${google-cloud-pubsub-bom.version}
dep:com.google.cloud:google-cloud-pubsub -->
<graalvm.version>23.1.2</graalvm.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
<graalvm-docs.version>jdk21</graalvm-docs.version><!-- @sync
io.quarkus:quarkus-documentation:${quarkus.version}
prop:graal-community.tag-for-documentation -->
<groovy.version>4.0.21</groovy.version><!-- @sync
io.quarkiverse.groovy:quarkus-groovy-parent:${quarkiverse-groovy.version}
prop:groovy.version -->
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 1158c94bdb..b540a1cf9e 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -1343,10 +1343,6 @@
<groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-core</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
- <exclusion>
- <groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>spring-web</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -3394,16 +3390,6 @@
<artifactId>camel-quarkus-caffeine-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.15.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>camel-quarkus-camel-k</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.15.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>camel-quarkus-camel-k-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.15.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-cassandraql</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6494,12 +6480,12 @@
<dependency>
<groupId>com.google.auth</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>google-auth-library-credentials</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.24.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.24.1</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>com.google.auth</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>google-auth-library-oauth2-http</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.24.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.24.1</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} -->
@@ -6510,7 +6496,7 @@
<dependency>
<groupId>com.google.cloud</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>google-cloud-pubsub</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.132.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.132.1</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>com.google.android</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7211,22 +7197,6 @@
<artifactId>kotlinx-serialization-core-jvm</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.4.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
- <dependency>
- <groupId>org.jolokia</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>jolokia-agent-jvm</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.0.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <classifier>javaagent</classifier><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <exclusions>
- <exclusion>
- <groupId>org.jolokia</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>jolokia-server-core</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>com.googlecode.json-simple</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>json-simple</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.json</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>json</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7408,6 +7378,25 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>spring-web</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.1.12</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>spring-beans</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>spring-context</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>spring-core</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.springframework.data</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-data-redis</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index fb6b55fbfe..6c2607a1a9 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -1343,10 +1343,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -3394,16 +3390,6 @@
<artifactId>camel-quarkus-caffeine-deployment</artifactId>
<version>3.15.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-camel-k</artifactId>
- <version>3.15.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-camel-k-deployment</artifactId>
- <version>3.15.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-cassandraql</artifactId>
@@ -6494,12 +6480,12 @@
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-credentials</artifactId>
- <version>1.24.0</version>
+ <version>1.24.1</version>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
- <version>1.24.0</version>
+ <version>1.24.1</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
@@ -6510,7 +6496,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub</artifactId>
- <version>1.132.0</version>
+ <version>1.132.1</version>
<exclusions>
<exclusion>
<groupId>com.google.android</groupId>
@@ -7312,6 +7298,25 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>6.1.12</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index faa07f8617..032d9cfe49 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -1343,10 +1343,6 @@
<groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-core</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
- <exclusion>
- <groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>spring-web</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -3394,16 +3390,6 @@
<artifactId>camel-quarkus-caffeine-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.15.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>camel-quarkus-camel-k</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.15.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>camel-quarkus-camel-k-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.15.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-cassandraql</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6494,12 +6480,12 @@
<dependency>
<groupId>com.google.auth</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>google-auth-library-credentials</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.24.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.24.1</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>com.google.auth</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>google-auth-library-oauth2-http</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.24.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.24.1</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} -->
@@ -6510,7 +6496,7 @@
<dependency>
<groupId>com.google.cloud</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>google-cloud-pubsub</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.132.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.132.1</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>com.google.android</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7312,6 +7298,25 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>spring-web</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.1.12</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>spring-beans</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>spring-context</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>spring-core</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.springframework.data</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-data-redis</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
