Skip to content

Commit

Permalink
Update Spring Boot (address CVEs) and few other dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Andriy Redko <drreta@gmail.com>
  • Loading branch information
reta committed Aug 26, 2024
1 parent b2f6d83 commit 675afae
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docker/test-images/zipkin-mysql/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ HEALTHCHECK --interval=1s --start-period=30s --timeout=5s CMD ["docker-healthche
ENTRYPOINT ["start-mysql"]

# Use latest from https://pkgs.alpinelinux.org/packages?name=mysql (without the -r[0-9])
ARG mysql_version=11.4.2
ARG mysql_version=11.4.3
LABEL mysql-version=$mysql_version
ENV MYSQL_VERSION=$mysql_version

Expand Down
2 changes: 1 addition & 1 deletion docker/test-images/zipkin-ui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RUN if [ "${RELEASE_FROM_MAVEN_BUILD}" == "false" ]; then /build-bin/maybe_insta
FROM ghcr.io/openzipkin/alpine:$alpine_version as zipkin-ui
LABEL org.opencontainers.image.description="NGINX on Alpine Linux hosting the Zipkin UI with Zipkin API proxy_pass"
# Use latest from https://pkgs.alpinelinux.org/packages?name=nginx
ARG nginx_version=1.26.1
ARG nginx_version=1.26.2
LABEL nginx-version=$nginx_version

ENV ZIPKIN_BASE_URL=http://zipkin:9411
Expand Down
2 changes: 1 addition & 1 deletion docker/test-images/zipkin-uiproxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ COPY docker/test-images/zipkin-uiproxy/nginx.conf /conf.d/zipkin.conf.template
FROM ghcr.io/openzipkin/alpine:$alpine_version as zipkin-uiproxy
LABEL org.opencontainers.image.description="NGINX on Alpine Linux proxying the Zipkin UI with proxy_pass"
# Use latest from https://pkgs.alpinelinux.org/packages?name=nginx
ARG nginx_version=1.26.1
ARG nginx_version=1.26.2
LABEL nginx-version=$nginx_version

ENV ZIPKIN_UI_BASEPATH=/zipkin
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@
<jackson.version>2.17.2</jackson.version>

<java-driver.version>4.18.1</java-driver.version>
<micrometer.version>1.13.2</micrometer.version>
<micrometer.version>1.13.3</micrometer.version>

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

<!-- update together -->
<spring-boot.version>3.3.2</spring-boot.version>
<spring.version>6.1.11</spring.version>
<spring-boot.version>3.3.3</spring-boot.version>
<spring.version>6.1.12</spring.version>

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

<!-- Test only dependencies -->
<junit-jupiter.version>5.10.3</junit-jupiter.version>
<junit-jupiter.version>5.11.0</junit-jupiter.version>
<mockito.version>5.12.0</mockito.version>
<assertj.version>3.26.3</assertj.version>
<awaitility.version>4.2.1</awaitility.version>
Expand Down Expand Up @@ -109,7 +109,7 @@
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
<maven-shade-plugin.version>3.5.3</maven-shade-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.4.0</maven-surefire-plugin.version>
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
<wire-maven-plugin.version>1.3</wire-maven-plugin.version>
</properties>
Expand Down
7 changes: 7 additions & 0 deletions zipkin-collector/scribe/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,12 @@
<version>${awaitility.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
7 changes: 7 additions & 0 deletions zipkin-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,13 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.linecorp.armeria</groupId>
<artifactId>armeria-junit5</artifactId>
Expand Down
7 changes: 7 additions & 0 deletions zipkin-storage/elasticsearch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,12 @@
<version>${armeria.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>

0 comments on commit 675afae

Please sign in to comment.