Merge branch 'master' into fts

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "2.6.0"
+version = "2.6.1"
 
 preset = defaultWithAlign
 

modules/backend/src/main/scala/docspell/backend/ops/OUpload.scala

@@ -86,7 +86,8 @@ object OUpload {
     def noSource: UploadResult = NoSource
 
     /** When adding files to an item, no item was found using the given
-      * item-id. */
+      * item-id.
+      */
     case object NoItem extends UploadResult
 
     def noItem: UploadResult = NoItem

modules/common/src/main/scala/docspell/common/CollectiveState.scala

@@ -11,14 +11,16 @@ object CollectiveState {
 
   /** A collective may be readonly in cases it is implicitly closed
     * (e.g. no payment). Users can still see there data and
-    * download, but have no write access. */
+    * download, but have no write access.
+    */
   case object ReadOnly extends CollectiveState
 
   /** A collective that has been explicitely closed. */
   case object Closed extends CollectiveState
 
   /** A collective blocked by a super user, usually some emergency
-    * action. */
+    * action.
+    */
   case object Blocked extends CollectiveState
 
   def fromString(s: String): Either[String, CollectiveState] =

modules/common/src/main/scala/docspell/common/JobState.scala

@@ -13,7 +13,8 @@ object JobState {
   case object Waiting extends JobState {}
 
   /** A scheduler has picked up this job and will pass it to the next
-    * free slot. */
+    * free slot.
+    */
   case object Scheduled extends JobState {}
 
   /** Is currently executing */

project/Dependencies.scala

@@ -32,7 +32,7 @@ object Dependencies {
   val StanfordNlpVersion      = "3.9.2"
   val TikaVersion             = "1.24.1"
   val YamuscaVersion          = "0.6.2"
-  val SwaggerUIVersion        = "3.26.1"
+  val SwaggerUIVersion        = "3.27.0"
   val SemanticUIVersion       = "2.4.1"
   val TwelveMonkeysVersion    = "3.5"
   val JQueryVersion           = "3.5.1"

project/NerModelsPlugin.scala

@@ -20,30 +20,34 @@ object NerModelsPlugin extends AutoPlugin {
   object autoImport {
     val NerModels = config("NerModels")
 
-    val nerModelsFilter = settingKey[String => Boolean]("Which files to keep.")
+    val nerModelsFilter    = settingKey[String => Boolean]("Which files to keep.")
     val nerModelsRunFilter = taskKey[Seq[File]]("Extract files from libraryDependencies")
 
   }
 
   import autoImport._
 
-  def nerModelSettings: Seq[Setting[_]] = Seq(
+  def nerModelSettings: Seq[Setting[_]] =
-    nerModelsFilter := (_ => false),
+    Seq(
-    nerModelsRunFilter := {
+      nerModelsFilter := (_ => false),
-      filterArtifacts(streams.value.log
+      nerModelsRunFilter := {
-        , Classpaths.managedJars(NerModels, Set("jar", "zip"), update.value)
+        filterArtifacts(
-        , nerModelsFilter.value
+          streams.value.log,
-        , (Compile/resourceManaged).value)
+          Classpaths.managedJars(NerModels, Set("jar", "zip"), update.value),
-    },
+          nerModelsFilter.value,
-    Compile / resourceGenerators += nerModelsRunFilter.taskValue
+          (Compile / resourceManaged).value
-  )
+        )
+      },
+      Compile / resourceGenerators += nerModelsRunFilter.taskValue
+    )
 
-  def nerClassifierSettings: Seq[Setting[_]] = Seq(
+  def nerClassifierSettings: Seq[Setting[_]] =
-    libraryDependencies ++= Dependencies.stanfordNlpModels.map(_ % NerModels),
+    Seq(
-    nerModelsFilter := {
+      libraryDependencies ++= Dependencies.stanfordNlpModels.map(_ % NerModels),
-      name => nerModels.exists(name.endsWith)
+      nerModelsFilter := { name =>
-    }
+        nerModels.exists(name.endsWith)
-  )
+      }
+    )
 
   override def projectConfigurations: Seq[Configuration] =
     Seq(NerModels)
@@ -51,11 +55,16 @@ object NerModelsPlugin extends AutoPlugin {
   override def projectSettings: Seq[Setting[_]] =
     nerModelSettings
 
-  def filterArtifacts(logger: Logger, cp: Classpath, nameFilter: NameFilter, out: File): Seq[File] = {
+  def filterArtifacts(
+      logger: Logger,
+      cp: Classpath,
+      nameFilter: NameFilter,
+      out: File
+  ): Seq[File] = {
     logger.info(s"NerModels: Filtering artifacts...")
-    cp.files.flatMap(f => {
+    cp.files.flatMap { f =>
       IO.unzip(f, out, nameFilter)
-    })
+    }
   }
 
   private val nerModels = List(

project/plugins.sbt

@@ -8,4 +8,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.3")
 addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.2")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.2")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.3")