Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: updates to zipkin 3.3 and fixes aws-junit CVE #220

Merged
merged 1 commit into from
Apr 16, 2024
Merged

deps: updates to zipkin 3.3 and fixes aws-junit CVE #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions aws-junit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,27 @@
<properties>
<main.basedir>${project.basedir}/..</main.basedir>

<!-- CVE fix versions -->
<!-- TODO: considering switching to something that doesn't use scala, such
as testcontainers+localstack, as CVEs are common here. -->
<scala.version>2.13.13</scala.version>

<!-- Only used in this repo's tests, which use floor JDK 17 -->
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.zipkin.zipkin2</groupId>
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

# zipkin version should match zipkin.version in /pom.xml
ARG zipkin_version=3.2.1
ARG zipkin_version=3.3.0

# java_version is used during the installation process to build or download the module jar.
#
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<!-- matching armeria/grpc/zipkin -->
<zipkin.groupId>io.zipkin.zipkin2</zipkin.groupId>
<!-- when updating, update docker/Dockerfile and storage/src/test/java/zipkin2/storage/kafka/IT* -->
<zipkin.version>3.2.1</zipkin.version>
<zipkin.version>3.3.0</zipkin.version>
<zipkin-reporter.version>3.4.0</zipkin-reporter.version>
<spring-boot.version>3.2.4</spring-boot.version>
<jackson.version>2.17.0</jackson.version>
Expand Down
Loading