Merge pull request #11976 from mkurz/update/patches

Dependency updates
playframework · Sep 18, 2023 · 1e0fee6 · 1e0fee6
2 parents 0ca6ce2 + d7c6c29
commit 1e0fee6
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolution-path-config/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolution-path-config/build.sbt
@@ -12,7 +12,7 @@ lazy val root = (project in file("."))
       guice,
       jdbc,
       evolutions,
-      "com.h2database" % "h2" % "2.2.222",
+      "com.h2database" % "h2" % "2.2.224",
     )
   )
 

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolutions-auto-apply-false/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolutions-auto-apply-false/build.sbt
@@ -12,7 +12,7 @@ lazy val root = (project in file("."))
     updateOptions := updateOptions.value.withLatestSnapshots(false),
     update / evictionWarningOptions ~= (_.withWarnTransitiveEvictions(false).withWarnDirectEvictions(false)),
     PlayKeys.playInteractionMode := play.sbt.StaticPlayNonBlockingInteractionMode,
-    libraryDependencies ++= Seq(guice, javaJdbc, evolutions, "com.h2database" % "h2" % "2.2.222"),
+    libraryDependencies ++= Seq(guice, javaJdbc, evolutions, "com.h2database" % "h2" % "2.2.224"),
     InputKey[Unit]("applyEvolutions") := {
       val args        = Def.spaceDelimited("<path>").parsed
       val path :: Nil = args

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolutions-auto-apply-true/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolutions-auto-apply-true/build.sbt
@@ -12,7 +12,7 @@ lazy val root = (project in file("."))
     updateOptions := updateOptions.value.withLatestSnapshots(false),
     update / evictionWarningOptions ~= (_.withWarnTransitiveEvictions(false).withWarnDirectEvictions(false)),
     PlayKeys.playInteractionMode := play.sbt.StaticPlayNonBlockingInteractionMode,
-    libraryDependencies ++= Seq(guice, javaJdbc, evolutions, "com.h2database" % "h2" % "2.2.222"),
+    libraryDependencies ++= Seq(guice, javaJdbc, evolutions, "com.h2database" % "h2" % "2.2.224"),
     InputKey[Unit]("applyEvolutions") := {
       val args        = Def.spaceDelimited("<path>").parsed
       val path :: Nil = args

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolutions-multiple-databases/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolutions-multiple-databases/build.sbt
@@ -12,7 +12,7 @@ lazy val root = (project in file("."))
     updateOptions := updateOptions.value.withLatestSnapshots(false),
     update / evictionWarningOptions ~= (_.withWarnTransitiveEvictions(false).withWarnDirectEvictions(false)),
     PlayKeys.playInteractionMode := play.sbt.StaticPlayNonBlockingInteractionMode,
-    libraryDependencies ++= Seq(guice, javaJdbc, evolutions, "com.h2database" % "h2" % "2.2.222"),
+    libraryDependencies ++= Seq(guice, javaJdbc, evolutions, "com.h2database" % "h2" % "2.2.224"),
     InputKey[Unit]("applyEvolutions") := {
       val args        = Def.spaceDelimited("<path>").parsed
       val path :: Nil = args

diff --git a/documentation/build.sbt b/documentation/build.sbt
@@ -41,7 +41,7 @@ lazy val main = Project("Play-Documentation", file("."))
     version := PlayVersion.current,
     libraryDependencies ++= Seq(
       "com.typesafe"   % "config"       % "1.4.2"   % Test,
-      "com.h2database" % "h2"           % "2.2.222" % Test,
+      "com.h2database" % "h2"           % "2.2.224" % Test,
       "org.mockito"    % "mockito-core" % "5.5.0"   % Test,
       // https://github.com/logstash/logstash-logback-encoder/tree/logstash-logback-encoder-4.9#including
       "net.logstash.logback" % "logstash-logback-encoder" % "7.3" % Test

diff --git a/documentation/manual/working/commonGuide/build/code/dependencies.sbt b/documentation/manual/working/commonGuide/build/code/dependencies.sbt
@@ -11,7 +11,7 @@ libraryDependencies += "org.apache.derby" % "derby" % "10.16.1.1" % "test"
 //#multi-deps
 libraryDependencies ++= Seq(
   "org.apache.derby" % "derby"          % "10.16.1.1",
-  "org.hibernate"    % "hibernate-core" % "6.2.8.Final"
+  "org.hibernate"    % "hibernate-core" % "6.3.0.Final"
 )
 //#multi-deps
 

diff --git a/documentation/manual/working/javaGuide/main/sql/code/jpa.sbt b/documentation/manual/working/javaGuide/main/sql/code/jpa.sbt
@@ -3,7 +3,7 @@
 //#jpa-sbt-dependencies
 libraryDependencies ++= Seq(
   javaJpa,
-  "org.hibernate" % "hibernate-core" % "6.2.8.Final" // replace by your jpa implementation
+  "org.hibernate" % "hibernate-core" % "6.3.0.Final" // replace by your jpa implementation
 )
 //#jpa-sbt-dependencies
 

diff --git a/documentation/project/plugins.sbt b/documentation/project/plugins.sbt
@@ -8,7 +8,7 @@ lazy val plugins = (project in file(".")).dependsOn(playDocsPlugin)
 lazy val playDocsPlugin = ProjectRef(Path.fileProperty("user.dir").getParentFile, "Play-Docs-Sbt-Plugin")
 
 // Required for Production.md
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.3")
 
 // Add headers to example sources
 addSbtPlugin("de.heikoseeberger" % "sbt-header"         % "5.10.0")

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -77,7 +77,7 @@ object Dependencies {
 
   val javaxInject = "javax.inject" % "javax.inject" % "1"
 
-  val h2database = "com.h2database" % "h2" % "2.2.222"
+  val h2database = "com.h2database" % "h2" % "2.2.224"
 
   val derbyVersion = "10.15.2.0"
   val derbyDatabase = Seq(
@@ -107,7 +107,7 @@ object Dependencies {
 
   val jpaDeps = Seq(
     "jakarta.persistence" % "jakarta.persistence-api" % "3.1.0",
-    "org.hibernate"       % "hibernate-core"          % "6.2.8.Final" % "test"
+    "org.hibernate"       % "hibernate-core"          % "6.3.0.Final" % "test"
   )
 
   def scalaReflect(scalaVersion: String) = CrossVersion.partialVersion(scalaVersion) match {
@@ -122,7 +122,7 @@ object Dependencies {
       }
     })
 
-  val springFrameworkVersion = "5.3.29"
+  val springFrameworkVersion = "5.3.30"
 
   val javaDeps = Seq(
     // Used by the Java routing DSL
@@ -310,7 +310,7 @@ object Dependencies {
     "com.github.ben-manes.caffeine" % "jcache"   % caffeineVersion
   ) ++ jcacheApi
 
-  val playWsStandaloneVersion = "2.2.1"
+  val playWsStandaloneVersion = "2.2.2"
   val playWsDeps = Seq(
     ("com.typesafe.play" %% "play-ws-standalone"      % playWsStandaloneVersion).forScala3TestsExcludeAkkaOrganization(),
     ("com.typesafe.play" %% "play-ws-standalone-xml"  % playWsStandaloneVersion).forScala3TestsExcludeAkkaOrganization(),