bump rocks-db version (#328)

* bump rocksdb version * reformat * fix dependencies for use with rocksdb 6.29.5 * fix dependencies for use with rocksdb 6.29.5 * fix dependencies for use with rocksdb 6.29.5 * fix dependencies for use with rocksdb 6.29.5 * fix dependencies for use with rocksdb 6.29.5 * fix dependencies for use with rocksdb 6.29.5 * fix dependencies for use with rocksdb 6.29.5 * fix dependencies for use with rocksdb 6.29.5 * fix dependencies for use with rocksdb 6.29.5
UltimateSoftware · Jan 9, 2023 · d6f9ccb · d6f9ccb
1 parent 31b0e14
commit d6f9ccb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -45,6 +45,7 @@ lazy val `surge-common` = (project in file("modules/common"))
       Kafka.kafkaStreams,
       Kafka.kafkaStreamsScala,
       Kafka.kafkaStreamsTestUtils,
+      Kafka.rocksDb,
       OpenTelemetry.api,
       OpenTelemetry.sdk,
       OpenTelemetry.sdkTesting,
@@ -72,6 +73,9 @@ lazy val `surge-engine-command-core` = (project in file("modules/command-engine/
       Akka.multiNodeTestkit,
       Akka.akkaStreamTestKit,
       Akka.kafkaClusterSharding,
+      Akka.clusterSharding,
+      Akka.clusterShardingTyped,
+      Akka.clusterTyped,
       Akka.discovery,
       mockitoCore,
       scalatest,

diff --git a/modules/multilanguage-csharp-sdk/Surge.csproj b/modules/multilanguage-csharp-sdk/Surge.csproj
@@ -13,7 +13,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Akka" Version="1.4.27" />
+        <PackageReference Include="Akka" Version="1.4.46" />
         <PackageReference Include="Google.Protobuf" Version="3.18.1" />
         <PackageReference Include="Google.Protobuf.Tools" Version="3.18.1" />
         <PackageReference Include="Grpc" Version="2.41.0" />

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,15 +6,21 @@ object Dependencies extends AutoPlugin {
   object autoImport {
 
     object Akka {
-      val version = "2.6.15"
+      val version = "2.6.20"
       val akkaHttpVersion = "10.2.9"
       val alpakkaVersion = "2.1.1"
       val managementVersion = "1.1.2"
 
       val kafkaStream = "com.typesafe.akka" %% "akka-stream-kafka" % alpakkaVersion
       val kafkaStreamTestKit = "com.typesafe.akka" %% "akka-stream-kafka-testkit" % alpakkaVersion % Test
-      val kafkaClusterSharding = "com.typesafe.akka" %% "akka-stream-kafka-cluster-sharding" % alpakkaVersion
+      val kafkaClusterSharding = ("com.typesafe.akka" %% "akka-stream-kafka-cluster-sharding" % alpakkaVersion).excludeAll {
+        ExclusionRule("com.typesafe.akka", "akka-cluster-typed")
+        ExclusionRule("com.typesafe.akka", "akka-cluster-sharding-typed")
+      }
       val clusterSharding = "com.typesafe.akka" %% "akka-cluster-sharding" % version
+      val clusterShardingTyped = "com.typesafe.akka" %% "akka-cluster-sharding-typed" % version
+      val clusterTyped = "com.typesafe.akka" %% "akka-cluster-typed" % version
+
       val management = "com.lightbend.akka.management" %% "akka-management" % managementVersion
       val managementClusterHttp = "com.lightbend.akka.management" %% "akka-management-cluster-http" % managementVersion
       val managementClusterBootstrap = "com.lightbend.akka.management" %% "akka-management-cluster-bootstrap" % managementVersion
@@ -33,12 +39,14 @@ object Dependencies extends AutoPlugin {
     }
 
     object Kafka {
-      val kafkaVersion = "2.7.2"
+      val kafkaVersion = "3.2.3"
 
       val kafkaClients = "org.apache.kafka" % "kafka-clients" % kafkaVersion
       val kafkaStreams = "org.apache.kafka" % "kafka-streams" % kafkaVersion
       val kafkaStreamsScala = "org.apache.kafka" %% "kafka-streams-scala" % kafkaVersion
       val kafkaStreamsTestUtils = "org.apache.kafka" % "kafka-streams-test-utils" % kafkaVersion % Test
+
+      val rocksDb = "org.rocksdb" % "rocksdbjni" % "6.29.5"
     }
 
     object OpenTelemetry {
@@ -68,7 +76,7 @@ object Dependencies extends AutoPlugin {
     val akkaHttpPlayJson = "de.heikoseeberger" %% "akka-http-play-json" % "1.38.2"
     val scalaCollectionCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.8.1"
     val java8Compat = "org.scala-lang.modules" %% "scala-java8-compat" % "0.9.1"
-    val embeddedKafka = "io.github.embeddedkafka" %% "embedded-kafka" % "2.8.1" % Test
+    val embeddedKafka = "io.github.embeddedkafka" %% "embedded-kafka" % "3.3.1" % Test
     val junit = "junit" % "junit" % "4.13.2" % Test
     val logbackForTesting = "ch.qos.logback" % "logback-classic" % "1.4.4" % Test
     val json4s = "org.json4s" %% "json4s-native" % "4.0.5"