diff --git a/app/mail/DefaultMails.scala b/app/mail/DefaultMails.scala index ae6ce6d554a..716c874f9c5 100755 --- a/app/mail/DefaultMails.scala +++ b/app/mail/DefaultMails.scala @@ -5,7 +5,7 @@ import models.user.User import utils.WkConf import views._ -import java.net.URL +import java.net.URI import javax.inject.Inject import scala.util.Try @@ -83,7 +83,7 @@ class DefaultMails @Inject()(conf: WkConf) { autoVerify: Boolean, organizationName: String, senderName: String): Mail = { - val host = Try { new URL(uri) }.toOption.getOrElse(uri) + val host = Try { new URI(uri) }.toOption.getOrElse(uri) Mail( from = defaultSender, subject = s"$senderName invited you to join their WEBKNOSSOS organization at $host", diff --git a/build.sbt b/build.sbt index 913f041ce7a..50aafc7c4d8 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ ThisBuild / scalaVersion := "2.13.16" ThisBuild / scapegoatVersion := "3.1.9" val failOnWarning = if (sys.props.contains("failOnWarning")) Seq("-Xfatal-warnings") else Seq() ThisBuild / scalacOptions ++= Seq( - "-release:11", + "-release:21", "-feature", "-deprecation", "-language:implicitConversions", @@ -21,7 +21,6 @@ ThisBuild / javacOptions ++= Seq( "-Xlint:unchecked", "-Xlint:deprecation" ) -ThisBuild / dependencyCheckAssemblyAnalyzerEnabled := Some(false) // Keep asset timestamps when assembling jar ThisBuild / packageOptions += Package.FixedTimestamp(Package.keepTimestamps) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index cc2c2a98469..85b5c675b2c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -13,17 +13,17 @@ object Dependencies { ) private val silhouetteVersion = "10.0.3" - private val brotliVersion = "1.19.0" + private val brotliVersion = "1.20.0" private val slickVersion = "3.5.2" - private val awsVersion = "2.32.24" + private val awsVersion = "2.35.5" private val scalapbVersion = scalapb.compiler.Version.scalapbVersion private val grpcVersion = scalapb.compiler.Version.grpcJavaVersion val utilDependencies: Seq[ModuleID] = Seq( // Play Web Framework. import play - "org.playframework" %% "play" % "3.0.8", + "org.playframework" %% "play" % "3.0.9", // Play’s JSON serialization. import play.api.libs.json - "org.playframework" %% "play-json" % "3.0.5", + "org.playframework" %% "play-json" % "3.0.6", // Sending emails. import org.apache.commons.mail "org.apache.commons" % "commons-email" % "1.6.0", // File utils. import org.apache.commons.io @@ -52,7 +52,7 @@ object Dependencies { // Protocol buffer GRPC health check for FossilDB. import io.grpc "io.grpc" % "grpc-services" % grpcVersion, // Streaming JSON parsing. import com.google.gson - "com.google.code.gson" % "gson" % "2.13.1", + "com.google.code.gson" % "gson" % "2.13.2", // Play WS Http client, used for RPC calls. import play.api.libs.ws ws, // Dependency Injection. import javax.inject.Inject @@ -70,13 +70,13 @@ object Dependencies { // AWS Transfer Manager for multipart uploads. import software.amazon.awssdk.transfer.s3 "software.amazon.awssdk" % "s3-transfer-manager" % awsVersion, // Google cloud storage client. import com.google.cloud.storage, import com.google.auth.oauth2 - "com.google.cloud" % "google-cloud-storage" % "2.55.0", + "com.google.cloud" % "google-cloud-storage" % "2.58.1", // Blosc compression. import dev.zarr.bloscjava "com.scalableminds" % "blosc-java" % "0.1-1.21.4", // Zstd compression. import org.apache.commons.compress "org.apache.commons" % "commons-compress" % "1.28.0", // Zstd compression native bindings. not imported - "com.github.luben" % "zstd-jni" % "1.5.7-4", + "com.github.luben" % "zstd-jni" % "1.5.7-5", // Brotli compression. import com.aayushatharva.brotli4j "com.aayushatharva.brotli4j" % "brotli4j" % brotliVersion, // Brotli compression native bindings. not imported @@ -104,11 +104,11 @@ object Dependencies { // End-to-end test specs specs2 % Test, // Writing XML. import com.sun.xml.txw2 - "org.glassfish.jaxb" % "txw2" % "4.0.5", + "org.glassfish.jaxb" % "txw2" % "4.0.6", // Makes txw2 write self-closing tags in xml (which we want). Not imported. "com.fasterxml.woodstox" % "woodstox-core" % "7.1.1", // Json Web Tokens (used for OIDC Auth). import pdi.jwt - "com.github.jwt-scala" %% "jwt-play-json" % "11.0.2", + "com.github.jwt-scala" %% "jwt-play-json" % "11.0.3", // SQL Queries. import slick "com.typesafe.slick" %% "slick" % slickVersion, // SQL Queries connection pool. not imported. @@ -116,9 +116,9 @@ object Dependencies { // SQL Queries class generation. Started with runner as slick.codegen.SourceCodeGenerator "com.typesafe.slick" %% "slick-codegen" % slickVersion, // SQL Queries postgres specifics. not imported. - "org.postgresql" % "postgresql" % "42.7.7", + "org.postgresql" % "postgresql" % "42.7.8", /// WebAuthn for passkey authentication. import com.webauthn4j - "com.webauthn4j" % "webauthn4j-core" % "0.29.5.RELEASE" exclude ("com.fasterxml.jackson.core", "jackson-databind"), + "com.webauthn4j" % "webauthn4j-core" % "0.29.7.RELEASE" exclude ("com.fasterxml.jackson.core", "jackson-databind"), ) val dependencyOverrides: Seq[ModuleID] = Seq( diff --git a/project/build.properties b/project/build.properties index 489e0a72d39..01a16ed1465 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.4 +sbt.version=1.11.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index 5dd5344e7f9..644a0aaa049 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ // play framework -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.7") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9") // buildinfo routes addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") @@ -14,10 +14,10 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.2.13") // check dependencies against published vulnerabilities with sbt dependencyCheck -addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "5.1.0") +addSbtPlugin("net.nmoncho" % "sbt-dependency-check" % "1.8.1") // protocol buffers -libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.19" +libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.20" // java native interface addSbtPlugin("com.github.sbt" % "sbt-jni" % "1.7.1") diff --git a/test/backend/UPathTestSuite.scala b/test/backend/UPathTestSuite.scala index b1de1d825d4..a59e4f37c94 100644 --- a/test/backend/UPathTestSuite.scala +++ b/test/backend/UPathTestSuite.scala @@ -8,7 +8,7 @@ class UPathTestSuite extends PlaySpec { "UPath" should { "Be constructable from well-formed string" in { assert(UPath.fromString("relative/elsewhere").exists(_.toString == "./relative/elsewhere")) - assert(UPath.fromString("./relative/elsewehere").exists(_.toString == "./relative/elsewehere")) + assert(UPath.fromString("./relative/elsewhere").exists(_.toString == "./relative/elsewhere")) assert(UPath.fromString("/absolute/somewhere").exists(_.toString == "/absolute/somewhere")) assert(UPath.fromString("/absolute/some$where").exists(_.toString == "/absolute/some$where")) assert(UPath.fromString("/absolute/with²Unicode").exists(_.toString == "/absolute/with²Unicode")) diff --git a/unreleased_changes/8880.md b/unreleased_changes/8880.md index 63931a201fb..cd1de37509d 100644 --- a/unreleased_changes/8880.md +++ b/unreleased_changes/8880.md @@ -1,2 +1,2 @@ ### Fixed -- Change that WEBKNOSSOS takes mapping types more friendly and defaults back to HDF5 in case the type is unkown. \ No newline at end of file +- Change that WEBKNOSSOS takes mapping types more friendly and defaults back to HDF5 in case the type is unknown. diff --git a/unreleased_changes/8981.md b/unreleased_changes/8981.md index 8c2f85609ec..45cc65de3f0 100644 --- a/unreleased_changes/8981.md +++ b/unreleased_changes/8981.md @@ -1,5 +1,5 @@ ### Fixed -- Fixed a bug where storage scans for dataset mags & attachments used accross multiple organizations would count some paths twice. +- Fixed a bug where storage scans for dataset mags & attachments used across multiple organizations would count some paths twice. ### Postgres Evolutions [144-improve-storage-scan.sql](conf/evolutions/144-improve-storage-scan.sql)