This is an automated email from the ASF dual-hosted git repository.
acosentino 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 d5d9c14c783 Bump jedis and spring data redis version
d5d9c14c783 is described below
commit d5d9c14c783d42e0af018e635ec70b6ac3677794
Author: Croway <[email protected]>
AuthorDate: Wed May 10 20:05:08 2023 +0200
Bump jedis and spring data redis version
Bump jedis and spring data redis version
---
camel-dependencies/pom.xml | 4 +--
components/camel-spring-redis/pom.xml | 9 ++++++
.../redis/integration/RedisConsumerManualIT.java | 35 ++++++++++++++++------
.../redis/integration/RedisProducerManualIT.java | 24 +++++++++++----
parent/pom.xml | 4 +--
5 files changed, 57 insertions(+), 19 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 0b6237b9e1e..d413e906515 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -277,7 +277,7 @@
<jcache-version>1.1.1</jcache-version>
<jcommander-version>1.72</jcommander-version>
<jcr-version>2.0</jcr-version>
- <jedis-client-version>3.7.1</jedis-client-version>
+ <jedis-client-version>4.3.2</jedis-client-version>
<jetcd-grpc-version>1.47.0</jetcd-grpc-version>
<jetcd-guava-version>31.1-jre</jetcd-guava-version>
<jetcd-version>0.7.5</jetcd-version>
@@ -458,7 +458,7 @@
<splunk-version>1.9.0_1</splunk-version>
<spock-version>2.3-groovy-4.0</spock-version>
<spring-batch-version>4.3.8</spring-batch-version>
- <spring-data-redis-version>3.0.4</spring-data-redis-version>
+ <spring-data-redis-version>3.0.5</spring-data-redis-version>
<spring-ldap-version>3.0.2</spring-ldap-version>
<spring-vault-core-version>3.0.2</spring-vault-core-version>
<spring-version>6.0.8</spring-version>
diff --git a/components/camel-spring-redis/pom.xml
b/components/camel-spring-redis/pom.xml
index 62e5d502000..86d075a3fd8 100644
--- a/components/camel-spring-redis/pom.xml
+++ b/components/camel-spring-redis/pom.xml
@@ -69,5 +69,14 @@
<scope>test</scope>
</dependency>
+ <!-- test infra -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-infra-redis</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git
a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisConsumerManualIT.java
b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisConsumerManualIT.java
index e2faad34494..31cec615360 100644
---
a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisConsumerManualIT.java
+++
b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisConsumerManualIT.java
@@ -22,21 +22,35 @@ import org.apache.camel.component.redis.RedisConstants;
import org.apache.camel.component.redis.RedisTestSupport;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.jupiter.api.Disabled;
+import org.apache.camel.test.infra.redis.services.RedisService;
+import org.apache.camel.test.infra.redis.services.RedisServiceFactory;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-@Disabled("Requires manual setup")
public class RedisConsumerManualIT extends RedisTestSupport {
- private static final JedisConnectionFactory CONNECTION_FACTORY = new
JedisConnectionFactory();
+
+ @RegisterExtension
+ static RedisService service = RedisServiceFactory.createService();
+
private static final RedisMessageListenerContainer LISTENER_CONTAINER =
new RedisMessageListenerContainer();
+ private static JedisConnectionFactory jedisConnectionFactory;
- static {
- CONNECTION_FACTORY.afterPropertiesSet();
- LISTENER_CONTAINER.setConnectionFactory(CONNECTION_FACTORY);
+ @BeforeAll
+ public static void beforeAll() {
+ jedisConnectionFactory = new JedisConnectionFactory();
+ jedisConnectionFactory.getStandaloneConfiguration()
+ .setHostName(service.host());
+ jedisConnectionFactory.getStandaloneConfiguration()
+ .setPort(service.port());
+
+ jedisConnectionFactory.afterPropertiesSet();
+ LISTENER_CONTAINER.setConnectionFactory(jedisConnectionFactory);
LISTENER_CONTAINER.afterPropertiesSet();
+ LISTENER_CONTAINER.start();
}
@Override
@@ -44,7 +58,7 @@ public class RedisConsumerManualIT extends RedisTestSupport {
Registry registry = new SimpleRegistry();
redisTemplate = new RedisTemplate<>();
- redisTemplate.setConnectionFactory(CONNECTION_FACTORY);
+ redisTemplate.setConnectionFactory(jedisConnectionFactory);
redisTemplate.afterPropertiesSet();
registry.bind("redisTemplate", redisTemplate);
@@ -56,14 +70,17 @@ public class RedisConsumerManualIT extends RedisTestSupport
{
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-
from("spring-redis://localhost:6379?command=SUBSCRIBE&channels=one,two&listenerContainer=#listenerContainer&redisTemplate=#redisTemplate")
+ String serviceAddress = service.getServiceAddress();
+
+ from("spring-redis://" + serviceAddress
+ +
"?command=SUBSCRIBE&channels=one,two&listenerContainer=#listenerContainer&redisTemplate=#redisTemplate")
.startupOrder(1)
.to("mock:result");
from("direct:start")
.startupOrder(2)
.delay(2000)
-
.to("spring-redis://localhost:6379?redisTemplate=#redisTemplate");
+ .to("spring-redis://" + serviceAddress +
"?redisTemplate=#redisTemplate");
}
};
}
diff --git
a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisProducerManualIT.java
b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisProducerManualIT.java
index a60ab63c729..f66d5c6c392 100644
---
a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisProducerManualIT.java
+++
b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisProducerManualIT.java
@@ -20,26 +20,38 @@ import org.apache.camel.component.redis.RedisConstants;
import org.apache.camel.component.redis.RedisTestSupport;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.jupiter.api.Disabled;
+import org.apache.camel.test.infra.redis.services.RedisService;
+import org.apache.camel.test.infra.redis.services.RedisServiceFactory;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import static org.junit.jupiter.api.Assertions.assertEquals;
-@Disabled
public class RedisProducerManualIT extends RedisTestSupport {
- private static final JedisConnectionFactory CONNECTION_FACTORY = new
JedisConnectionFactory();
- static {
- CONNECTION_FACTORY.afterPropertiesSet();
+ @RegisterExtension
+ static RedisService service = RedisServiceFactory.createService();
+ private static JedisConnectionFactory connectionFactory;
+
+ @BeforeAll
+ public static void beforeAll() {
+ connectionFactory = new JedisConnectionFactory();
+ connectionFactory.getStandaloneConfiguration()
+ .setHostName(service.host());
+ connectionFactory.getStandaloneConfiguration()
+ .setPort(service.port());
+
+ connectionFactory.afterPropertiesSet();
}
@Override
protected Registry createCamelRegistry() throws Exception {
Registry registry = new SimpleRegistry();
redisTemplate = new RedisTemplate<>();
- redisTemplate.setConnectionFactory(CONNECTION_FACTORY);
+ redisTemplate.setConnectionFactory(connectionFactory);
redisTemplate.afterPropertiesSet();
registry.bind("redisTemplate", redisTemplate);
diff --git a/parent/pom.xml b/parent/pom.xml
index b26408122ce..5a304c47dab 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -272,7 +272,7 @@
<jcache-version>1.1.1</jcache-version>
<jcommander-version>1.72</jcommander-version>
<jcr-version>2.0</jcr-version>
- <jedis-client-version>3.7.1</jedis-client-version>
+ <jedis-client-version>4.3.2</jedis-client-version>
<jetcd-grpc-version>1.47.0</jetcd-grpc-version>
<jetcd-guava-version>31.1-jre</jetcd-guava-version>
<jetcd-version>0.7.5</jetcd-version>
@@ -453,7 +453,7 @@
<splunk-version>1.9.0_1</splunk-version>
<spock-version>2.3-groovy-4.0</spock-version>
<spring-batch-version>4.3.8</spring-batch-version>
- <spring-data-redis-version>3.0.4</spring-data-redis-version>
+ <spring-data-redis-version>3.0.5</spring-data-redis-version>
<spring-ldap-version>3.0.2</spring-ldap-version>
<spring-vault-core-version>3.0.2</spring-vault-core-version>
<spring-version>6.0.8</spring-version>
