Merge 9704640 into 78f99df

.gitignore

@@ -29,11 +29,14 @@ TAGS
 # Scala
 *.sc
 
-# Metals
-.metals/*
-.bloop/*
-project/.bloop/*
-project/metals.sbt
+# bloop/metals/vscode
+.bloop/
+.metals/
+.vscode/
+metals.sbt
+
+# BSP
+.bsp/*
 
 # Mac
 .DS_Store

.travis.yml

@@ -5,7 +5,7 @@ jdk:
 language: scala
 
 scala:
-  - 2.13.3
+  - 2.13.4
   - 2.12.12
 
 sudo: required
@@ -23,7 +23,7 @@ jobs:
   include:
 
     - stage: integration-20.x
-      scala: 2.13.3
+      scala: 2.13.4
       env:
         - AKKA_TEST_TIMEFACTOR=1.5
         - AKKA_TEST_LOGLEVEL=OFF
@@ -39,46 +39,46 @@ jobs:
         - docker run -it --rm -v $HOME/certs:/certs:rw quay.io/ahjohannessen/es-gencert-cli:1.0.1 create-ca -out /certs/ca
         - docker run -it --rm -v $HOME/certs:/certs:rw quay.io/ahjohannessen/es-gencert-cli:1.0.1 create-node -ca-certificate /certs/ca/ca.crt -ca-key /certs/ca/ca.key -out /certs/node -ip-addresses 127.0.0.1
         - sudo chmod -R 777 $HOME/certs
-        - docker pull quay.io/ahjohannessen/eventstore-20.6.0-bionic
-        - docker run -d --rm --name eventstore-node-20 -p 2114:2113 -p 1114:1113 -v $HOME/certs:/certs -e EVENTSTORE_CERTIFICATE_FILE=/certs/node/node.crt -e EVENTSTORE_CERTIFICATE_PRIVATE_KEY_FILE=/certs/node/node.key -e EVENTSTORE_TRUSTED_ROOT_CERTIFICATES_PATH=/certs/ca -e EVENTSTORE_MEM_DB=True -e EVENTSTORE_ENABLE_EXTERNAL_TCP=True -e EVENTSTORE_RUN_PROJECTIONS=All quay.io/ahjohannessen/eventstore-20.6.0-bionic
+        - docker pull eventstore/eventstore:20.10.0-bionic
+        - docker run -d --rm --name eventstore-node-20 -p 2114:2113 -p 1114:1113 -v $HOME/certs:/certs -e EVENTSTORE_CERTIFICATE_FILE=/certs/node/node.crt -e EVENTSTORE_CERTIFICATE_PRIVATE_KEY_FILE=/certs/node/node.key -e EVENTSTORE_TRUSTED_ROOT_CERTIFICATES_PATH=/certs/ca -e EVENTSTORE_MEM_DB=True -e EVENTSTORE_ENABLE_EXTERNAL_TCP=True -e EVENTSTORE_RUN_PROJECTIONS=All eventstore/eventstore:20.10.0-bionic
       script:
         - sbt test:compile
         - travis_retry sbt -J-Dconfig.resource=es20-tls.conf it:test
 
     - stage: integration-5.x
-      scala: 2.13.3
+      scala: 2.13.4
       env:
         - AKKA_TEST_TIMEFACTOR=1.5
         - AKKA_TEST_LOGLEVEL=OFF
       before_install:
-        - docker pull eventstore/eventstore:release-5.0.8
-        - docker run -d --rm --name eventstore-node-5 -p 2113:2113 -p 1113:1113 -e EVENTSTORE_MEM_DB=True -e EVENTSTORE_STATS_PERIOD_SEC=2400 eventstore/eventstore:release-5.0.8
+        - docker pull eventstore/eventstore:release-5.0.9
+        - docker run -d --rm --name eventstore-node-5 -p 2113:2113 -p 1113:1113 -e EVENTSTORE_MEM_DB=True -e EVENTSTORE_STATS_PERIOD_SEC=2400 eventstore/eventstore:release-5.0.9
       script:
         - sbt test:compile
         - travis_retry sbt it:test
 
     - stage: integration-cluster-20.x
-      scala: 2.13.3
+      scala: 2.13.4
       env: AKKA_TEST_TIMEFACTOR=1.5 AKKA_TEST_LOGLEVEL=OFF
       before_install:
-        - docker pull quay.io/ahjohannessen/eventstore-20.6.0-bionic
+        - docker pull eventstore/eventstore:20.10.0-bionic
         - docker network create --subnet=172.18.0.0/16 es-net-20
-        - docker run -d --rm --name es1 --net=es-net-20 --ip 172.18.0.2 -p 2114:2113 -p 1114:1113 -e EVENTSTORE_DISCOVER_VIA_DNS=False -e EVENTSTORE_GOSSIP_SEED=172.18.0.3:2113,172.18.0.4:2113 -e EVENTSTORE_CLUSTER_SIZE=3 -e EVENTSTORE_INSECURE=True -e EVENTSTORE_MEM_DB=True -e EVENTSTORE_ENABLE_EXTERNAL_TCP=True quay.io/ahjohannessen/eventstore-20.6.0-bionic
-        - docker run -d --rm --name es2 --net=es-net-20 --ip 172.18.0.3 -p 2115:2113 -p 1115:1113 -e EVENTSTORE_DISCOVER_VIA_DNS=False -e EVENTSTORE_GOSSIP_SEED=172.18.0.2:2113,172.18.0.4:2113 -e EVENTSTORE_CLUSTER_SIZE=3 -e EVENTSTORE_INSECURE=True -e EVENTSTORE_MEM_DB=True -e EVENTSTORE_ENABLE_EXTERNAL_TCP=True quay.io/ahjohannessen/eventstore-20.6.0-bionic
-        - docker run -d --rm --name es3 --net=es-net-20 --ip 172.18.0.4 -p 2116:2113 -p 1116:1113 -e EVENTSTORE_DISCOVER_VIA_DNS=False -e EVENTSTORE_GOSSIP_SEED=172.18.0.2:2113,172.18.0.3:2113 -e EVENTSTORE_CLUSTER_SIZE=3 -e EVENTSTORE_INSECURE=True -e EVENTSTORE_MEM_DB=True -e EVENTSTORE_ENABLE_EXTERNAL_TCP=True quay.io/ahjohannessen/eventstore-20.6.0-bionic
+        - docker run -d --rm --name es1 --net=es-net-20 --ip 172.18.0.2 -p 2114:2113 -p 1114:1113 -e EVENTSTORE_DISCOVER_VIA_DNS=False -e EVENTSTORE_GOSSIP_SEED=172.18.0.3:2113,172.18.0.4:2113 -e EVENTSTORE_CLUSTER_SIZE=3 -e EVENTSTORE_INSECURE=True -e EVENTSTORE_MEM_DB=True -e EVENTSTORE_ENABLE_EXTERNAL_TCP=True eventstore/eventstore:20.10.0-bionic
+        - docker run -d --rm --name es2 --net=es-net-20 --ip 172.18.0.3 -p 2115:2113 -p 1115:1113 -e EVENTSTORE_DISCOVER_VIA_DNS=False -e EVENTSTORE_GOSSIP_SEED=172.18.0.2:2113,172.18.0.4:2113 -e EVENTSTORE_CLUSTER_SIZE=3 -e EVENTSTORE_INSECURE=True -e EVENTSTORE_MEM_DB=True -e EVENTSTORE_ENABLE_EXTERNAL_TCP=True eventstore/eventstore:20.10.0-bionic
+        - docker run -d --rm --name es3 --net=es-net-20 --ip 172.18.0.4 -p 2116:2113 -p 1116:1113 -e EVENTSTORE_DISCOVER_VIA_DNS=False -e EVENTSTORE_GOSSIP_SEED=172.18.0.2:2113,172.18.0.3:2113 -e EVENTSTORE_CLUSTER_SIZE=3 -e EVENTSTORE_INSECURE=True -e EVENTSTORE_MEM_DB=True -e EVENTSTORE_ENABLE_EXTERNAL_TCP=True eventstore/eventstore:20.10.0-bionic
       script:
         - sbt test:compile
         - travis_retry sbt c:test
 
     - stage: integration-cluster-5.x
-      scala: 2.13.3
+      scala: 2.13.4
       env: AKKA_TEST_TIMEFACTOR=1.5 AKKA_TEST_LOGLEVEL=OFF
       before_install:
-        - docker pull eventstore/eventstore:release-5.0.8
+        - docker pull eventstore/eventstore:release-5.0.9
         - docker network create --subnet=172.20.0.0/16 es-net-5
-        - docker run -d --rm --name es1 --net=es-net-5 --ip 172.20.0.2 -p 2114:2113 -p 1114:1113 -e EVENTSTORE_DISCOVER_VIA_DNS=False -e EVENTSTORE_GOSSIP_SEED=172.20.0.3:2112,172.20.0.4:2112 -e EVENTSTORE_CLUSTER_SIZE=3 -e EVENTSTORE_MEM_DB=True eventstore/eventstore:release-5.0.8
-        - docker run -d --rm --name es2 --net=es-net-5 --ip 172.20.0.3 -p 2115:2113 -p 1115:1113 -e EVENTSTORE_DISCOVER_VIA_DNS=False -e EVENTSTORE_GOSSIP_SEED=172.20.0.2:2112,172.20.0.4:2112 -e EVENTSTORE_CLUSTER_SIZE=3 -e EVENTSTORE_MEM_DB=True eventstore/eventstore:release-5.0.8
-        - docker run -d --rm --name es3 --net=es-net-5 --ip 172.20.0.4 -p 2116:2113 -p 1116:1113 -e EVENTSTORE_DISCOVER_VIA_DNS=False -e EVENTSTORE_GOSSIP_SEED=172.20.0.2:2112,172.20.0.3:2112 -e EVENTSTORE_CLUSTER_SIZE=3 -e EVENTSTORE_MEM_DB=True eventstore/eventstore:release-5.0.8
+        - docker run -d --rm --name es1 --net=es-net-5 --ip 172.20.0.2 -p 2114:2113 -p 1114:1113 -e EVENTSTORE_DISCOVER_VIA_DNS=False -e EVENTSTORE_GOSSIP_SEED=172.20.0.3:2112,172.20.0.4:2112 -e EVENTSTORE_CLUSTER_SIZE=3 -e EVENTSTORE_MEM_DB=True eventstore/eventstore:release-5.0.9
+        - docker run -d --rm --name es2 --net=es-net-5 --ip 172.20.0.3 -p 2115:2113 -p 1115:1113 -e EVENTSTORE_DISCOVER_VIA_DNS=False -e EVENTSTORE_GOSSIP_SEED=172.20.0.2:2112,172.20.0.4:2112 -e EVENTSTORE_CLUSTER_SIZE=3 -e EVENTSTORE_MEM_DB=True eventstore/eventstore:release-5.0.9
+        - docker run -d --rm --name es3 --net=es-net-5 --ip 172.20.0.4 -p 2116:2113 -p 1116:1113 -e EVENTSTORE_DISCOVER_VIA_DNS=False -e EVENTSTORE_GOSSIP_SEED=172.20.0.2:2112,172.20.0.3:2112 -e EVENTSTORE_CLUSTER_SIZE=3 -e EVENTSTORE_MEM_DB=True eventstore/eventstore:release-5.0.9
       script:
         - sbt test:compile
         - travis_retry sbt c:test

README.md

@@ -3,15 +3,15 @@
 <table border="0">
   <tr>
     <td><a href="http://www.scala-lang.org">Scala</a> </td>
-    <td>2.13.3 / 2.12.12</td>
+    <td>2.13.4 / 2.12.13</td>
   </tr>
   <tr>
     <td><a href="http://akka.io">Akka</a> </td>
-    <td>2.6.8</td>
+    <td>2.6.12</td>
   </tr>
   <tr>
     <td><a href="https://eventstore.org">Event Store</a></td>
-    <td>v5.x is supported - v20.x using non-TLS is supported</td>    
+    <td>v5.x and v20.x are supported</td>    
   </tr>
 </table>
 
@@ -51,15 +51,15 @@ connection ! ReadEvent(EventStream.Id("my-stream"), EventNumber.First)
 
 #### Sbt
 ```scala
-libraryDependencies += "com.geteventstore" %% "eventstore-client" % "7.2.0"
+libraryDependencies += "com.geteventstore" %% "eventstore-client" % "7.3.1"
 ```
 
 #### Maven
 ```xml
 <dependency>
     <groupId>com.geteventstore</groupId>
     <artifactId>eventstore-client_${scala.version}</artifactId>
-    <version>7.2.0</version>
+    <version>7.3.1</version>
 </dependency>
 ```
 
@@ -449,7 +449,7 @@ object ListAllStreamsExample extends App {
 ### Reactive Streams
 
 You can use generic [Reactive Streams](http://www.reactive-streams.org) `Publisher` interface for EventStore subscriptions, 
-by converting an Akka Stream to Publisher. See: [Integrating Akka Streams with Reactive Streams](https://doc.akka.io/docs/akka/2.5.3/scala/stream/stream-integrations.html#integrating-with-reactive-streams)
+by converting an Akka Stream to Publisher. See: [Integrating Akka Streams with Reactive Streams](https://doc.akka.io/docs/akka/2.6/stream/reactive-streams-interop.html)
 
 Here is a short example on how to accomplish that:
 

build.sbt

@@ -6,7 +6,7 @@ lazy val commonSettings = Seq(
 
   organization         := "com.geteventstore",
   scalaVersion         := crossScalaVersions.value.head,
-  crossScalaVersions   := Seq("2.13.3", "2.12.12"),
+  crossScalaVersions   := Seq("2.13.4", "2.12.13"),
   releaseCrossBuild    := true,
   licenses             := Seq("BSD 3-Clause" -> url("http://raw.github.com/EventStore/EventStore.JVM/master/LICENSE")),
   homepage             := Some(new URL("http://github.com/EventStore/EventStore.JVM")),

client/src/main/scala/eventstore/akka/EventStoreExtension.scala

@@ -19,7 +19,7 @@ class EventStoreExtension(system: ActorSystem) extends Extension {
 }
 
 object EventStoreExtension extends ExtensionId[EventStoreExtension] with ExtensionIdProvider {
-  def lookup() = EventStoreExtension
+  def lookup: ExtensionId[EventStoreExtension] = EventStoreExtension
 
   def createExtension(system: ExtendedActorSystem): EventStoreExtension = new EventStoreExtension(system)
 

client/src/test/scala/eventstore/akka/cluster/ClusterDiscovererActorSpec.scala

@@ -37,7 +37,7 @@ class ClusterDiscovererActorSpec extends ActorSpec {
       expectFailure
 
       override def settings = super.settings.copy(
-        gossipSeedsOrDns = ClusterDns("test"),
+        gossipSeedsOrDns = ClusterDns("nobody"),
         dnsLookupTimeout = 300.millis
       )
     }

core/src/test/scala/eventstore/core/cluster/ResolveDnsSpec.scala

@@ -18,8 +18,8 @@ class ResolveDnsSpec extends Specification {
       ResolveDns("google.com", timeout) must not be empty
     }
 
-    "not resolve test" in {
-      ResolveDns("test", timeout) must throwAn[ClusterException]
+    "not resolve nobody" in {
+      ResolveDns("nobody", timeout) must throwAn[ClusterException]
     }
   }
 }

project/Dependencies.scala

@@ -4,23 +4,23 @@ object Dependencies {
 
   val protobufVersion = "3.7.1"
 
-  val `ts-config`   = "com.typesafe" %  "config"      % "1.4.0"
-  val `scodec-bits` = "org.scodec"   %% "scodec-bits" % "1.1.18"
-  val `spray-json`  = "io.spray"     %% "spray-json"  % "1.3.5"
-  val specs2        = "org.specs2"   %% "specs2-core" % "4.10.3"
+  val `ts-config`   = "com.typesafe" %  "config"      % "1.4.1"
+  val `scodec-bits` = "org.scodec"   %% "scodec-bits" % "1.1.24"
+  val `spray-json`  = "io.spray"     %% "spray-json"  % "1.3.6"
+  val specs2        = "org.specs2"   %% "specs2-core" % "4.10.6"
 
   ///
 
   object Akka {
-    private val version = "2.6.8"
+    private val version = "2.6.12"
     val actor            = "com.typesafe.akka" %% "akka-actor"          % version
     val stream           = "com.typesafe.akka" %% "akka-stream"         % version
     val testkit          = "com.typesafe.akka" %% "akka-testkit"        % version
     val `stream-testkit` = "com.typesafe.akka" %% "akka-stream-testkit" % version
   }
 
   object AkkaHttp {
-    private val version = "10.2.0"
+    private val version = "10.2.3"
     val http              = "com.typesafe.akka" %% "akka-http"            % version
     val `http-spray-json` = "com.typesafe.akka" %% "akka-http-spray-json" % version
   }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.13
+sbt.version=1.4.7

project/plugins.sbt

@@ -2,7 +2,7 @@ addSbtPlugin("com.github.gseitz" % "sbt-protobuf" % "0.6.4")
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
 
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.11")
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5")
 
@@ -12,6 +12,6 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
 
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")
 
-addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.13")
+addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.16")
 
 libraryDependencies += "com.github.os72" % "protoc-jar" % "3.7.0"