You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/01/13 14:03:21 UTC
[camel] branch main updated (f8294bc51b7 -> bce2cf8d7a8)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from f8294bc51b7 (chores) camel-xmlsecurity: fixed checkstyle
new 1922bd2cbc3 camel-infinispan: fixed suppression of exceptions
new bce2cf8d7a8 camel-infinispan: convert to Jakarta / Camel 4
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel-infinispan/camel-infinispan-common/pom.xml | 2 +-
.../camel-infinispan/camel-infinispan-embedded/pom.xml | 10 ++--------
.../InfinispanEmbeddedClusteredTestSupport.java | 17 ++++++++---------
components/camel-infinispan/camel-infinispan/pom.xml | 9 ++++++++-
4 files changed, 19 insertions(+), 19 deletions(-)
[camel] 01/02: camel-infinispan: fixed suppression of exceptions
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1922bd2cbc39080f6ef73953a16126046d280b80
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jan 13 10:28:27 2023 +0100
camel-infinispan: fixed suppression of exceptions
This prevents hiding more details about errors during tests
---
.../InfinispanEmbeddedClusteredTestSupport.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredTestSupport.java b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredTestSupport.java
index cfedb84841d..cfeee757455 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredTestSupport.java
+++ b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredTestSupport.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.infinispan.embedded;
import java.util.List;
+import java.util.Objects;
import org.apache.camel.BindToRegistry;
import org.apache.camel.spi.ComponentCustomizer;
@@ -67,12 +68,8 @@ public class InfinispanEmbeddedClusteredTestSupport extends CamelTestSupport {
@Override
public void setupResources() throws Exception {
ClusteredCacheSupport cluster = new ClusteredCacheSupport(CacheMode.DIST_SYNC, 2);
- try {
- cluster.createCacheManagers();
- clusteredCacheContainers = cluster.getCacheManagers();
- } catch (Throwable ex) {
- throw new Exception(ex);
- }
+ cluster.createCacheManagers();
+ clusteredCacheContainers = Objects.requireNonNull(cluster.getCacheManagers());
super.setupResources();
}
@@ -81,9 +78,11 @@ public class InfinispanEmbeddedClusteredTestSupport extends CamelTestSupport {
public void cleanupResources() throws Exception {
super.cleanupResources();
- // Has to be done later, maybe CamelTestSupport should
- for (BasicCacheContainer container : clusteredCacheContainers) {
- container.stop();
+ if (clusteredCacheContainers != null) {
+ // Has to be done later, maybe CamelTestSupport should
+ for (BasicCacheContainer container : clusteredCacheContainers) {
+ container.stop();
+ }
}
}
[camel] 02/02: camel-infinispan: convert to Jakarta / Camel 4
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bce2cf8d7a8e475baccceb76d79018baf7ede87b
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jan 13 11:48:17 2023 +0100
camel-infinispan: convert to Jakarta / Camel 4
---
components/camel-infinispan/camel-infinispan-common/pom.xml | 2 +-
components/camel-infinispan/camel-infinispan-embedded/pom.xml | 10 ++--------
components/camel-infinispan/camel-infinispan/pom.xml | 9 ++++++++-
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/components/camel-infinispan/camel-infinispan-common/pom.xml b/components/camel-infinispan/camel-infinispan-common/pom.xml
index 2b7f7ac70c8..4a8768c813a 100644
--- a/components/camel-infinispan/camel-infinispan-common/pom.xml
+++ b/components/camel-infinispan/camel-infinispan-common/pom.xml
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-commons</artifactId>
+ <artifactId>infinispan-commons-jakarta</artifactId>
<version>${infinispan-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-infinispan/camel-infinispan-embedded/pom.xml b/components/camel-infinispan/camel-infinispan-embedded/pom.xml
index 24bfc70cb02..9e22f325045 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/pom.xml
+++ b/components/camel-infinispan/camel-infinispan-embedded/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
+ <artifactId>infinispan-core-jakarta</artifactId>
<version>${infinispan-version}</version>
<exclusions>
<exclusion>
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-query</artifactId>
+ <artifactId>infinispan-query-jakarta</artifactId>
<version>${infinispan-version}</version>
</dependency>
<dependency>
@@ -98,12 +98,6 @@
<version>${infinispan-version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-spring5-embedded</artifactId>
- <version>${infinispan-version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.infinispan.protostream</groupId>
<artifactId>sample-domain-implementation</artifactId>
diff --git a/components/camel-infinispan/camel-infinispan/pom.xml b/components/camel-infinispan/camel-infinispan/pom.xml
index 2c0f2b8e7dd..9653807071f 100644
--- a/components/camel-infinispan/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/camel-infinispan/pom.xml
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-client-hotrod</artifactId>
+ <artifactId>infinispan-client-hotrod-jakarta</artifactId>
<version>${infinispan-version}</version>
</dependency>
<dependency>
@@ -82,6 +82,13 @@
</dependency>
<!-- testing - infinispan -->
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-core-jakarta</artifactId>
+ <version>${infinispan-version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>