Upgrade to container core 9.1 (#386)

* Upgrade to container core 9.1 * Replace slf4j dep with slf4j2 for compatibility with the API dep
VEuPathDB · Mar 6, 2025 · 77ea649 · 77ea649
1 parent 9dd8c2c
commit 77ea649
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [libraries]
 
 # VPDB
-fgputil-db = { group = "org.gusdb", name = "fgputil-db", version = "2.15.2-jakarta" }
+fgputil-db = { group = "org.gusdb", name = "fgputil-db", version = "2.16.0-jakarta" }
 
-container-core      = { group = "org.veupathdb.lib", name = "jaxrs-container-core",   version = "8.0.0" }
+container-core      = { group = "org.veupathdb.lib", name = "jaxrs-container-core",   version = "9.1.1" }
 container-multipart = { group = "org.veupathdb.lib", name = "multipart-jackson-pojo", version = "1.1.7" }
 
 vdi-common = { group = "org.veupathdb.vdi", name = "vdi-component-common", version = "17.1.5" }
@@ -15,11 +15,11 @@ db-driver-oracle   = { group = "com.oracle.database.jdbc", name = "ojdbc8",
 db-driver-postgres = { group = "org.postgresql",           name = "postgresql", version = "42.7.5"       }
 
 # Logging
-log-slf4j        = { group = "org.slf4j",                name = "slf4j-api",        version = "1.7.36" }
-log-log4j-api    = { group = "org.apache.logging.log4j", name = "log4j-api",        version = "2.24.3" }
-log-log4j-core   = { group = "org.apache.logging.log4j", name = "log4j-core",       version = "2.24.3" }
-log-log4j-slf4j  = { group = "org.apache.logging.log4j", name = "log4j-slf4j-impl", version = "2.24.3" }
-log-log4j-kotlin = { group = "org.apache.logging.log4j", name = "log4j-api-kotlin", version = "1.5.0"  }
+log-slf4j        = { group = "org.slf4j",                name = "slf4j-api",         version = "2.0.16" }
+log-log4j-api    = { group = "org.apache.logging.log4j", name = "log4j-api",         version = "2.24.3" }
+log-log4j-core   = { group = "org.apache.logging.log4j", name = "log4j-core",        version = "2.24.3" }
+log-log4j-slf4j  = { group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version = "2.24.3" }
+log-log4j-kotlin = { group = "org.apache.logging.log4j", name = "log4j-api-kotlin",  version = "1.5.0"  }
 
 # Kotlin Extensions
 kt-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.10.1" }

diff --git a/...st-service/src/main/kotlin/org/veupathdb/service/vdi/server/controllers/ControllerBase.kt b/...st-service/src/main/kotlin/org/veupathdb/service/vdi/server/controllers/ControllerBase.kt
@@ -2,17 +2,17 @@ package org.veupathdb.service.vdi.server.controllers
 
 import jakarta.ws.rs.NotFoundException
 import org.glassfish.jersey.server.ContainerRequest
-import org.veupathdb.lib.container.jaxrs.model.User
+import org.veupathdb.lib.container.jaxrs.model.UserInfo
 import org.veupathdb.lib.container.jaxrs.providers.UserProvider
 import org.veupathdb.vdi.lib.common.field.DatasetID
 
 sealed class ControllerBase(protected val request: ContainerRequest) {
 
-  protected val maybeUser: User? by lazy { UserProvider.lookupUser(request).orElse(null) }
+  protected val maybeUser: UserInfo? by lazy { UserProvider.lookupUser(request).orElse(null) }
 
   protected val maybeUserID get() = maybeUser?.userId
 
-  protected val user: User by lazy { UserProvider.lookupUser(request).orElseThrow() }
+  protected val user: UserInfo by lazy { UserProvider.lookupUser(request).orElseThrow() }
 
   protected val userID get() = user.userId