Merge branch 'master' into update/netty-buffer-4.1.72.Final

scullxbones · Dec 19, 2021 · 41f26a8 · 41f26a8
2 parents 2403563 + 590210c
commit 41f26a8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,16 +9,16 @@ jobs:
           - mongo-version: 3.6
             scala-version: 2.12.15
           - mongo-version: 3.6
-            scala-version: 2.13.6
+            scala-version: 2.13.7
             # 4.0 must be quoted, otherwise will be truncated to 4
           - mongo-version: "4.0"
             scala-version: 2.12.15
           - mongo-version: "4.0"
-            scala-version: 2.13.6
+            scala-version: 2.13.7
           - mongo-version: 4.2
             scala-version: 2.12.15
           - mongo-version: 4.2
-            scala-version: 2.13.6
+            scala-version: 2.13.7
     env:
       MONGODB_AUTH_PORT: 28117
       MONGODB_NOAUTH_PORT: 27117

diff --git a/build.sbt b/build.sbt
@@ -1,12 +1,12 @@
 val releaseV = "3.0.7"
 
 val scala212V = "2.12.15"
-val scala213V = "2.13.6"
+val scala213V = "2.13.7"
 
 val scalaV = scala213V
-val akkaV = "2.6.16"
+val akkaV = "2.6.17"
 
-val MongoJavaDriverVersion = "4.3.2"
+val MongoJavaDriverVersion = "4.3.4"
 
 val commonDeps = Seq(
   ("com.typesafe.akka"  %% "akka-persistence" % akkaV)
@@ -22,9 +22,9 @@ val commonDeps = Seq(
   "org.mongodb"               % "mongodb-driver-core"       % MongoJavaDriverVersion   % "compile",
   "org.mongodb"               % "mongodb-driver-legacy"     % MongoJavaDriverVersion   % "test",
   "org.slf4j"                 % "slf4j-api"                 % "1.7.32"  % "test",
-  "org.apache.logging.log4j"  % "log4j-api"                 % "2.14.1"  % "test",
-  "org.apache.logging.log4j"  % "log4j-core"                % "2.14.1"  % "test",
-  "org.apache.logging.log4j"  % "log4j-slf4j-impl"          % "2.14.1"  % "test",
+  "org.apache.logging.log4j"  % "log4j-api"                 % "2.17.0"  % "test",
+  "org.apache.logging.log4j"  % "log4j-core"                % "2.17.0"  % "test",
+  "org.apache.logging.log4j"  % "log4j-slf4j-impl"          % "2.17.0"  % "test",
   "org.scalatest"             %% "scalatest"                % "3.2.10"   % "test",
   "org.scalatestplus"         %% "mockito-1-10"             % "3.1.0.0" % "test",
   "org.scalatestplus"         %% "junit-4-12"               % "3.2.2.0" % "test",
@@ -98,8 +98,8 @@ lazy val `akka-persistence-mongo-scala` = (project in file("scala"))
   .settings(commonSettings:_*)
   .settings(
     libraryDependencies ++= Seq(
-      "org.mongodb.scala" %% "mongo-scala-driver" % "4.3.2"        % "compile",
-      "org.mongodb.scala" %% "mongo-scala-bson"   % "4.3.2"        % "compile",
+      "org.mongodb.scala" %% "mongo-scala-driver" % "4.3.4"        % "compile",
+      "org.mongodb.scala" %% "mongo-scala-bson"   % "4.3.4"        % "compile",
       "io.netty"          % "netty-buffer"        % "4.1.72.Final" % "compile",
       "io.netty"          % "netty-transport"     % "4.1.72.Final" % "compile",
       "io.netty"          % "netty-handler"       % "4.1.72.Final" % "compile",
@@ -116,7 +116,7 @@ lazy val `akka-persistence-mongo-rxmongo` = (project in file("rxmongo"))
   .settings(
     libraryDependencies ++=
       Seq("reactivemongo", "reactivemongo-akkastream")
-        .map("org.reactivemongo" %% _ % "1.0.7" % Compile)
+        .map("org.reactivemongo" %% _ % "1.0.10" % Compile)
         .map(_.exclude("com.typesafe.akka","akka-actor_2.11")
           .exclude("com.typesafe.akka","akka-actor_2.12")
           .exclude("com.typesafe.akka","akka-actor_2.13")

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.5
+sbt.version=1.5.7