Skip to content

Commit df80cb4

Browse files
committed
Use RabbitMQ 4.1 as default on CI
1 parent 8942dc3 commit df80cb4

File tree

6 files changed

+10
-11
lines changed

6 files changed

+10
-11
lines changed

.github/workflows/test-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test against RabbitMQ 4.0 (PR)
1+
name: Test against RabbitMQ 4.1 (PR)
22

33
on:
44
pull_request:
@@ -43,4 +43,4 @@ jobs:
4343
- name: Test against cluster
4444
run: ./mvnw test -Dtest="*ClusterTest" -Drabbitmqctl.bin=DOCKER:rabbitmq0
4545
- name: Stop cluster
46-
run: docker compose --file ci/cluster/docker-compose.yml down
46+
run: docker compose --file ci/cluster/docker-compose.yml down

.github/workflows/test-rabbitmq-alphas.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
strategy:
1515
matrix:
1616
rabbitmq-image:
17-
- pivotalrabbitmq/rabbitmq:v4.0.x-otp27
1817
- pivotalrabbitmq/rabbitmq:v4.1.x-otp27
1918
- pivotalrabbitmq/rabbitmq:main-otp27
2019
name: Test against ${{ matrix.rabbitmq-image }}

README.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
image:https://github.com/rabbitmq/rabbitmq-amqp-java-client/actions/workflows/test.yml/badge.svg["Build Status", link="https://github.com/rabbitmq/rabbitmq-amqp-java-client/actions/workflows/test.yml"]
44

55
This library is part of the https://www.rabbitmq.com/client-libraries/amqp-client-libraries[RabbitMQ AMQP 1.0 client libraries].
6-
It targets RabbitMQ 4.0 and requires at least Java 11 (Java 21 or more is recommended).
6+
It targets RabbitMQ 4.0+ and requires at least Java 11 (Java 21 or more is recommended).
77

88
Please refer to the https://rabbitmq.github.io/rabbitmq-amqp-java-client/stable/htmlsingle/[documentation] to find out more.
99

@@ -73,7 +73,7 @@ To build the JAR file:
7373
Start the broker:
7474

7575
----
76-
docker run -it --rm --name rabbitmq -p 5672:5672 rabbitmq:4.0
76+
docker run -it --rm --name rabbitmq -p 5672:5672 rabbitmq:4.1
7777
----
7878

7979
----

ci/cluster/docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
- rabbitmq-cluster
77
hostname: node0
88
container_name: rabbitmq0
9-
image: ${RABBITMQ_IMAGE:-rabbitmq:4.0}
9+
image: ${RABBITMQ_IMAGE:-rabbitmq:4.1}
1010
pull_policy: always
1111
ports:
1212
- "5672:5672"
@@ -21,7 +21,7 @@ services:
2121
- rabbitmq-cluster
2222
hostname: node1
2323
container_name: rabbitmq1
24-
image: ${RABBITMQ_IMAGE:-rabbitmq:4.0}
24+
image: ${RABBITMQ_IMAGE:-rabbitmq:4.1}
2525
pull_policy: always
2626
ports:
2727
- "5673:5672"
@@ -36,7 +36,7 @@ services:
3636
- rabbitmq-cluster
3737
hostname: node2
3838
container_name: rabbitmq2
39-
image: ${RABBITMQ_IMAGE:-rabbitmq:4.0}
39+
image: ${RABBITMQ_IMAGE:-rabbitmq:4.1}
4040
pull_policy: always
4141
ports:
4242
- "5674:5672"
@@ -45,4 +45,4 @@ services:
4545
volumes:
4646
- ./configuration/:/etc/rabbitmq/
4747
networks:
48-
rabbitmq-cluster:
48+
rabbitmq-cluster:

ci/start-broker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:4.0}
3+
RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:4.1}
44

55
wait_for_message() {
66
while ! docker logs "$1" | grep -q "$2";

ci/start-cluster.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
export RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:4.0}
3+
export RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:4.1}
44

55
wait_for_message() {
66
while ! docker logs "$1" | grep -q "$2";

0 commit comments

Comments
 (0)