Fix conflicts

playframework · Dec 29, 2021 · 7fcd0fc · 7fcd0fc
1 parent b42c8b3
commit 7fcd0fc
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 205 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,15 +11,10 @@ env:
   global:
     - secure: "NS2hMbBcmi6EF4QxtcNs4A2ZuNmIdLYQRJUWWejgnD4YtcsmoVjxrHRedqrnDdui4DyvaxWhg/3Uds23jEKTSbbh3ZphLO77BVgM2nUGUvVoa4i6qGF2eZFlIhq2G1gM700GPV7X4KmyjYi2HtH8CWBTkqP3g0An63mCZw/Gnlk="
     # These are the versions used for (scripted) tests. The versions Play is build with however are defined in interplay.
-<<<<<<< HEAD
     - SCRIPTED_SBT_1_3: "1.3.13"
-    - SCRIPTED_SBT_1_5: "1.5.5"
-    - TEST_SCALA_2_12: "2.12.14"
-    - TEST_SCALA_2_13: "2.13.6"
-=======
     - SCRIPTED_SBT_1_5: "1.5.8"
+    - TEST_SCALA_2_12: "2.12.15"
     - TEST_SCALA_2_13: "2.13.7"
->>>>>>> ac50a6e0da (Bump scala/sbt)
   jobs:
     - TRAVIS_JDK=8
 

diff --git a/documentation/build.sbt b/documentation/build.sbt
@@ -77,13 +77,8 @@ lazy val main = Project("Play-Documentation", file("."))
     unmanagedResourceDirectories in Test ++= (baseDirectory.value / "manual" / "detailedTopics" ** "code").get,
     // Don't include sbt files in the resources
     excludeFilter in (Test, unmanagedResources) := (excludeFilter in (Test, unmanagedResources)).value || "*.sbt",
-<<<<<<< HEAD
-    crossScalaVersions := Seq("2.13.6", "2.12.14"),
-    scalaVersion := "2.13.6",
-=======
-    crossScalaVersions := Seq("2.13.7"),
+    crossScalaVersions := Seq("2.13.7", "2.12.15"),
     scalaVersion := "2.13.7",
->>>>>>> ac50a6e0da (Bump scala/sbt)
     fork in Test := true,
     javaOptions in Test ++= Seq("-Xmx512m", "-Xms128m"),
     headerLicense := Some(HeaderLicense.Custom("Copyright (C) Lightbend Inc. <https://www.lightbend.com>")),

diff --git a/documentation/manual/hacking/Translations.md b/documentation/manual/hacking/Translations.md
@@ -39,11 +39,7 @@ translation-project
 `build.properties` should contain the sbt version, ie:
 
 ```
-<<<<<<< HEAD
-sbt.version=0.13.16
-=======
-sbt.version=1.5.8
->>>>>>> ac50a6e0da (Bump scala/sbt)
+sbt.version=0.13.18
 ```
 
 `plugins.sbt` should include the Play docs sbt plugin, ie:

diff --git a/documentation/manual/releases/release29/migration29/Migration29.md b/documentation/manual/releases/release29/migration29/Migration29.md
diff --git a/documentation/manual/working/commonGuide/build/code/dependencies.sbt b/documentation/manual/working/commonGuide/build/code/dependencies.sbt
@@ -12,13 +12,8 @@ libraryDependencies += "org.apache.derby" % "derby" % "10.13.1.1" % "test"
 
 //#multi-deps
 libraryDependencies ++= Seq(
-<<<<<<< HEAD
   "org.apache.derby" % "derby"          % "10.13.1.1",
-  "org.hibernate"    % "hibernate-core" % "5.4.30.Final"
-=======
-  "org.apache.derby" % "derby"          % "10.14.2.0",
   "org.hibernate"    % "hibernate-core" % "5.4.32.Final"
->>>>>>> 5a4aeb0ea1 (Update dependencies)
 )
 //#multi-deps
 

