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

Jump to bottom

bump: protobuf-java 3.24.0 #3026

Merged
merged 2 commits into from
Oct 20, 2023
Merged

bump: protobuf-java 3.24.0 #3026

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9b3722
bump: protobuf-java 3.24.0
patriknw Oct 20, 2023
899fe7e
move to Kinesis section
patriknw Oct 20, 2023
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
4 changes: 2 additions & 2 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ object Dependencies {

val AwsSdk2Version = "2.17.295"
val AwsSpiAkkaHttpVersion = "1.0.1"
val ProtobufJavaVersion = "3.21.12"
// Sync with plugins.sbt
val AkkaGrpcBinaryVersion = "2.4"
// sync ignore prefix in scripts/link-validator.conf#L30
Expand Down Expand Up @@ -340,6 +339,7 @@ object Dependencies {
) ++ JacksonDatabindDependencies
)

val KinesisProtobufJavaVersion = "3.24.0" // sync with Akka gRPC
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only used by Kinesis, so moved here

val Kinesis = Seq(
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-http" % AkkaHttpVersion,
Expand All @@ -350,7 +350,7 @@ object Dependencies {
"software.amazon.awssdk" % "kinesis" % AwsSdk2Version, // ApacheV2
"software.amazon.awssdk" % "firehose" % AwsSdk2Version, // ApacheV2
"software.amazon.kinesis" % "amazon-kinesis-client" % "2.4.0", // ApacheV2
"com.google.protobuf" % "protobuf-java" % ProtobufJavaVersion // CVE in older transitive dependency
"com.google.protobuf" % "protobuf-java" % KinesisProtobufJavaVersion // CVE in older transitive dependency
).map(
_.excludeAll(
ExclusionRule("software.amazon.awssdk", "apache-client"),
Expand Down
Loading