You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2022/01/07 16:59:12 UTC
[camel-quarkus] 01/02: Upgrade to Camel 3.11.5
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3d1a7066732de8b59a2ff41376da9130b0fa81eb
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Jan 6 16:39:20 2022 +0100
Upgrade to Camel 3.11.5
---
extensions-jvm/corda/runtime/pom.xml | 12 ++++++++++++
extensions/atlasmap/runtime/pom.xml | 9 +++++++++
integration-tests/xchange/pom.xml | 4 ++++
pom.xml | 5 +++--
4 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/extensions-jvm/corda/runtime/pom.xml b/extensions-jvm/corda/runtime/pom.xml
index 6c5e5a9..2fa9c02 100644
--- a/extensions-jvm/corda/runtime/pom.xml
+++ b/extensions-jvm/corda/runtime/pom.xml
@@ -67,6 +67,18 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>co.paralleluniverse</groupId>
+ <artifactId>quasar-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/extensions/atlasmap/runtime/pom.xml b/extensions/atlasmap/runtime/pom.xml
index cb81a0d..00eeca8 100644
--- a/extensions/atlasmap/runtime/pom.xml
+++ b/extensions/atlasmap/runtime/pom.xml
@@ -44,6 +44,11 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>io.atlasmap</groupId>
+ <artifactId>atlas-dfdl-module</artifactId>
+ <version>${atlasmap.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -57,6 +62,10 @@
<artifactId>camel-atlasmap</artifactId>
</dependency>
<dependency>
+ <groupId>io.atlasmap</groupId>
+ <artifactId>atlas-dfdl-module</artifactId>
+ </dependency>
+ <dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jackson</artifactId>
</dependency>
diff --git a/integration-tests/xchange/pom.xml b/integration-tests/xchange/pom.xml
index 0cf694a..7dae6a0 100644
--- a/integration-tests/xchange/pom.xml
+++ b/integration-tests/xchange/pom.xml
@@ -64,6 +64,10 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.knowm.xchange</groupId>
+ <artifactId>xchange-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/pom.xml b/pom.xml
index 261519c..2c98092 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.11.1</version>
+ <version>3.11.5</version>
</parent>
<groupId>org.apache.camel.quarkus</groupId>
@@ -39,7 +39,7 @@
<properties>
<!-- Primary dependencies - maintained manually -->
<camel.major.minor>3.11</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
- <camel.version>${camel.major.minor}.1</camel.version>
+ <camel.version>${camel.major.minor}.5</camel.version>
<camel.docs.components.version>${camel.major.minor}.x</camel.docs.components.version><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.components.xref>${camel.docs.components.version}@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable branch on which our Antora docs depends -->
@@ -60,6 +60,7 @@
<ahc.version>${ahc-version}</ahc.version>
<animal-sniffer.version>1.18</animal-sniffer.version>
<antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others -->
+ <atlasmap.version>${atlasmap-version}</atlasmap.version>
<avro.version>1.10.2</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
<aws-java-sdk.version>1.11.714</aws-java-sdk.version>
<azure-sdk-bom.version>1.0.3</azure-sdk-bom.version><!-- Revert back to ${azure-sdk-bom-version} with Camel 3.11 see https://github.com/apache/camel/pull/5642 -->