Skip to content

Commit 7bb0dfc

Browse files
authored
update dependencies (#1896)
2 parents d151e0e + f269c13 commit 7bb0dfc

7 files changed

Lines changed: 21 additions & 21 deletions

File tree

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
java: [17, 25]
11-
scala: [2.13.18, 3.8.1]
11+
scala: [2.13.18, 3.8.3]
1212
steps:
1313
- uses: actions/checkout@v6
1414
- name: Set up JDK ${{ matrix.java }}

atlas-chart/src/main/scala/com/netflix/atlas/chart/JsonCodec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ object JsonCodec {
369369
val heatmaps = Map.newBuilder[Int, HeatmapDef]
370370
val data = List.newBuilder[(Int, DataDef)]
371371
foreachItem(parser) {
372-
val node = mapper.readTree[JsonNode](parser)
372+
val node = mapper.readTree(parser)
373373
node.get("type").asString() match {
374374
case "graph-image" =>
375375
// ignored for right now

atlas-core/src/main/scala/com/netflix/atlas/core/util/SortedTagMap.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ object SortedTagMap {
302302
def apply(data: IterableOnce[(String, String)]): SortedTagMap = {
303303
data match {
304304
case m: SortedTagMap => m
305-
case m: Map[String, String] =>
305+
case m: Map[String, String] @unchecked =>
306306
builder(m.size).addAll(m).result()
307307
case _ =>
308308
val size = data.knownSize

atlas-eval/src/main/scala/com/netflix/atlas/eval/model/LwcMessages.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ object LwcMessages {
144144

145145
private def nextTree(parser: JsonParser): JsonNode = {
146146
parser.nextToken()
147-
mapper.readTree[JsonNode](parser)
147+
mapper.readTree(parser)
148148
}
149149

150150
private[model] def parseDataExprs(parser: JsonParser): List[LwcDataExpr] = {
@@ -172,7 +172,7 @@ object LwcMessages {
172172
val row = List.newBuilder[Any]
173173
var t = parser.nextToken()
174174
while (t != null && t != JsonToken.END_ARRAY) {
175-
row += mapper.readTree[JsonNode](parser)
175+
row += mapper.readTree(parser)
176176
t = parser.nextToken()
177177
}
178178
samples += row.result()

project/Dependencies.scala

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ import sbt.*
44

55
object Dependencies {
66
object Versions {
7-
val pekko = "1.4.0"
7+
val pekko = "1.5.0"
88
val pekkoHttpV = "1.3.0"
9-
val iep = "6.0.0"
10-
val jackson = "3.0.4"
11-
val log4j = "2.25.3"
12-
val otel = "1.59.0"
9+
val iep = "6.0.2"
10+
val jackson = "3.1.1"
11+
val log4j = "2.25.4"
12+
val otel = "1.60.1"
1313
val scala = "2.13.18"
1414
val slf4j = "2.0.17"
15-
val spectator = "1.9.4"
16-
val spring = "7.0.4"
15+
val spectator = "1.9.6"
16+
val spring = "7.0.6"
1717

18-
val crossScala = Seq(scala, "3.8.1")
18+
val crossScala = Seq(scala, "3.8.3")
1919
}
2020

2121
import Versions.*
@@ -29,7 +29,7 @@ object Dependencies {
2929
val pekkoStreamTestkit= "org.apache.pekko" %% "pekko-stream-testkit" % pekko
3030
val pekkoTestkit = "org.apache.pekko" %% "pekko-testkit" % pekko
3131
val caffeine = "com.github.ben-manes.caffeine" % "caffeine" % "3.2.3"
32-
val equalsVerifier = "nl.jqno.equalsverifier" % "equalsverifier" % "4.3.1"
32+
val equalsVerifier = "nl.jqno.equalsverifier" % "equalsverifier" % "4.4.2"
3333
val hikariCP = "com.zaxxer" % "HikariCP" % "7.0.2"
3434
val iepLeaderApi = "com.netflix.iep" % "iep-leader-api" % iep
3535
val iepLeaderDynamoDb = "com.netflix.iep" % "iep-leader-dynamodb" % iep
@@ -50,12 +50,12 @@ object Dependencies {
5050
val log4jJul = "org.apache.logging.log4j" % "log4j-jul" % log4j
5151
val log4jSlf4j = "org.apache.logging.log4j" % "log4j-slf4j2-impl" % log4j
5252
val lsp4j = "org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "1.0.0"
53-
val munit = "org.scalameta" %% "munit" % "1.2.2"
53+
val munit = "org.scalameta" %% "munit" % "1.2.4"
5454
val otelSdk = "io.opentelemetry" % "opentelemetry-sdk" % otel
5555
val otelSdkTest = "io.opentelemetry" % "opentelemetry-sdk-testing" % otel
56-
val postgres = "org.postgresql" % "postgresql" % "42.7.9"
57-
val postgresEmbedded = "io.zonky.test" % "embedded-postgres" % "2.2.0"
58-
val roaringBitmap = "org.roaringbitmap" % "RoaringBitmap" % "1.6.12"
56+
val postgres = "org.postgresql" % "postgresql" % "42.7.10"
57+
val postgresEmbedded = "io.zonky.test" % "embedded-postgres" % "2.2.2"
58+
val roaringBitmap = "org.roaringbitmap" % "RoaringBitmap" % "1.6.14"
5959
val scalaCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.14.0"
6060
val scalaCompatJdk8 = "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2"
6161
val scalaCompiler = "org.scala-lang" % "scala-compiler"
@@ -71,7 +71,7 @@ object Dependencies {
7171
val spectatorLog4j = "com.netflix.spectator" % "spectator-ext-log4j2" % spectator
7272
val spectatorM2 = "com.netflix.spectator" % "spectator-reg-metrics2" % spectator
7373
val springContext = "org.springframework" % "spring-context" % spring
74-
val typesafeConfig = "com.typesafe" % "config" % "1.4.5"
74+
val typesafeConfig = "com.typesafe" % "config" % "1.4.6"
7575
}
7676

7777
// format: on

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.12.2
1+
sbt.version=1.12.9

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
33
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
44
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
55

6-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
6+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
77

88
// Convenient helpers, not required
99
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")

0 commit comments

Comments
 (0)