Merge branch 'main' into feat/split-license

dasch-swiss · Dec 2, 2024 · 32d2e71 · 32d2e71
2 parents 30cabe5 + 5a57108
commit 32d2e71
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## [31.0.0](https://github.com/dasch-swiss/dsp-api/compare/v30.22.0...v31.0.0) (2024-12-02)
+
+
+### ⚠ BREAKING CHANGES
+
+* Remove legacy Sipi upload mechanism (DEV-4260) ([#3414](https://github.com/dasch-swiss/dsp-api/issues/3414))
+
+### Maintenances
+
+* Dependency updates ([#3439](https://github.com/dasch-swiss/dsp-api/issues/3439)) ([43fe16a](https://github.com/dasch-swiss/dsp-api/commit/43fe16a2efea49f917d7c1d62e78edfe4f050a06))
+* Patch dependency updates ([#3437](https://github.com/dasch-swiss/dsp-api/issues/3437)) ([40f37ed](https://github.com/dasch-swiss/dsp-api/commit/40f37ed0c47215879a89390ddba101e3bd64f97b))
+
+
+### Enhancements
+
+* Add license and copyright attribution fallback (DEV-4352) ([#3433](https://github.com/dasch-swiss/dsp-api/issues/3433)) ([0a726e9](https://github.com/dasch-swiss/dsp-api/commit/0a726e9a20540840c3c4138ebb810044f71fbcab))
+* Remove legacy Sipi upload mechanism (DEV-4260) ([#3414](https://github.com/dasch-swiss/dsp-api/issues/3414)) ([b74a33c](https://github.com/dasch-swiss/dsp-api/commit/b74a33c5d368711250b7e3df3c323ef48acd1459))
+
 ## [30.22.0](https://github.com/dasch-swiss/dsp-api/compare/v30.21.0...v30.22.0) (2024-11-20)
 
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -32,9 +32,9 @@ object Dependencies {
   val ZioLoggingVersion           = "2.3.2"
   val ZioNioVersion               = "2.0.2"
   val ZioMetricsConnectorsVersion = "2.3.1"
-  val ZioPreludeVersion           = "1.0.0-RC34"
+  val ZioPreludeVersion           = "1.0.0-RC35"
   val ZioSchemaVersion            = "0.2.0"
-  val ZioVersion                  = "2.1.12"
+  val ZioVersion                  = "2.1.13"
 
   // ZIO
   val zio                   = "dev.zio"                       %% "zio"                       % ZioVersion
@@ -96,7 +96,7 @@ object Dependencies {
   val jwtSprayJson = "com.github.jwt-scala" %% "jwt-zio-json" % "10.0.1"
   // jwtSprayJson -> 9.0.2 is the latest version that's compatible with spray-json; if it wasn't for spray, this would be Scala 3 compatible
   val springSecurityCore =
-    "org.springframework.security" % "spring-security-core" % "6.3.4" exclude (
+    "org.springframework.security" % "spring-security-core" % "6.3.5" exclude (
       "commons-logging",
       "commons-logging",
     ) exclude ("org.springframework", "spring-aop")
@@ -121,7 +121,7 @@ object Dependencies {
   val pekkoTestkit       = "org.apache.pekko" %% "pekko-testkit"        % PekkoActorVersion
   val scalaTest          = "org.scalatest"    %% "scalatest"            % "3.2.19"
 
-  val testcontainers = "org.testcontainers" % "testcontainers" % "1.20.3"
+  val testcontainers = "org.testcontainers" % "testcontainers" % "1.20.4"
   val wiremock       = "org.wiremock"       % "wiremock"       % "3.9.2"
 
   // found/added by the plugin but deleted anyway

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.5
+sbt.version=1.10.6
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-30.22.0
+31.0.0