Skip to content

Commit

Permalink
upgrade sbt, pekko and some minor lib bumps (#798)
Browse files Browse the repository at this point in the history
* upgrade sbt, pekko and some minor lib bumps

revery hoverfly upgrade due to CI build issues it causes

* upgrade amazon and spring

* amazon-kinesis-client 2.4.3 because newer 2.4 jars bring in upgrades to transitive deps

* revert kinesis upgrade altogether
  • Loading branch information
pjfanning authored Sep 12, 2024
1 parent 6ed22d0 commit 4f06b5f
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
28 changes: 14 additions & 14 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ object Dependencies {

val InfluxDBJavaVersion = "2.15"

val AvroVersion = "1.11.3"
val AwsSdk2Version = "2.17.113"
val AwsSpiPekkoHttpVersion = "0.1.0"
val NettyVersion = "4.1.104.Final"
val AvroVersion = "1.11.4"
val AwsSdk2Version = "2.17.295"
val AwsSpiPekkoHttpVersion = "0.1.1"
val NettyVersion = "4.1.113.Final"
// Sync with plugins.sbt
val PekkoGrpcBinaryVersion = "1.0"
val PekkoHttpVersion = PekkoHttpDependency.version
Expand Down Expand Up @@ -175,7 +175,7 @@ object Dependencies {
("org.apache.hadoop" % "hadoop-common" % "3.2.1" % Test).exclude("log4j", "log4j"),
"com.sksamuel.avro4s" %% "avro4s-core" % avro4sVersion.value % Test,
"org.scalacheck" %% "scalacheck" % scalaCheckVersion % Test,
"org.specs2" %% "specs2-core" % "4.20.0" % Test,
"org.specs2" %% "specs2-core" % "4.20.8" % Test,
"org.slf4j" % "log4j-over-slf4j" % log4jOverSlf4jVersion % Test))

val Ftp = Seq(
Expand All @@ -184,7 +184,7 @@ object Dependencies {
"com.hierynomus" % "sshj" % "0.38.0",
"ch.qos.logback" % "logback-classic" % LogbackForSlf4j2Version % Test) ++ Mockito)

val GeodeVersion = "1.15.0"
val GeodeVersion = "1.15.1"
val GeodeVersionForDocs = "115"

val Geode = Seq(
Expand All @@ -194,7 +194,7 @@ object Dependencies {
Seq(
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % JacksonDatabindVersion,
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % JacksonDatabindVersion,
"org.apache.logging.log4j" % "log4j-to-slf4j" % "2.17.1" % Test) ++ JacksonDatabindDependencies ++
"org.apache.logging.log4j" % "log4j-to-slf4j" % "2.17.2" % Test) ++ JacksonDatabindDependencies ++
(if (isScala3.value)
Seq.empty // Equivalent and relevant shapeless functionality has been mainlined into Scala 3 language/stdlib
else Seq(
Expand Down Expand Up @@ -224,7 +224,7 @@ object Dependencies {
// https://github.com/googleapis/java-bigquerystorage/tree/master/proto-google-cloud-bigquerystorage-v1
"com.google.api.grpc" % "proto-google-cloud-bigquerystorage-v1" % "1.22.0" % "protobuf-src",
"org.apache.avro" % "avro" % AvroVersion % "provided",
"org.apache.arrow" % "arrow-vector" % "4.0.0" % "provided",
"org.apache.arrow" % "arrow-vector" % "4.0.1" % "provided",
"io.grpc" % "grpc-auth" % org.apache.pekko.grpc.gen.BuildInfo.grpcVersion,
"com.google.protobuf" % "protobuf-java" % protobufJavaVersion,
"org.apache.pekko" %% "pekko-http-spray-json" % PekkoHttpVersion,
Expand Down Expand Up @@ -321,7 +321,7 @@ object Dependencies {

val JsonStreaming = Seq(
libraryDependencies ++= Seq(
"com.github.jsurfer" % "jsurfer-jackson" % "1.6.0") ++ JacksonDatabindDependencies)
"com.github.jsurfer" % "jsurfer-jackson" % "1.6.5") ++ JacksonDatabindDependencies)

val Kinesis = Seq(
libraryDependencies ++= Seq(
Expand All @@ -344,7 +344,7 @@ object Dependencies {
val MongoDb = Seq(
crossScalaVersions -= Scala3,
libraryDependencies ++= Seq(
"org.mongodb.scala" %% "mongo-scala-driver" % "4.4.0"))
"org.mongodb.scala" %% "mongo-scala-driver" % "4.4.2"))

val Mqtt = Seq(
libraryDependencies ++= Seq(
Expand Down Expand Up @@ -390,8 +390,8 @@ object Dependencies {
"org.scalatestplus" %% scalaTestScalaCheckArtifact % scalaTestScalaCheckVersion % Test))

val SpringWeb = {
val SpringVersion = "5.1.17.RELEASE"
val SpringBootVersion = "2.1.16.RELEASE"
val SpringVersion = "5.1.20.RELEASE"
val SpringBootVersion = "2.1.18.RELEASE"
Seq(
libraryDependencies ++= Seq(
"org.springframework" % "spring-core" % SpringVersion,
Expand Down Expand Up @@ -455,8 +455,8 @@ object Dependencies {

val UnixDomainSocket = Seq(
libraryDependencies ++= Seq(
"com.github.jnr" % "jffi" % "1.3.1", // classifier "complete", // Is the classifier needed anymore?
"com.github.jnr" % "jnr-unixsocket" % "0.38.5"))
"com.github.jnr" % "jffi" % "1.3.13", // classifier "complete", // Is the classifier needed anymore?
"com.github.jnr" % "jnr-unixsocket" % "0.38.22"))

val Xml = Seq(
libraryDependencies ++= Seq(
Expand Down
2 changes: 1 addition & 1 deletion project/PekkoCoreDependency.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ import com.github.pjfanning.pekkobuild.PekkoDependency
object PekkoCoreDependency extends PekkoDependency {
override val checkProject: String = "pekko-cluster-sharding-typed"
override val module: Option[String] = None
override val currentVersion: String = "1.0.2"
override val currentVersion: String = "1.0.3"
}
2 changes: 1 addition & 1 deletion project/PekkoHttpDependency.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ import com.github.pjfanning.pekkobuild.PekkoDependency
object PekkoHttpDependency extends PekkoDependency {
override val checkProject: String = "pekko-http-testkit"
override val module: Option[String] = Some("http")
override val currentVersion: String = "1.0.0"
override val currentVersion: String = "1.0.1"
}
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.7
sbt.version=1.10.1
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@

addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.31")
addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.11")
addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.3.3")
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.32")
addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.12")
addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.3.4")
addSbtPlugin("com.github.sbt" % "sbt-license-report" % "1.6.1")
// discipline
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")

// docs
Expand Down

0 comments on commit 4f06b5f

Please sign in to comment.