update dependencies

vsct-jburet · vsct-jburet · commit 6faccae8337d · 2025-02-10T16:21:17.000+01:00
diff --git a/bot/admin/server/src/main/kotlin/BotAdminService.kt b/bot/admin/server/src/main/kotlin/BotAdminService.kt
@@ -210,10 +210,7 @@ object BotAdminService {
                             )
                         }
                     )
-                }
-
-                // Add nlp stats
-                searchResult.copy(
+                }.copy(
                     nlpStats = dialogReportDAO.getNlpStats(searchResult.dialogs.map { it.id }, query.namespace)
                 )
             }
diff --git a/bot/connector-teams/pom.xml b/bot/connector-teams/pom.xml
@@ -30,8 +30,8 @@
 
     <properties>
         <microsoft.bot>4.14.3</microsoft.bot>
-        <nimbus-jose-jwt>9.48</nimbus-jose-jwt>
-        <gson>2.11.0</gson>
+        <nimbus-jose-jwt>10.0.1</nimbus-jose-jwt>
+        <gson>2.12.1</gson>
         <minidev>2.5.1</minidev>
     </properties>
 
diff --git a/gen-ai/orchestrator-client/src/main/kotlin/ai/tock/genai/orchestratorclient/retrofit/GenAIOrchestratorInterceptor.kt b/gen-ai/orchestrator-client/src/main/kotlin/ai/tock/genai/orchestratorclient/retrofit/GenAIOrchestratorInterceptor.kt
@@ -44,7 +44,7 @@ class GenAIOrchestratorInterceptor(private val jsonObjectMapper: ObjectMapper =
     }
 
     private fun handleApiError(response: Response) {
-        val errorBody = response.body?.string()
+        val errorBody = response.body.string()
         when (response.code) {
             400 -> {
                 val errorResponse = jsonObjectMapper.readValue(errorBody, ErrorResponse::class.java)
diff --git a/nlp/api/client/src/main/kotlin/TockNlpClient.kt b/nlp/api/client/src/main/kotlin/TockNlpClient.kt
@@ -103,7 +103,7 @@ class TockNlpClient(baseUrl: String = System.getenv("tock_nlp_service_url") ?: "
         body()
             ?: run {
                 logger.error { "nlp error : ${errorBody()?.string()}" }
-                null as Nothing?
+                null
             }
 
     override fun parse(query: NlpQuery): NlpResult? {
diff --git a/nlp/entity-evaluator/duckling/service/src/main/kotlin/startServer.kt b/nlp/entity-evaluator/duckling/service/src/main/kotlin/startServer.kt
@@ -21,6 +21,6 @@ import ai.tock.shared.vertx.vertx
 /**
  * Server start class.
  */
-fun main(args: Array<String>) {
+fun main() {
     vertx.deployVerticle(DucklingVerticle())
 }
diff --git a/nlp/model/opennlp/pom.xml b/nlp/model/opennlp/pom.xml
@@ -29,7 +29,7 @@
     <description>OpenNlp implementation of Tock NLP Model</description>
 
     <properties>
-        <opennlp>2.5.2</opennlp>
+        <opennlp>2.5.3</opennlp>
     </properties>
 
     <dependencies>
diff --git a/nlp/model/sagemaker/pom.xml b/nlp/model/sagemaker/pom.xml
@@ -28,7 +28,7 @@
     <description>Sagemaker client for Tock NLP Model</description>
 
     <properties>
-        <aws.version>2.29.43</aws.version>
+        <aws.version>2.30.16</aws.version>
     </properties>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
@@ -31,11 +31,11 @@
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
         <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
 
-        <kotlin>2.0.21</kotlin>
-        <coroutine>1.9.0</coroutine>
+        <kotlin>2.1.10</kotlin>
+        <coroutine>1.10.1</coroutine>
 
         <slf4j>2.0.16</slf4j>
-        <logback>1.5.15</logback>
+        <logback>1.5.16</logback>
 
         <kotlin-logging>3.0.5</kotlin-logging>
 
@@ -48,27 +48,27 @@
         <jackson-data>0.4.0</jackson-data>
         <jackson-generator>0.4.0</jackson-generator>
         <klaxon>5.6</klaxon>
-        <vertx>4.5.11</vertx>
+        <vertx>4.5.12</vertx>
         <retrofit>2.11.0</retrofit>
-        <okhttp>4.12.0</okhttp>
+        <okhttp>5.0.0-alpha.14</okhttp>
         <okhttp-signpost>1.1.0</okhttp-signpost>
         <signpost-core>1.2.1.2</signpost-core>
         <circuitbreaker>1.7.1</circuitbreaker>
         <guava>33.4.0-jre</guava>
         <google-auth>1.37.0</google-auth>
-        <google-http-client>1.45.3</google-http-client>
+        <google-http-client>1.46.1</google-http-client>
         <jasypt>1.9.3</jasypt>
-        <commons-csv>1.12.0</commons-csv>
+        <commons-csv>1.13.0</commons-csv>
         <commons-text>1.13.0</commons-text>
         <emoji>5.1.1</emoji>
-        <commons-codec>1.17.1</commons-codec>
+        <commons-codec>1.18.0</commons-codec>
         <commons-lang>3.17.0</commons-lang>
         <commonmark>0.24.0</commonmark>
-        <json>20241224</json>
+        <json>20250107</json>
         <httpclient>4.5.14</httpclient>
         <simmetrics>4.1.1</simmetrics>
         <batik>1.12</batik>
-        <google>26.52.0</google>
+        <google>26.54.0</google>
         <aws-sdk>1.12.780</aws-sdk>
         <pac4j>5.7.7</pac4j>
         <okhttp-eventsource>4.1.1</okhttp-eventsource>
@@ -78,18 +78,18 @@
         <junit-jupiter>5.11.4</junit-jupiter>
         <testcontainer>1.20.4</testcontainer>
 
-        <mockk>1.13.14</mockk>
+        <mockk>1.13.16</mockk>
         <assertj>3.22.0</assertj>
-        <byte-buddy>1.15.11</byte-buddy>
+        <byte-buddy>1.17.0</byte-buddy>
         <atrium>0.15.0</atrium>
         <serialization>1.6.2</serialization>
 
-        <plugin.surefire>3.5.0</plugin.surefire>
+        <plugin.surefire>3.5.2</plugin.surefire>
         <plugin.source>3.3.1</plugin.source>
         <plugin.release>3.1.1</plugin.release>
-        <plugin.gpg>3.2.6</plugin.gpg>
+        <plugin.gpg>3.2.7</plugin.gpg>
         <plugin.nexus-staging>1.6.13</plugin.nexus-staging>
-        <plugin.dokka>1.9.20</plugin.dokka>
+        <plugin.dokka>2.0.0</plugin.dokka>
         <plugin.assembly>3.4.2</plugin.assembly>
         <plugin.frontend>1.12.1</plugin.frontend>
         <plugin.clean>3.2.0</plugin.clean>
diff --git a/shared/src/main/kotlin/Retrofits.kt b/shared/src/main/kotlin/Retrofits.kt
@@ -375,8 +375,8 @@ private class LoggingInterceptor(val logger: KLogger, val level: Level) : Interc
         val tookMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNs)
 
         val responseBody = response.body
-        val contentLength = responseBody?.contentLength()
-        val bodySize = if (contentLength != -1L) contentLength.toString() + "-byte" else "unknown-length"
+        val contentLength = responseBody.contentLength()
+        val bodySize = if (contentLength != -1L) "$contentLength-byte" else "unknown-length"
         logger.info(
             "<-- " + response.code + ' ' + response.message + ' ' +
                     response.request.url + " (" + tookMs + "ms" + (
@@ -402,17 +402,17 @@ private class LoggingInterceptor(val logger: KLogger, val level: Level) : Interc
             } else if (bodyEncoded(response.headers)) {
                 logger.info("<-- END HTTP (encoded body omitted)")
             } else {
-                val source = responseBody?.source()
-                source?.request(java.lang.Long.MAX_VALUE) // Buffer the entire body.
-                val buffer = source?.buffer
+                val source = responseBody.source()
+                source.request(java.lang.Long.MAX_VALUE) // Buffer the entire body.
+                val buffer = source.buffer
 
                 var charset = UTF_8
-                val contentType = responseBody?.contentType()
+                val contentType = responseBody.contentType()
                 if (contentType != null) {
                     charset = contentType.charset(UTF_8)
                 }
 
-                if (buffer != null && !isPlaintext(buffer)) {
+                if (!isPlaintext(buffer)) {
                     logger.info("")
                     logger.info("<-- END HTTP (binary " + buffer.size + "-byte body omitted)")
                     return response
diff --git a/shared/src/test/kotlin/TockProxyAuthenticatorTest.kt b/shared/src/test/kotlin/TockProxyAuthenticatorTest.kt
@@ -23,7 +23,7 @@ import okhttp3.OkHttpClient
 import okhttp3.Protocol
 import okhttp3.Request
 import okhttp3.Response
-import okhttp3.internal.EMPTY_RESPONSE
+import okhttp3.internal.commonEmptyResponse
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
@@ -61,7 +61,7 @@ class TockProxyAuthenticatorTest {
             .protocol(Protocol.HTTP_1_1)
             .code(HttpURLConnection.HTTP_PROXY_AUTH)
             .message("Preemptive Authenticate")
-            .body(EMPTY_RESPONSE)
+            .body(commonEmptyResponse)
             .sentRequestAtMillis(-1L)
             .receivedResponseAtMillis(-1L)
             .header("Proxy-Authenticate", challenge)
diff --git a/util/gcp-tools/pom.xml b/util/gcp-tools/pom.xml
@@ -13,7 +13,7 @@
     <url>http://maven.apache.org</url>
 
     <properties>
-        <gcp-secretmanager>2.55.0</gcp-secretmanager>
+        <gcp-secretmanager>2.57.0</gcp-secretmanager>
     </properties>
 
     <build>

Original file line number	Diff line number	Diff line change
`@@ -210,10 +210,7 @@ object BotAdminService {`
`210`	`210`	`)`
`211`	`211`	`}`
`212`	`212`	`)`
`213`		`- }`
`214`		`-`
`215`		`- // Add nlp stats`
`216`		`- searchResult.copy(`
	`213`	`+ }.copy(`
`217`	`214`	`nlpStats = dialogReportDAO.getNlpStats(searchResult.dialogs.map { it.id }, query.namespace)`
`218`	`215`	`)`
`219`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class GenAIOrchestratorInterceptor(private val jsonObjectMapper: ObjectMapper =`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`private fun handleApiError(response: Response) {`
`47`		`- val errorBody = response.body?.string()`
	`47`	`+ val errorBody = response.body.string()`
`48`	`48`	`when (response.code) {`
`49`	`49`	`400 -> {`
`50`	`50`	`val errorResponse = jsonObjectMapper.readValue(errorBody, ErrorResponse::class.java)`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ class TockNlpClient(baseUrl: String = System.getenv("tock_nlp_service_url") ?: "`
`103`	`103`	`body()`
`104`	`104`	`?: run {`
`105`	`105`	`logger.error { "nlp error : ${errorBody()?.string()}" }`
`106`		`- null as Nothing?`
	`106`	`+ null`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`override fun parse(query: NlpQuery): NlpResult? {`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ import ai.tock.shared.vertx.vertx`
`21`	`21`	`/**`
`22`	`22`	`* Server start class.`
`23`	`23`	`*/`
`24`		`-fun main(args: Array<String>) {`
	`24`	`+fun main() {`
`25`	`25`	`vertx.deployVerticle(DucklingVerticle())`
`26`	`26`	`}`