diff --git a/documentation/manual/working/javaGuide/main/sql/code/jpa.sbt b/documentation/manual/working/javaGuide/main/sql/code/jpa.sbt
@@ -5,11 +5,7 @@
 //#jpa-sbt-dependencies
 libraryDependencies ++= Seq(
   javaJpa,
-<<<<<<< HEAD
-  "org.hibernate" % "hibernate-core" % "5.4.30.Final" // replace by your jpa implementation
-=======
   "org.hibernate" % "hibernate-core" % "5.4.32.Final" // replace by your jpa implementation
->>>>>>> 5a4aeb0ea1 (Update dependencies)
 )
 //#jpa-sbt-dependencies
 

diff --git a/documentation/project/build.properties b/documentation/project/build.properties
@@ -2,8 +2,4 @@
 # Copyright (C) Lightbend Inc. <https://www.lightbend.com>
 #
 # sync with project/build.properties
-<<<<<<< HEAD
 sbt.version=1.3.13
-=======
-sbt.version=1.5.8
->>>>>>> ac50a6e0da (Bump scala/sbt)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -7,18 +7,14 @@ import Keys._
 import buildinfo.BuildInfo
 
 object Dependencies {
-  val akkaVersion: String = sys.props.getOrElse("akka.version", "2.6.17")
+  val akkaVersion: String = sys.props.getOrElse("akka.version", "2.6.18")
   val akkaHttpVersion     = sys.props.getOrElse("akka.http.version", "10.1.15")
 
   val sslConfig = "com.typesafe" %% "ssl-config-core" % "0.4.2"
 
   val playJsonVersion = "2.8.2"
 
-<<<<<<< HEAD
-  val logback = "ch.qos.logback" % "logback-classic" % "1.2.3"
-=======
   val logback = "ch.qos.logback" % "logback-classic" % "1.2.10"
->>>>>>> 5a4aeb0ea1 (Update dependencies)
 
   val specs2Version = "4.8.3"
   val specs2Deps = Seq(
@@ -53,17 +49,13 @@ object Dependencies {
 
   val playJson = "com.typesafe.play" %% "play-json" % playJsonVersion
 
-  val slf4jVersion = "1.7.30"
+  val slf4jVersion = "1.7.32"
   val slf4j        = Seq("slf4j-api", "jul-to-slf4j", "jcl-over-slf4j").map("org.slf4j" % _ % slf4jVersion)
   val slf4jSimple  = "org.slf4j" % "slf4j-simple" % slf4jVersion
 
   val guava      = "com.google.guava"         % "guava"        % "30.1.1-jre"
   val findBugs   = "com.google.code.findbugs" % "jsr305"       % "3.0.2" // Needed by guava
-<<<<<<< HEAD
-  val mockitoAll = "org.mockito"              % "mockito-core" % "3.2.4"
-=======
-  val mockitoAll = "org.mockito"              % "mockito-core" % "4.2.0"
->>>>>>> 5a4aeb0ea1 (Update dependencies)
+  val mockitoAll = "org.mockito"              % "mockito-core" % "3.2.11"
 
   val h2database    = "com.h2database"   % "h2"    % "1.4.200"
   val derbyDatabase = "org.apache.derby" % "derby" % "10.13.1.1"
@@ -90,11 +82,7 @@ object Dependencies {
 
   val jpaDeps = Seq(
     "org.hibernate.javax.persistence" % "hibernate-jpa-2.1-api" % "1.0.2.Final",
-<<<<<<< HEAD
-    "org.hibernate"                   % "hibernate-core"        % "5.4.30.Final" % "test"
-=======
     "org.hibernate"                   % "hibernate-core"        % "5.4.32.Final" % "test"
->>>>>>> 5a4aeb0ea1 (Update dependencies)
   )
 
   def scalaReflect(scalaVersion: String) = "org.scala-lang" % "scala-reflect" % scalaVersion % "provided"
@@ -108,11 +96,7 @@ object Dependencies {
     case _                               => Nil
   }
 
-<<<<<<< HEAD
-  val springFrameworkVersion = "5.2.13.RELEASE"
-=======
-  val springFrameworkVersion = "5.3.13"
->>>>>>> e7c1abd323 (spring-beans, spring-context, ... 5.3.13 (was 5.3.12))
+  val springFrameworkVersion = "5.2.19.RELEASE"
 
   def javaDeps(scalaVersion: String) =
     Seq(
@@ -122,8 +106,8 @@ object Dependencies {
     ) ++ specs2Deps.map(_ % Test)
 
   val joda = Seq(
-    "joda-time" % "joda-time"    % "2.10.10",
-    "org.joda"  % "joda-convert" % "2.2.1"
+    "joda-time" % "joda-time"    % "2.10.13",
+    "org.joda"  % "joda-convert" % "2.2.2"
   )
 
   val javaFormsDeps = Seq(
@@ -178,11 +162,7 @@ object Dependencies {
         sslConfig
       ) ++ scalaParserCombinators(scalaVersion) ++ specs2Deps.map(_ % Test) ++ javaTestDeps
 
-<<<<<<< HEAD
-  val nettyVersion = "4.1.63.Final"
-=======
   val nettyVersion = "4.1.72.Final"
->>>>>>> 5a4aeb0ea1 (Update dependencies)
 
   val netty = Seq(
     "com.typesafe.netty" % "netty-reactive-streams-http" % "2.0.5",
@@ -193,11 +173,7 @@ object Dependencies {
 
   val jimfs = "com.google.jimfs" % "jimfs" % "1.1"
 
-<<<<<<< HEAD
   val okHttp = "com.squareup.okhttp3" % "okhttp" % "4.2.2"
-=======
-  val okHttp = "com.squareup.okhttp3" % "okhttp" % "4.9.3"
->>>>>>> 5a4aeb0ea1 (Update dependencies)
 
   def routesCompilerDependencies(scalaVersion: String) = {
     val deps = CrossVersion.partialVersion(scalaVersion) match {
@@ -285,11 +261,7 @@ object Dependencies {
     // slowing down the build. So the open range deps were removed and we can re-add
     // them using a specific version. Using an open range is also not good for the
     // local cache.
-<<<<<<< HEAD
     ("org.seleniumhq.selenium" % "htmlunit-driver" % "2.36.0").excludeAll(
-=======
-    ("org.seleniumhq.selenium" % "htmlunit-driver" % "2.56.0").excludeAll(
->>>>>>> 5a4aeb0ea1 (Update dependencies)
       ExclusionRule("org.seleniumhq.selenium", "selenium-api"),
       ExclusionRule("org.seleniumhq.selenium", "selenium-support")
     ),
@@ -304,17 +276,13 @@ object Dependencies {
     "javax.cache" % "cache-api" % "1.1.1"
   )
 
-  val ehcacheVersion = "2.10.6"
+  val ehcacheVersion = "2.10.9.2"
   val playEhcacheDeps = Seq(
     "net.sf.ehcache" % "ehcache" % ehcacheVersion,
     "org.ehcache"    % "jcache"  % "1.0.1"
   ) ++ jcacheApi
 
-<<<<<<< HEAD
   val caffeineVersion = "2.8.8"
-=======
-  val caffeineVersion = "2.9.3"
->>>>>>> 5a4aeb0ea1 (Update dependencies)
   val playCaffeineDeps = Seq(
     "com.github.ben-manes.caffeine" % "caffeine" % caffeineVersion,
     "com.github.ben-manes.caffeine" % "jcache"   % caffeineVersion
@@ -351,8 +319,8 @@ object Dependencies {
  * How to use this:
  *    $ sbt -J-XX:+UnlockCommercialFeatures -J-XX:+FlightRecorder -Dakka-http.sources=$HOME/code/akka-http '; project Play-Akka-Http-Server; test:run'
  *
- * Make sure Akka-HTTP has 2.12 as the FIRST version (or that scalaVersion := "2.12.14", otherwise it won't find the artifact
- *    crossScalaVersions := Seq("2.12.14", "2.11.12"),
+ * Make sure Akka-HTTP has 2.12 as the FIRST version (or that scalaVersion := "2.12.15", otherwise it won't find the artifact
+ *    crossScalaVersions := Seq("2.12.15", "2.11.12"),
  */
 object AkkaDependency {
   // Needs to be a URI like git://github.com/akka/akka.git#master or file:///xyz/akka

diff --git a/project/build.properties b/project/build.properties
@@ -2,8 +2,4 @@
 # Copyright (C) Lightbend Inc. <https://www.lightbend.com>
 #
 # sync with documentation/project/build.properties
-<<<<<<< HEAD
 sbt.version=1.3.13
-=======
-sbt.version=1.5.8
->>>>>>> ac50a6e0da (Bump scala/sbt)