From 838a8d4c7b2bbf8bb4e5a16b476640f6430cb2ec Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 25 Jul 2021 02:30:05 +0200 Subject: [PATCH] Update scalatra, scalatra-forms, ... to 2.8.0 (#2834) Co-authored-by: kenji yoshida <6b656e6a69@gmail.com> --- build.sbt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 81a2a359c..d4d65b0ef 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ import com.jsuereth.sbtpgp.PgpKeys._ val Organization = "io.github.gitbucket" val Name = "gitbucket" val GitBucketVersion = "4.36.1" -val ScalatraVersion = "2.7.1" +val ScalatraVersion = "2.8.0" val JettyVersion = "9.4.43.v20210629" val JgitVersion = "5.12.0.202106070339-r" @@ -28,13 +28,15 @@ resolvers ++= Seq( "sonatype-snapshot" at "https://oss.sonatype.org/content/repositories/snapshots/" ) +libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % "always" + libraryDependencies ++= Seq( "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % JgitVersion, "org.eclipse.jgit" % "org.eclipse.jgit.archive" % JgitVersion, "org.scalatra" %% "scalatra" % ScalatraVersion cross CrossVersion.for3Use2_13, "org.scalatra" %% "scalatra-json" % ScalatraVersion cross CrossVersion.for3Use2_13, "org.scalatra" %% "scalatra-forms" % ScalatraVersion cross CrossVersion.for3Use2_13, - "org.json4s" %% "json4s-jackson" % "3.6.11" cross CrossVersion.for3Use2_13, + "org.json4s" %% "json4s-jackson" % "4.0.1" cross CrossVersion.for3Use2_13, "commons-io" % "commons-io" % "2.11.0", "io.github.gitbucket" % "solidbase" % "1.0.3", "io.github.gitbucket" % "markedj" % "1.0.16",