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 403842d59267079c8597f530c7e25a6c8a501b0e
Author: JiriOndrusek <ondrusek.j...@gmail.com>
AuthorDate: Mon Nov 27 13:03:43 2023 +0100
Quick fix of fhir + fixed compilation + generated stuff
---
.../org/apache/camel/quarkus/eip/it/EipRoutes.java | 2 +-
poms/bom/pom.xml | 4 ++++
poms/bom/src/main/generated/flattened-full-pom.xml | 18 +++++++++++-------
poms/bom/src/main/generated/flattened-reduced-pom.xml | 16 ++++++++++------
.../main/generated/flattened-reduced-verbose-pom.xml | 16 ++++++++++------
5 files changed, 36 insertions(+), 20 deletions(-)
diff --git
a/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java
b/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java
index 769ad27d18..f34207c615 100644
---
a/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java
+++
b/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java
@@ -124,7 +124,7 @@ public class EipRoutes extends RouteBuilder {
.setBody(e -> "Hello from thread " +
Thread.currentThread().getName());
from("direct:throttle")
-
.throttle(THROTTLE_MAXIMUM_REQUEST_COUNT).timePeriodMillis(THROTTLE_PERIOD).rejectExecution(true)
+
.throttle(THROTTLE_MAXIMUM_REQUEST_COUNT).rejectExecution(true).delay(THROTTLE_PERIOD)
.to("mock:throttle");
from("direct:tryCatchFinally")
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 79253f0c01..f518d87347 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6036,6 +6036,10 @@
<artifactId>junit</artifactId>
<groupId>junit</groupId>
</exclusion>
+ <exclusion>
+ <groupId>org.ogce</groupId>
+ <artifactId>xpp3</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 4912a8fe2f..78d9678b4f 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -5960,6 +5960,10 @@
<groupId>junit</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>junit</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
+ <exclusion>
+ <groupId>org.ogce</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>xpp3</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -6687,7 +6691,7 @@
<dependency>
<groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-aop</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.0.14</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.1.1</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} -->
@@ -6702,7 +6706,7 @@
<dependency>
<groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-expression</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.0.14</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.1.1</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} -->
@@ -6713,7 +6717,7 @@
<dependency>
<groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-jdbc</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.0.14</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.1.1</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} -->
@@ -6728,7 +6732,7 @@
<dependency>
<groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-jms</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.0.14</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.1.1</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} -->
@@ -6743,7 +6747,7 @@
<dependency>
<groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-messaging</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.0.14</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.1.1</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} -->
@@ -6758,7 +6762,7 @@
<dependency>
<groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-orm</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.0.14</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.1.1</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} -->
@@ -6773,7 +6777,7 @@
<dependency>
<groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-tx</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.0.14</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.1.1</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} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index baf09769b7..fd0a204321 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -5960,6 +5960,10 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.ogce</groupId>
+ <artifactId>xpp3</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -6607,7 +6611,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>6.0.14</version>
+ <version>6.1.1</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -6622,7 +6626,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>6.0.14</version>
+ <version>6.1.1</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -6633,7 +6637,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>6.0.14</version>
+ <version>6.1.1</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -6648,7 +6652,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
- <version>6.0.14</version>
+ <version>6.1.1</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -6663,7 +6667,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-messaging</artifactId>
- <version>6.0.14</version>
+ <version>6.1.1</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -6678,7 +6682,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>6.0.14</version>
+ <version>6.1.1</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
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 4a67a88c8b..d4e510498e 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -5960,6 +5960,10 @@
<groupId>junit</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>junit</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
+ <exclusion>
+ <groupId>org.ogce</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>xpp3</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -6607,7 +6611,7 @@
<dependency>
<groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-aop</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.0.14</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.1.1</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} -->
@@ -6622,7 +6626,7 @@
<dependency>
<groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-expression</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.0.14</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.1.1</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} -->
@@ -6633,7 +6637,7 @@
<dependency>
<groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-jdbc</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.0.14</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.1.1</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} -->
@@ -6648,7 +6652,7 @@
<dependency>
<groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-jms</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.0.14</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.1.1</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} -->
@@ -6663,7 +6667,7 @@
<dependency>
<groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-messaging</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.0.14</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.1.1</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} -->
@@ -6678,7 +6682,7 @@
<dependency>
<groupId>org.springframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-tx</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.0.14</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.1.1</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} -->
