diff --git a/build.sbt b/build.sbt index 78aa7c73..8b588c11 100644 --- a/build.sbt +++ b/build.sbt @@ -88,10 +88,10 @@ lazy val docs = project // Slick "extref.slick.base_url" -> s"https://scala-slick.org/doc/${Dependencies.SlickVersion}/%s", // Pekko - "extref.pekko.base_url" -> "https://pekko.apache.org/docs/pekko/current/%s", + "extref.pekko.base_url" -> s"https://pekko.apache.org/docs/pekko/${PekkoCoreDependency.default.link}/%s", "scaladoc.base_url" -> "https://pekko.apache.org/api/pekko-persistence-jdbc/current/", - "scaladoc.org.apache.pekko.base_url" -> "https://pekko.apache.org/api/pekko/current/", - "javadoc.org.apache.pekko.base_url" -> "https://pekko.apache.org/japi/pekko/current/", + "scaladoc.org.apache.pekko.base_url" -> s"https://pekko.apache.org/api/pekko/${PekkoCoreDependency.default.link}/", + "javadoc.org.apache.pekko.base_url" -> s"https://pekko.apache.org/japi/pekko/${PekkoCoreDependency.default.link}/", "javadoc.org.apache.pekko.link_style" -> "direct", // Java "javadoc.base_url" -> "https://docs.oracle.com/javase/8/docs/api/", diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b069883a..2ecefc6f 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -15,7 +15,7 @@ object Dependencies { val Scala213 = "2.13.13" val ScalaVersions = Seq(Scala212, Scala213) - val PekkoVersion = "1.0.1" + val PekkoVersion = PekkoCoreDependency.version val SlickVersion = "3.3.3" val ScalaTestVersion = "3.2.14" diff --git a/project/PekkoCoreDependency.scala b/project/PekkoCoreDependency.scala new file mode 100644 index 00000000..d94d06b0 --- /dev/null +++ b/project/PekkoCoreDependency.scala @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import com.github.pjfanning.pekkobuild.PekkoDependency + +object PekkoCoreDependency extends PekkoDependency { + override val checkProject: String = "pekko-cluster-sharding-typed" + override val module: Option[String] = None + override val currentVersion: String = "1.0.3" +} diff --git a/project/build.properties b/project/build.properties index 946611ef..bdf70377 100644 --- a/project/build.properties +++ b/project/build.properties @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -sbt.version=1.9.7 +sbt.version=1.10.1 diff --git a/project/plugins.sbt b/project/plugins.sbt index bb117b84..56a4daf8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,17 +7,20 @@ * This file is part of the Apache Pekko project, which was derived from Akka. */ +// commons-lang3 is needed by project/CopyrightHeader.scala +libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.17.0" + // compliance addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0") // release addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") -addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.31") -addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.10") -addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.11") +addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.32") +addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.3.4") +addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.12") // docs addSbtPlugin(("com.github.sbt" % "sbt-site-paradox" % "1.5.0").excludeAll( "com.lightbend.paradox", "sbt-paradox")) diff --git a/scripts/docker-compose.yml b/scripts/docker-compose.yml index 5f5983f6..a02955d6 100644 --- a/scripts/docker-compose.yml +++ b/scripts/docker-compose.yml @@ -1,40 +1,47 @@ -postgres: - image: postgres:latest - container_name: postgres-test - environment: - - "TZ=Europe/Amsterdam" - - "POSTGRES_USER=docker" - - "POSTGRES_PASSWORD=docker" - ports: - - "5432:5432" # credentials (docker:docker) +# For detailed information about docker-compose visit https://docs.docker.com/compose/ +# To start all docker containers required to execute the tests locally run: +# docker compose up -mysql: - image: mysql:latest - container_name: mysql-test - environment: - - "TZ=Europe/Amsterdam" - - "MYSQL_ROOT_PASSWORD=root" - ports: - - "3306:3306" # credentials (root:root) +version: '2.2' +services: + postgres: + image: postgres:latest + container_name: postgres-test + environment: + - "TZ=Europe/Amsterdam" + - "POSTGRES_USER=docker" + - "POSTGRES_PASSWORD=docker" + ports: + - "5432:5432" # credentials (docker:docker) -oracle: - image: oracleinanutshell/oracle-xe-11g - container_name: oracle-test - environment: - - "TZ=Europe/Amsterdam" - - "DBCA_TOTAL_MEMORY=1024" - ports: - - "1521:1521" # DB_CONN: credentials (system:oracle) + mysql: + image: mysql:latest + container_name: mysql-test + environment: + - "TZ=Europe/Amsterdam" + - "MYSQL_ROOT_PASSWORD=root" + ports: + - "3306:3306" # credentials (root:root) -sqlserver: - image: topaztechnology/mssql-server-linux - container_name: sqlserver-test - environment: - - "TZ=Europe/Amsterdam" - - "DBCA_TOTAL_MEMORY=1024" - - "ACCEPT_EULA=Y" - - "SQL_USER=docker" - - "SQL_PASSWORD=docker" - - "SQL_DB=docker" - ports: - - "1433:1433" # credentials (docker:docker) + oracle: + image: gvenzl/oracle-xe:21.3.0-slim-faststart + container_name: oracle-test + environment: + - "TZ=Europe/Amsterdam" + - "DBCA_TOTAL_MEMORY=1024" + - "ORACLE_PASSWORD=oracle" + ports: + - "1521:1521" # DB_CONN: credentials (system:oracle | pass: oracle) + + sqlserver: + image: topaztechnology/mssql-server-linux + container_name: sqlserver-test + environment: + - "TZ=Europe/Amsterdam" + - "DBCA_TOTAL_MEMORY=1024" + - "ACCEPT_EULA=Y" + - "SQL_USER=docker" + - "SQL_PASSWORD=docker" + - "SQL_DB=docker" + ports: + - "1433:1433" # credentials (docker:docker) diff --git a/scripts/launch-all.sh b/scripts/launch-all.sh index 568f3021..dd8db873 100755 --- a/scripts/launch-all.sh +++ b/scripts/launch-all.sh @@ -31,9 +31,9 @@ while true; do done; } -docker-compose -f scripts/docker-compose.yml kill -docker-compose -f scripts/docker-compose.yml rm -f -docker-compose -f scripts/docker-compose.yml up -d +docker compose -f scripts/docker-compose.yml kill +docker compose -f scripts/docker-compose.yml rm -f +docker compose -f scripts/docker-compose.yml up -d wait 3306 MySQL wait 5432 Postgres wait 1521 Oracle diff --git a/scripts/launch-mysql.sh b/scripts/launch-mysql.sh index 39e06fad..34065aa6 100755 --- a/scripts/launch-mysql.sh +++ b/scripts/launch-mysql.sh @@ -31,7 +31,7 @@ while true; do done; } -docker-compose -f scripts/docker-compose.yml kill mysql -docker-compose -f scripts/docker-compose.yml rm -f mysql -docker-compose -f scripts/docker-compose.yml up -d mysql +docker compose -f scripts/docker-compose.yml kill mysql +docker compose -f scripts/docker-compose.yml rm -f mysql +docker compose -f scripts/docker-compose.yml up -d mysql wait 3306 MySQL diff --git a/scripts/launch-oracle.sh b/scripts/launch-oracle.sh index 87a0085b..adf9acb7 100755 --- a/scripts/launch-oracle.sh +++ b/scripts/launch-oracle.sh @@ -31,7 +31,7 @@ while true; do done; } -docker-compose -f scripts/docker-compose.yml kill oracle -docker-compose -f scripts/docker-compose.yml rm -f oracle -docker-compose -f scripts/docker-compose.yml up -d oracle +docker compose -f scripts/docker-compose.yml kill oracle +docker compose -f scripts/docker-compose.yml rm -f oracle +docker compose -f scripts/docker-compose.yml up -d oracle wait 1521 Oracle diff --git a/scripts/launch-postgres.sh b/scripts/launch-postgres.sh index b24d7b2a..fbfaa7f8 100755 --- a/scripts/launch-postgres.sh +++ b/scripts/launch-postgres.sh @@ -31,7 +31,7 @@ while true; do done; } -docker-compose -f scripts/docker-compose.yml kill postgres -docker-compose -f scripts/docker-compose.yml rm -f postgres -docker-compose -f scripts/docker-compose.yml up -d postgres +docker compose -f scripts/docker-compose.yml kill postgres +docker compose -f scripts/docker-compose.yml rm -f postgres +docker compose -f scripts/docker-compose.yml up -d postgres wait 5432 Postgres diff --git a/scripts/launch-sqlserver.sh b/scripts/launch-sqlserver.sh index 081f2bdd..96fc6d58 100755 --- a/scripts/launch-sqlserver.sh +++ b/scripts/launch-sqlserver.sh @@ -31,7 +31,7 @@ while true; do done; } -docker-compose -f scripts/docker-compose.yml kill sqlserver -docker-compose -f scripts/docker-compose.yml rm -f sqlserver -docker-compose -f scripts/docker-compose.yml up -d sqlserver +docker compose -f scripts/docker-compose.yml kill sqlserver +docker compose -f scripts/docker-compose.yml rm -f sqlserver +docker compose -f scripts/docker-compose.yml up -d sqlserver wait 1433 SqlServer