Skip to content

Commit c30ef2f

Browse files
authored
Routine dependency updates (#223)
Signed-off-by: Andriy Redko <[email protected]>
1 parent 7aabe4c commit c30ef2f

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

build-bin/docker/docker_test_image

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ docker_container=${3:-sut}
2020
# First try to run the intended containers.
2121
health_rc=0
2222
if test -f "${docker_compose_file}"; then
23-
docker-compose -f "${docker_compose_file}" up --remove-orphans -d --quiet-pull || health_rc=1
23+
docker compose -f "${docker_compose_file}" up --remove-orphans -d --quiet-pull || health_rc=1
2424
else
2525
docker run --name ${docker_container} -d ${DOCKER_IMAGE} || health_rc=1
2626
fi
@@ -36,7 +36,7 @@ if [ "${health_rc}" = "1" ] || ! build-bin/docker/docker_block_on_health ${docke
3636

3737
# Log any containers output to console before we remove them.
3838
if test -f "${docker_compose_file}"; then
39-
docker-compose -f "${docker_compose_file}" logs
39+
docker compose -f "${docker_compose_file}" logs
4040
else
4141
docker logs ${docker_container} || true
4242
fi
@@ -45,7 +45,7 @@ fi
4545

4646
# Clean up any containers, so that we can run this again without conflict.
4747
if test -f "${docker_compose_file}"; then
48-
docker-compose -f "${docker_compose_file}" down
48+
docker compose -f "${docker_compose_file}" down
4949
else
5050
docker kill ${docker_container} && docker rm ${docker_container}
5151
fi

pom.xml

+16-16
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@
6969
<!-- matching armeria/grpc/zipkin -->
7070
<zipkin.groupId>io.zipkin.zipkin2</zipkin.groupId>
7171
<!-- when updating, update docker/Dockerfile and storage/src/test/java/zipkin2/storage/kafka/IT* -->
72-
<zipkin.version>3.4.0</zipkin.version>
72+
<zipkin.version>3.4.1</zipkin.version>
7373
<zipkin-reporter.version>3.4.0</zipkin-reporter.version>
74-
<spring-boot.version>3.3.0</spring-boot.version>
75-
<jackson.version>2.17.1</jackson.version>
74+
<spring-boot.version>3.3.3</spring-boot.version>
75+
<jackson.version>2.17.2</jackson.version>
7676
<!-- This allows you to test feature branches with jitpack -->
7777
<armeria.groupId>com.linecorp.armeria</armeria.groupId>
7878
<armeria.version>1.28.4</armeria.version>
7979
<!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
80-
<netty.version>4.1.110.Final</netty.version>
80+
<netty.version>4.1.113.Final</netty.version>
8181
<log4j.version>2.23.1</log4j.version>
8282

8383
<!-- This allows you to test feature branches with jitpack -->
@@ -92,14 +92,14 @@
9292
<okhttp.version>4.12.0</okhttp.version>
9393

9494
<assertj.version>3.25.3</assertj.version>
95-
<awaitility.version>4.2.1</awaitility.version>
96-
<junit-jupiter.version>5.10.2</junit-jupiter.version>
97-
<mockito.version>5.12.0</mockito.version>
95+
<awaitility.version>4.2.2</awaitility.version>
96+
<junit-jupiter.version>5.11.0</junit-jupiter.version>
97+
<mockito.version>5.13.0</mockito.version>
9898

9999
<!-- override to set exclusions per-project -->
100100
<errorprone.args />
101-
<errorprone.version>2.27.1</errorprone.version>
102-
<auto-value.version>1.10.4</auto-value.version>
101+
<errorprone.version>2.30.0</errorprone.version>
102+
<auto-value.version>1.11.0</auto-value.version>
103103

104104
<license.skip>${skipTests}</license.skip>
105105

@@ -108,22 +108,22 @@
108108

109109
<go-offline-maven-plugin.version>1.2.8</go-offline-maven-plugin.version>
110110
<!-- TODO: cleanup any redundant ignores now also in the 4.0 release (once final) -->
111-
<license-maven-plugin.version>4.3</license-maven-plugin.version>
111+
<license-maven-plugin.version>4.5</license-maven-plugin.version>
112112
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
113113
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
114114
<!-- Use same version as https://github.com/openzipkin/docker-java -->
115115
<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
116-
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
116+
<maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
117117
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
118118
<!-- Use same version as https://github.com/openzipkin/docker-java -->
119119
<maven-help-plugin.version>3.4.0</maven-help-plugin.version>
120-
<maven-install-plugin.version>3.1.1</maven-install-plugin.version>
120+
<maven-install-plugin.version>3.1.2</maven-install-plugin.version>
121121
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
122-
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
122+
<maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
123123
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
124-
<maven-shade-plugin.version>3.5.2</maven-shade-plugin.version>
124+
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
125125
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
126-
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
126+
<maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
127127
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
128128
</properties>
129129

@@ -175,7 +175,7 @@
175175

176176
<dependency>
177177
<groupId>org.junit.jupiter</groupId>
178-
<artifactId>junit-jupiter</artifactId>
178+
<artifactId>junit-jupiter-api</artifactId>
179179
<version>${junit-jupiter.version}</version>
180180
<scope>test</scope>
181181
</dependency>

0 commit comments

Comments
 (0)