Fix merge conflicts

playframework · Jun 8, 2021 · 550caad · 550caad
1 parent b30d6b3
commit 550caad
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/dev-mode/sbt-scripted-tools/src/main/scala/play/sbt/scriptedtools/ScriptedTools.scala b/dev-mode/sbt-scripted-tools/src/main/scala/play/sbt/scriptedtools/ScriptedTools.scala
@@ -35,7 +35,9 @@ object ScriptedTools extends AutoPlugin with ScriptedTools0 {
   lazy val initialFileWatchService = play.dev.filewatch.FileWatchService.polling(500)
 
   override def projectSettings: Seq[Def.Setting[_]] = Def.settings(
-    resolvers += Resolver.sonatypeRepo("releases"), // sync BuildSettings.scala
+    // using this variant due to sbt#5405
+    resolvers += "sonatype-service-local-releases"
+      .at("https://oss.sonatype.org/service/local/repositories/releases/content/"), // sync ScriptedTools.scala
     // This is copy/pasted from AkkaSnapshotRepositories since scripted tests also need
     // the snapshot resolvers in `cron` builds.
     // If this is a cron job in Travis:

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.3
->>>>>>> 8bae9cad7c (sbt 1.5.3)
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -75,7 +75,9 @@ object BuildSettings {
     homepage := Some(url("https://playframework.com")),
     ivyLoggingLevel := UpdateLogging.DownloadOnly,
     resolvers ++= Seq(
-      Resolver.sonatypeRepo("releases"), // sync ScriptedTools.scala
+      // using this variant due to sbt#5405
+      "sonatype-service-local-releases"
+        .at("https://oss.sonatype.org/service/local/repositories/releases/content/"), // sync ScriptedTools.scala
       Resolver.typesafeRepo("releases"),
       Resolver.typesafeIvyRepo("releases"),
       Resolver.sbtPluginRepo("releases"), // weird sbt-pgp/play docs/vegemite issue

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.3
->>>>>>> 8bae9cad7c (sbt 1.5.3)