summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Cogoluègnes <acogoluegnes@gmail.com>2022-08-10 09:56:58 +0200
committerArnaud Cogoluègnes <acogoluegnes@gmail.com>2022-08-10 09:56:58 +0200
commitfa528115b16612626f14651d21de2b61099cb2d5 (patch)
tree5a7add65a656415affc1cfd832de3fbe2a346d05
parent424e4170ba2508eee5065b1bced81c3d22a200bc (diff)
downloadrabbitmq-server-git-fa528115b16612626f14651d21de2b61099cb2d5.tar.gz
Bump dependencies in stream Java test
-rw-r--r--deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/pom.xml13
-rw-r--r--deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/FailureTest.java6
-rw-r--r--deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/StreamTest.java2
-rw-r--r--deps/rabbitmq_stream_management/test/http_SUITE_data/pom.xml17
4 files changed, 20 insertions, 18 deletions
diff --git a/deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/pom.xml b/deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/pom.xml
index e6c113bedb..f238dc168c 100644
--- a/deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/pom.xml
+++ b/deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/pom.xml
@@ -26,13 +26,14 @@
</developers>
<properties>
- <stream-client.version>[0.5.0-SNAPSHOT,1.0-SNAPSHOT)</stream-client.version>
- <junit.jupiter.version>5.8.2</junit.jupiter.version>
- <assertj.version>3.22.0</assertj.version>
+ <stream-client.version>[0.7.0-SNAPSHOT,)</stream-client.version>
+ <junit.jupiter.version>5.9.0</junit.jupiter.version>
+ <assertj.version>3.23.1</assertj.version>
<logback.version>1.2.11</logback.version>
- <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
+ <maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
- <spotless.version>2.2.0</spotless.version>
+ <spotless.version>2.24.0</spotless.version>
+ <google-java-format.version>1.15.0</google-java-format.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -103,7 +104,7 @@
<configuration>
<java>
<googleJavaFormat>
- <version>1.9</version>
+ <version>${google-java-format.version}</version>
<style>GOOGLE</style>
</googleJavaFormat>
</java>
diff --git a/deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/FailureTest.java b/deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/FailureTest.java
index 28d16bae09..a31e49123a 100644
--- a/deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/FailureTest.java
+++ b/deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/FailureTest.java
@@ -164,7 +164,7 @@ public class FailureTest {
new Client.ClientParameters()
.port(TestUtils.streamPortNode1())
.messageListener(
- (subscriptionId, offset, chunkTimestamp, committedOffset, message) -> {
+ (subscriptionId, offset, chunkTimestamp, committedChunkId, msg) -> {
bodies.add(new String(msg.getBodyAsBinary(), StandardCharsets.UTF_8));
consumeLatch.countDown();
}));
@@ -345,7 +345,7 @@ public class FailureTest {
(client1, subscriptionId, offset, messageCount, dataSize) ->
client1.credit(subscriptionId, 1))
.messageListener(
- (subscriptionId, offset, chunkTimestamp, committedOffset, message) -> {
+ (subscriptionId, offset, chunkTimestamp, committedChunkId, message) -> {
consumed.add(message);
generations.add((Long) message.getApplicationProperties().get("generation"));
if (consumed.size() == confirmed.size()) {
@@ -447,7 +447,7 @@ public class FailureTest {
Set<Long> generations = ConcurrentHashMap.newKeySet();
Set<Long> consumedIds = ConcurrentHashMap.newKeySet();
Client.MessageListener messageListener =
- (subscriptionId, offset, chunkTimestamp, committedOffset, message) -> {
+ (subscriptionId, offset, chunkTimestamp, committedChunkId, message) -> {
consumed.add(message);
generations.add((Long) message.getApplicationProperties().get("generation"));
consumedIds.add(message.getProperties().getMessageIdAsLong());
diff --git a/deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/StreamTest.java b/deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/StreamTest.java
index ba3ddf7464..1f09809b8e 100644
--- a/deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/StreamTest.java
+++ b/deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/StreamTest.java
@@ -119,7 +119,7 @@ public class StreamTest {
(client1, subscriptionId, offset, messageCount1, dataSize) ->
client1.credit(subscriptionId, 10))
.messageListener(
- (subscriptionId, offset, chunkTimestamp, committedOffset, message) -> {
+ (subscriptionId, offset, chunkTimestamp, committedChunkId, message) -> {
bodies.add(new String(message.getBodyAsBinary(), StandardCharsets.UTF_8));
consumingLatch.countDown();
}));
diff --git a/deps/rabbitmq_stream_management/test/http_SUITE_data/pom.xml b/deps/rabbitmq_stream_management/test/http_SUITE_data/pom.xml
index 3b0f1c2f4d..4f96fcc8df 100644
--- a/deps/rabbitmq_stream_management/test/http_SUITE_data/pom.xml
+++ b/deps/rabbitmq_stream_management/test/http_SUITE_data/pom.xml
@@ -26,15 +26,16 @@
</developers>
<properties>
- <stream-client.version>[0.5.0-SNAPSHOT,1.0-SNAPSHOT)</stream-client.version>
- <junit.jupiter.version>5.8.2</junit.jupiter.version>
- <assertj.version>3.22.0</assertj.version>
- <okhttp.version>4.9.3</okhttp.version>
- <gson.version>2.8.9</gson.version>
+ <stream-client.version>[0.7.0-SNAPSHOT,)</stream-client.version>
+ <junit.jupiter.version>5.9.0</junit.jupiter.version>
+ <assertj.version>3.23.1</assertj.version>
<logback.version>1.2.11</logback.version>
- <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
+ <maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
- <spotless.version>2.2.0</spotless.version>
+ <spotless.version>2.24.0</spotless.version>
+ <google-java-format.version>1.15.0</google-java-format.version>
+ <okhttp.version>4.9.3</okhttp.version>
+ <gson.version>2.8.9</gson.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -119,7 +120,7 @@
<configuration>
<java>
<googleJavaFormat>
- <version>1.9</version>
+ <version>${google-java-format.version}</version>
<style>GOOGLE</style>
</googleJavaFormat>
</java>