Skip to content

Commit ee0eb37

Browse files
authored
Dependency and Docker image updates (#3800)
Dependency and Docker image updates
1 parent 005a0f9 commit ee0eb37

File tree

3 files changed

+7
-14
lines changed

3 files changed

+7
-14
lines changed

docker/test-images/zipkin-ui/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN if [ "${RELEASE_FROM_MAVEN_BUILD}" == "false" ]; then /build-bin/maybe_insta
5252
FROM ghcr.io/openzipkin/alpine:$alpine_version as zipkin-ui
5353
LABEL org.opencontainers.image.description="NGINX on Alpine Linux hosting the Zipkin UI with Zipkin API proxy_pass"
5454
# Use latest from https://pkgs.alpinelinux.org/packages?name=nginx
55-
ARG nginx_version=1.26.3-r4
55+
ARG nginx_version=1.28.0-r0
5656
LABEL nginx-version=$nginx_version
5757

5858
ENV ZIPKIN_BASE_URL=http://zipkin:9411

docker/test-images/zipkin-uiproxy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ COPY docker/test-images/zipkin-uiproxy/nginx.conf /conf.d/zipkin.conf.template
2828
FROM ghcr.io/openzipkin/alpine:$alpine_version as zipkin-uiproxy
2929
LABEL org.opencontainers.image.description="NGINX on Alpine Linux proxying the Zipkin UI with proxy_pass"
3030
# Use latest from https://pkgs.alpinelinux.org/packages?name=nginx
31-
ARG nginx_version=1.26.3-r4
31+
ARG nginx_version=1.28.0-r0
3232
LABEL nginx-version=$nginx_version
3333

3434
ENV ZIPKIN_UI_BASEPATH=/zipkin

pom.xml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,20 @@
4949
<armeria.groupId>com.linecorp.armeria</armeria.groupId>
5050
<armeria.version>1.32.3</armeria.version>
5151
<!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
52-
<netty.version>4.1.119.Final</netty.version>
52+
<netty.version>4.1.120.Final</netty.version>
5353

5454
<!-- It's easy for Jackson dependencies to get misaligned, so we manage it ourselves. -->
5555
<jackson.version>2.18.3</jackson.version>
5656

5757
<java-driver.version>4.19.0</java-driver.version>
58-
<micrometer.version>1.14.4</micrometer.version>
58+
<micrometer.version>1.14.5</micrometer.version>
5959

6060
<!-- Used for Generated annotations -->
6161
<javax-annotation-api.version>1.3.2</javax-annotation-api.version>
6262

6363
<!-- update together -->
6464
<spring-boot.version>3.4.4</spring-boot.version>
65-
<spring.version>6.2.5</spring.version>
65+
<spring.version>6.2.6</spring.version>
6666

6767
<!-- MySQL connector is GPL, even if it has an OSS exception.
6868
https://www.mysql.com/about/legal/licensing/foss-exception/
@@ -76,8 +76,7 @@
7676
<git-commit-id.version>4.9.10</git-commit-id.version>
7777

7878
<!-- Test only dependencies -->
79-
<junit-jupiter.version>5.12.1</junit-jupiter.version>
80-
<junit-platform-launcher.version>1.12.1</junit-platform-launcher.version>
79+
<junit-jupiter.version>5.12.2</junit-jupiter.version>
8180
<mockito.version>5.17.0</mockito.version>
8281
<assertj.version>3.27.3</assertj.version>
8382
<awaitility.version>4.3.0</awaitility.version>
@@ -86,7 +85,7 @@
8685
<kryo.version>5.6.2</kryo.version>
8786
<!-- Only used for proto interop testing; wire-maven-plugin is usually behind latest. -->
8887
<wire.version>5.1.0</wire.version>
89-
<gson.version>2.12.1</gson.version>
88+
<gson.version>2.13.0</gson.version>
9089
<unpack-proto.directory>${project.build.directory}/test/proto</unpack-proto.directory>
9190

9291
<license.skip>${skipTests}</license.skip>
@@ -176,12 +175,6 @@
176175
<dependencies>
177176
<!-- Do not add compile dependencies here. This can cause problems for libraries that depend on
178177
io.zipkin.zipkin2:zipkin difficult to unravel. -->
179-
<dependency>
180-
<groupId>org.junit.platform</groupId>
181-
<artifactId>junit-platform-launcher</artifactId>
182-
<version>${junit-platform-launcher.version}</version>
183-
<scope>test</scope>
184-
</dependency>
185178
<dependency>
186179
<groupId>org.junit.jupiter</groupId>
187180
<artifactId>junit-jupiter</artifactId>

0 commit comments

Comments
 (0)