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 2023/06/13 08:35:10 UTC
[camel] branch main updated: CAMEL-19440 - Manage caffeine to build and test with a single deterministic version
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 3a262f066f3 CAMEL-19440 - Manage caffeine to build and test with a single deterministic version
3a262f066f3 is described below
commit 3a262f066f3afea987ff757930d4d0c253ae7858
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Mon Jun 12 23:12:56 2023 +0200
CAMEL-19440 - Manage caffeine to build and test with a single
deterministic version
---
components/camel-caffeine/pom.xml | 1 -
.../camel-infinispan/camel-infinispan-embedded/pom.xml | 12 ------------
parent/pom.xml | 5 +++++
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/components/camel-caffeine/pom.xml b/components/camel-caffeine/pom.xml
index cae51b95c23..1462799ecfe 100644
--- a/components/camel-caffeine/pom.xml
+++ b/components/camel-caffeine/pom.xml
@@ -43,7 +43,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>${caffeine-version}</version>
</dependency>
<!-- testing -->
diff --git a/components/camel-infinispan/camel-infinispan-embedded/pom.xml b/components/camel-infinispan/camel-infinispan-embedded/pom.xml
index 71ab27fbb77..fa4fbd6691b 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/pom.xml
+++ b/components/camel-infinispan/camel-infinispan-embedded/pom.xml
@@ -33,12 +33,6 @@
<description>Camel Infinispan Embedded support</description>
<dependencies>
- <!-- infinispan embedded uses caffeine 2.x -->
- <dependency>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>caffeine</artifactId>
- <version>2.9.3</version>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-infinispan-common</artifactId>
@@ -47,12 +41,6 @@
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core-jakarta</artifactId>
<version>${infinispan-version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>caffeine</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 43de9a23c9b..9dde8400ce1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2713,6 +2713,11 @@
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>com.github.ben-manes.caffeine</groupId>
+ <artifactId>caffeine</artifactId>
+ <version>${caffeine-version}</version>
+ </dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>