From c910936815cd71fdbd41c62903c084553957b6d1 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Thu, 16 Dec 2021 23:27:50 +0100
Subject: [PATCH 1/3] Update custom ipcsocket dependency

---
 project/Dependencies.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 1e7270eac9..044d2311e1 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -118,5 +118,5 @@ object Dependencies {
   val asmUtil = "org.ow2.asm" % "asm-util" % asmVersion
 
   val libdaemonjvm = "io.github.alexarchambault.libdaemon" %% "libdaemon" % "0.0.6"
-  val ipcsocket = "com.github.alexarchambault.tmp.ipcsocket" % "ipcsocket" % "1.4.1-aa-4"
+  val ipcsocket = "io.github.alexarchambault.tmp.ipcsocket" % "ipcsocket" % "1.4.1-aa-5-1"
 }

From 21d84b15b0ea13f013145d7641a7b28dcbc12a35 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Fri, 17 Dec 2021 12:56:52 +0100
Subject: [PATCH 2/3] Update dependencies

---
 project/Dependencies.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 044d2311e1..18df2a2285 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -50,7 +50,7 @@ object Dependencies {
   val zinc = "ch.epfl.scala" %% "zinc" % zincVersion
   val bsp4s = "ch.epfl.scala" %% "bsp4s" % bspVersion
   val bsp4j = "ch.epfl.scala" % "bsp4j" % bspVersion
-  val nailgun = "io.github.alexarchambault.bleep" % "nailgun-server" % "1.0.2"
+  val nailgun = "io.github.alexarchambault.bleep" % "nailgun-server" % "1.0.3"
   val javaDebug = "ch.epfl.scala" % "com-microsoft-java-debug-core" % javaDebugVersion
 
   val libraryManagement = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion
@@ -117,6 +117,6 @@ object Dependencies {
   val asm = "org.ow2.asm" % "asm" % asmVersion
   val asmUtil = "org.ow2.asm" % "asm-util" % asmVersion
 
-  val libdaemonjvm = "io.github.alexarchambault.libdaemon" %% "libdaemon" % "0.0.6"
+  val libdaemonjvm = "io.github.alexarchambault.libdaemon" %% "libdaemon" % "0.0.8"
   val ipcsocket = "io.github.alexarchambault.tmp.ipcsocket" % "ipcsocket" % "1.4.1-aa-5-1"
 }

From b002070fcd3cc5db99d0fdf526a3c601d46cfd2a Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Fri, 17 Dec 2021 14:25:18 +0100
Subject: [PATCH 3/3] Add retry around flaky test

---
 frontend/src/test/scala/bloop/DeduplicationSpec.scala | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/src/test/scala/bloop/DeduplicationSpec.scala b/frontend/src/test/scala/bloop/DeduplicationSpec.scala
index 3642078f29..9604e04ec7 100644
--- a/frontend/src/test/scala/bloop/DeduplicationSpec.scala
+++ b/frontend/src/test/scala/bloop/DeduplicationSpec.scala
@@ -458,6 +458,11 @@ object DeduplicationSpec extends bloop.bsp.BspBaseSuite {
   }
 
   test("three concurrent clients receive error diagnostics appropriately") {
+    TestUtil.retry() {
+      threeConcurrentClientsDiagnosticsTest()
+    }
+  }
+  def threeConcurrentClientsDiagnosticsTest(): Unit = {
     val logger = new RecordingLogger(ansiCodesSupported = false)
     TestUtil.withinWorkspace { workspace =>
       object Sources {