Merge branch 'main' into feature/dev-3326-add-sequence-to-knora-base

.github/workflows/build-and-test-empty.yml

@@ -21,14 +21,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Skip with success
-        run: echo "skipped"
+        run: |
+          echo "skipped"
+          exit 0
 
   integration-test:
     name: Build and integration-test
     runs-on: ubuntu-latest
     steps:
       - name: Skip with success
-        run: echo "skipped"
+        run: |
+          echo "skipped"
+          exit 0
 
   test-client-test-data:
     name: Test client-test-data

.scalafix.conf

@@ -17,7 +17,7 @@ OrganizeImports {
   importsOrder = Ascii
   preset = DEFAULT
   removeUnused = true
-  targetDialect = Scala3
+  targetDialect = Scala2
 }
 
 RemoveUnused {

CHANGELOG.md

@@ -1,5 +1,54 @@
 # Changelog
 
+## [30.10.0](https://github.com/dasch-swiss/dsp-api/compare/v30.9.0...v30.10.0) (2024-03-22)
+
+
+### Maintenance
+
+* Dependency updates ([#3122](https://github.com/dasch-swiss/dsp-api/issues/3122)) ([e9cb379](https://github.com/dasch-swiss/dsp-api/commit/e9cb37958ca1cced36c433371635866643618d71))
+* Fix never-ending jobs in release PRs ([#3114](https://github.com/dasch-swiss/dsp-api/issues/3114)) ([f2f1fc9](https://github.com/dasch-swiss/dsp-api/commit/f2f1fc909eb221b51766e51a6232092c5b59493b))
+* Fix typo in Makefile ([#3108](https://github.com/dasch-swiss/dsp-api/issues/3108)) ([de31c94](https://github.com/dasch-swiss/dsp-api/commit/de31c94091bf939f9ef14e27ee1b6cc4324a1a5e))
+* Improve test for serving ontologies in different formats ([#3115](https://github.com/dasch-swiss/dsp-api/issues/3115)) ([a010275](https://github.com/dasch-swiss/dsp-api/commit/a010275a3930f1aaddab4f33bcba024b4d1e814e))
+* **knora-admin:** Remove unused Institution class and its properties (DEV-3365) ([#3109](https://github.com/dasch-swiss/dsp-api/issues/3109)) ([7e3664d](https://github.com/dasch-swiss/dsp-api/commit/7e3664d20cdcc2f5b67666095771e858df0a73ad))
+* Major dependency updates ([#3121](https://github.com/dasch-swiss/dsp-api/issues/3121)) ([e2e57c1](https://github.com/dasch-swiss/dsp-api/commit/e2e57c1b26d86291c4228acaab51ea61f48b8142))
+* Merge StringLiteralV2 classes ([#3133](https://github.com/dasch-swiss/dsp-api/issues/3133)) ([70cced2](https://github.com/dasch-swiss/dsp-api/commit/70cced277eccd5cf9eefa6d95591c957b5de88c8))
+* Migrate GET /version and /health to tapir (DEV-3286, DEV-3287) ([#3110](https://github.com/dasch-swiss/dsp-api/issues/3110)) ([c7d69aa](https://github.com/dasch-swiss/dsp-api/commit/c7d69aab48a5b1b54592d2d4e0d06cb142840746))
+* Minor dependency updates ([#3120](https://github.com/dasch-swiss/dsp-api/issues/3120)) ([564bdcf](https://github.com/dasch-swiss/dsp-api/commit/564bdcf1ce1addc9f2888b6a9618d96a6ec13616))
+* Modularize layers  ([#3132](https://github.com/dasch-swiss/dsp-api/issues/3132)) ([9ef26c9](https://github.com/dasch-swiss/dsp-api/commit/9ef26c94d3ad9c4a71280b067382dd3d2212a605))
+* Move test for serving ontologies in different formats to separate file ([#3127](https://github.com/dasch-swiss/dsp-api/issues/3127)) ([9a48e23](https://github.com/dasch-swiss/dsp-api/commit/9a48e239e478b15d15d15119047cb7fbccbe09a6))
+* Patch dependency updates ([#3119](https://github.com/dasch-swiss/dsp-api/issues/3119)) ([3a5194f](https://github.com/dasch-swiss/dsp-api/commit/3a5194fa3ba0712c28e2e7160802621ec9de52bb))
+* Remove accessible makro (Scala3 perparation) ([#3135](https://github.com/dasch-swiss/dsp-api/issues/3135)) ([30e4f06](https://github.com/dasch-swiss/dsp-api/commit/30e4f06c4588d04202d0c96c6bff353ef2895271))
+* Remove methods from projects responder, clean up ProjectIri ([#3137](https://github.com/dasch-swiss/dsp-api/issues/3137)) ([b4eec85](https://github.com/dasch-swiss/dsp-api/commit/b4eec85a34eb39e74892b9c11bd39d806ca0fce3))
+* Remove zio.accessible makro (Scala3 migration) ([#3126](https://github.com/dasch-swiss/dsp-api/issues/3126)) ([d753fcc](https://github.com/dasch-swiss/dsp-api/commit/d753fcc24270096befbe2a44399e496f2b012b2e))
+* Rename ProjectADM and service to Project ([#3130](https://github.com/dasch-swiss/dsp-api/issues/3130)) ([fc1dc53](https://github.com/dasch-swiss/dsp-api/commit/fc1dc5383901429de6ac70d84165515327671fe0))
+* Revert the import style to Scala 2 ([#3138](https://github.com/dasch-swiss/dsp-api/issues/3138)) ([96ee921](https://github.com/dasch-swiss/dsp-api/commit/96ee92133f1eace6aaf6bfb40d3008771217fb86))
+* Simplify ActorSystem layer ([#3123](https://github.com/dasch-swiss/dsp-api/issues/3123)) ([292f7eb](https://github.com/dasch-swiss/dsp-api/commit/292f7eb34733e42098edc5406c73d4d9361d21d2))
+* Split CreateResourcesV2Handler from ResourcesResponderV2 (D… ([#3118](https://github.com/dasch-swiss/dsp-api/issues/3118)) ([24b691a](https://github.com/dasch-swiss/dsp-api/commit/24b691ab9b029bab20056efa2d80e79acff060f0))
+* Start release PRs as drafts ([#3111](https://github.com/dasch-swiss/dsp-api/issues/3111)) ([b76e538](https://github.com/dasch-swiss/dsp-api/commit/b76e53853351602c8d08123edb3db76504f2d54c))
+* Successfully skip `check-formatting` job on release PRs ([#3113](https://github.com/dasch-swiss/dsp-api/issues/3113)) ([1d35cad](https://github.com/dasch-swiss/dsp-api/commit/1d35cad3ceebc7c0d7dbce3f0e022a510187bfd0))
+* Update dsp-app to v11.7.1 ([#3105](https://github.com/dasch-swiss/dsp-api/issues/3105)) ([9851405](https://github.com/dasch-swiss/dsp-api/commit/9851405dfe0621a82a91596bf610949750cfa291))
+
+
+### Documentation
+
+* Add Examples to /admin/groups endpoints ([#3107](https://github.com/dasch-swiss/dsp-api/issues/3107)) ([bbb0e65](https://github.com/dasch-swiss/dsp-api/commit/bbb0e65c761af3c507e7fa3805b8e80df66f6fe0))
+* Integrate OpenApi generated documentation for admin api (DEV-3381) ([#3104](https://github.com/dasch-swiss/dsp-api/issues/3104)) ([241ea9b](https://github.com/dasch-swiss/dsp-api/commit/241ea9b3dc2f436277ad968ff0d9a379713cf0fb))
+* Lint with markdownlint ([#3128](https://github.com/dasch-swiss/dsp-api/issues/3128)) ([2b7d239](https://github.com/dasch-swiss/dsp-api/commit/2b7d2398a3849b14d368c87738b12dd6cd1d4f4f))
+
+
+### Enhancements
+
+* Add additional project export route that awaits the process ([#3136](https://github.com/dasch-swiss/dsp-api/issues/3136)) ([70e0172](https://github.com/dasch-swiss/dsp-api/commit/70e0172378926f4fd285a7718fcd1ee7f2de2fa3))
+
+
+### Bug Fixes
+
+* Disable broken upgrade plugins ([#3117](https://github.com/dasch-swiss/dsp-api/issues/3117)) ([6714898](https://github.com/dasch-swiss/dsp-api/commit/6714898bc9838312ac753ddbd570673705fc4e1e))
+* Enable upgrade plugins with custom graphs ([#3124](https://github.com/dasch-swiss/dsp-api/issues/3124)) ([4186b5f](https://github.com/dasch-swiss/dsp-api/commit/4186b5ff5ade853ad4e8679de2400a548580184b))
+* Ensure all project's restricted view settings are correctly persisted ([#3125](https://github.com/dasch-swiss/dsp-api/issues/3125)) ([51cde02](https://github.com/dasch-swiss/dsp-api/commit/51cde02c86fdea4dc4712b2cc6487049d05aaa0f))
+* In Sipi use size fallback only when api failed to return a setting (DEV-3409) ([#3112](https://github.com/dasch-swiss/dsp-api/issues/3112)) ([172041a](https://github.com/dasch-swiss/dsp-api/commit/172041ae96b6a5a35d3842e47045573289d67ae8))
+* Remove invalid watermark triples (DEV-3418) ([#3116](https://github.com/dasch-swiss/dsp-api/issues/3116)) ([e563ab9](https://github.com/dasch-swiss/dsp-api/commit/e563ab95b6d9c052e39b544e020d65c7ecb29476))
+
 ## [30.9.0](https://github.com/dasch-swiss/dsp-api/compare/v30.8.2...v30.9.0) (2024-03-07)
 
 

integration/src/test/scala/org/knora/sipi/SipiIT.scala

@@ -7,21 +7,21 @@ package org.knora.sipi
 
 import com.github.tomakehurst.wiremock.WireMockServer
 import com.github.tomakehurst.wiremock.client.CountMatchingStrategy
-import com.github.tomakehurst.wiremock.client.WireMock.*
+import com.github.tomakehurst.wiremock.client.WireMock._
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration.options
 import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder
 import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.newRequestPattern
-import zio.*
-import zio.http.*
+import zio._
+import zio.http._
 import zio.json.DecoderOps
 import zio.json.ast.Json
-import zio.test.*
+import zio.test._
 
 import scala.util.Failure
 import scala.util.Success
 import scala.util.Try
 
-import org.knora.sipi.MockDspApiServer.verify.*
+import org.knora.sipi.MockDspApiServer.verify._
 import org.knora.webapi.config.AppConfig
 import org.knora.webapi.messages.admin.responder.projectsmessages.PermissionCodeAndProjectRestrictedViewSettings
 import org.knora.webapi.messages.util.KnoraSystemInstances.Users.SystemUser

integration/src/test/scala/org/knora/webapi/CoreSpec.scala

@@ -12,8 +12,8 @@ import org.apache.pekko.testkit.TestKitBase
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
-import zio.*
 import zio.ZIO
+import zio._
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.duration.FiniteDuration

integration/src/test/scala/org/knora/webapi/E2ESpec.scala

@@ -5,14 +5,14 @@
 
 package org.knora.webapi
 
-import com.typesafe.scalalogging.*
+import com.typesafe.scalalogging._
 import org.apache.pekko
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
-import spray.json.*
-import zio.*
+import spray.json._
+import zio._
 
 import java.nio.file.Files
 import java.nio.file.Path
@@ -30,7 +30,7 @@ import org.knora.webapi.core.TestStartupUtils
 import org.knora.webapi.messages.store.sipimessages.SipiUploadResponse
 import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject
 import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol
-import org.knora.webapi.messages.util.rdf.*
+import org.knora.webapi.messages.util.rdf._
 import org.knora.webapi.routing.KnoraRouteData
 import org.knora.webapi.routing.UnsafeZioRun
 import org.knora.webapi.testservices.FileToUpload
@@ -39,7 +39,7 @@ import org.knora.webapi.util.FileUtil
 import org.knora.webapi.util.LogAspect
 
 import pekko.http.scaladsl.client.RequestBuilding
-import pekko.http.scaladsl.model.*
+import pekko.http.scaladsl.model._
 import pekko.testkit.TestKitBase
 
 /**

integration/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala

@@ -9,13 +9,13 @@ import com.typesafe.scalalogging.LazyLogging
 import com.typesafe.scalalogging.Logger
 import org.apache.pekko
 import org.apache.pekko.http.scaladsl.client.RequestBuilding
-import org.apache.pekko.http.scaladsl.model.*
+import org.apache.pekko.http.scaladsl.model._
 import org.apache.pekko.testkit.TestKitBase
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
-import spray.json.*
-import zio.*
+import spray.json._
+import zio._
 
 import java.util.concurrent.TimeUnit
 import scala.concurrent.Await
@@ -28,7 +28,7 @@ import org.knora.webapi.core.AppRouter
 import org.knora.webapi.core.AppServer
 import org.knora.webapi.core.LayersTest.DefaultTestEnvironmentWithSipi
 import org.knora.webapi.core.TestStartupUtils
-import org.knora.webapi.messages.store.sipimessages.*
+import org.knora.webapi.messages.store.sipimessages._
 import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject
 import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol
 import org.knora.webapi.messages.util.rdf.JsonLDDocument

integration/src/test/scala/org/knora/webapi/ITTestDataFactory.scala

@@ -5,7 +5,7 @@
 
 package org.knora.webapi
 
-import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.*
+import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._
 
 /**
  * Helps in creating value objects for tests.

integration/src/test/scala/org/knora/webapi/R2RSpec.scala

@@ -13,7 +13,7 @@ import org.apache.pekko.http.scaladsl.testkit.ScalatestRouteTest
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
-import zio.*
+import zio._
 
 import java.nio.file.Files
 import java.nio.file.Path
@@ -28,7 +28,7 @@ import org.knora.webapi.config.AppConfig
 import org.knora.webapi.core.AppServer
 import org.knora.webapi.core.TestStartupUtils
 import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject
-import org.knora.webapi.messages.util.rdf.*
+import org.knora.webapi.messages.util.rdf._
 import org.knora.webapi.routing.KnoraRouteData
 import org.knora.webapi.routing.UnsafeZioRun
 import org.knora.webapi.util.FileUtil

integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainers.scala

@@ -6,8 +6,8 @@
 package org.knora.webapi.config
 
 import com.typesafe.config.ConfigFactory
-import zio.*
-import zio.config.*
+import zio._
+import zio.config._
 import zio.config.typesafe.TypesafeConfigProvider
 
 import org.knora.webapi.config.AppConfig.AppConfigurations

integration/src/test/scala/org/knora/webapi/config/AppConfigForTestContainersZSpec.scala

@@ -5,8 +5,8 @@
 
 package org.knora.webapi.config
 
-import zio.*
-import zio.test.*
+import zio._
+import zio.test._
 
 import org.knora.webapi.testcontainers.DspIngestTestContainer
 import org.knora.webapi.testcontainers.FusekiTestContainer

integration/src/test/scala/org/knora/webapi/core/ActorSystemTest.scala

@@ -6,7 +6,7 @@
 package org.knora.webapi.core
 
 import org.apache.pekko.actor.ActorSystem
-import zio.*
+import zio._
 
 object ActorSystemTest {
   def layer(sys: ActorSystem): ZLayer[Any, Nothing, ActorSystem] = ZLayer.succeed(sys)