diff --git a/waltid-crypto/build.gradle.kts b/waltid-crypto/build.gradle.kts index a6374a726..33be04543 100644 --- a/waltid-crypto/build.gradle.kts +++ b/waltid-crypto/build.gradle.kts @@ -39,12 +39,12 @@ kotlin { implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0") // Ktor client - implementation("io.ktor:ktor-client-core:2.3.5") - implementation("io.ktor:ktor-client-serialization:2.3.5") - implementation("io.ktor:ktor-client-content-negotiation:2.3.5") - implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.5") - implementation("io.ktor:ktor-client-json:2.3.5") - implementation("io.ktor:ktor-client-logging:2.3.5") + implementation("io.ktor:ktor-client-core:2.3.6") + implementation("io.ktor:ktor-client-serialization:2.3.6") + implementation("io.ktor:ktor-client-content-negotiation:2.3.6") + implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.6") + implementation("io.ktor:ktor-client-json:2.3.6") + implementation("io.ktor:ktor-client-logging:2.3.6") // Coroutines implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") @@ -69,7 +69,7 @@ kotlin { implementation("org.bouncycastle:bcpkix-jdk18on:1.76") // PEM import // Ktor client - implementation("io.ktor:ktor-client-cio:2.3.5") + implementation("io.ktor:ktor-client-cio:2.3.6") // Logging implementation("org.slf4j:slf4j-simple:2.0.9") diff --git a/waltid-did/build.gradle.kts b/waltid-did/build.gradle.kts index 821e7102e..08acc7767 100644 --- a/waltid-did/build.gradle.kts +++ b/waltid-did/build.gradle.kts @@ -41,12 +41,12 @@ kotlin { implementation("io.github.optimumcode:json-schema-validator:0.0.2") // Ktor client - implementation("io.ktor:ktor-client-core:2.3.5") - implementation("io.ktor:ktor-client-serialization:2.3.5") - implementation("io.ktor:ktor-client-content-negotiation:2.3.5") - implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.5") - implementation("io.ktor:ktor-client-json:2.3.5") - implementation("io.ktor:ktor-client-logging:2.3.5") + implementation("io.ktor:ktor-client-core:2.3.6") + implementation("io.ktor:ktor-client-serialization:2.3.6") + implementation("io.ktor:ktor-client-content-negotiation:2.3.6") + implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.6") + implementation("io.ktor:ktor-client-json:2.3.6") + implementation("io.ktor:ktor-client-logging:2.3.6") // Coroutines implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") @@ -71,7 +71,7 @@ kotlin { val jvmMain by getting { dependencies { // Ktor client - implementation("io.ktor:ktor-client-cio:2.3.5") + implementation("io.ktor:ktor-client-cio:2.3.6") // Logging implementation("org.slf4j:slf4j-simple:2.0.9") @@ -85,9 +85,9 @@ kotlin { implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0") implementation(kotlin("test")) implementation("org.junit.jupiter:junit-jupiter-params:5.9.0") - implementation("io.ktor:ktor-server-test-host:2.3.5") - implementation("io.ktor:ktor-server-content-negotiation:2.3.5") - implementation("io.ktor:ktor-server-netty:2.3.5") + implementation("io.ktor:ktor-server-test-host:2.3.6") + implementation("io.ktor:ktor-server-content-negotiation:2.3.6") + implementation("io.ktor:ktor-server-netty:2.3.6") } } publishing { diff --git a/waltid-issuer/build.gradle.kts b/waltid-issuer/build.gradle.kts index 74ed8b964..ba0872b72 100644 --- a/waltid-issuer/build.gradle.kts +++ b/waltid-issuer/build.gradle.kts @@ -1,23 +1,20 @@ -/*import com.github.jk1.license.filter.DependencyFilter -import com.github.jk1.license.filter.LicenseBundleNormalizer -import com.github.jk1.license.render.InventoryHtmlReportRenderer -import com.github.jk1.license.render.ReportRenderer*/ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile object Versions { - const val KOTLIN_VERSION = "1.9.10" // also change 2 plugins + const val KOTLIN_VERSION = "1.9.20" // also change 2 plugins const val KTOR_VERSION = "2.3.6" // also change 1 plugin const val COROUTINES_VERSION = "1.7.3" const val EXPOSED_VERSION = "0.43.0" - const val HOPLITE_VERSION = "2.8.0.RC2" + const val HOPLITE_VERSION = "2.8.0.RC3" } plugins { kotlin("jvm") // Versions.KOTLIN_VERSION id("org.jetbrains.kotlin.plugin.serialization") // Versions.KOTLIN_VERSION - id("io.ktor.plugin") version "2.3.5" // Versions.KTOR_VERSION - id("org.owasp.dependencycheck") version "8.4.2" + //id("io.ktor.plugin") version "2.3.6" // Versions.KTOR_VERSION + id("io.ktor.plugin") version "2.3.6" // Versions.KTOR_VERSION + id("org.owasp.dependencycheck") version "8.4.3" id("com.github.jk1.dependency-license-report") version "2.5" application `maven-publish` @@ -63,7 +60,7 @@ dependencies { implementation("io.ktor:ktor-server-cio-jvm:${Versions.KTOR_VERSION}") // Ktor server external libs - implementation("io.github.smiley4:ktor-swagger-ui:2.6.0") + implementation("io.github.smiley4:ktor-swagger-ui:2.7.1") // Ktor client implementation("io.ktor:ktor-client-core-jvm:${Versions.KTOR_VERSION}") @@ -122,7 +119,7 @@ dependencies { api(project(":waltid-sdjwt")) // TODO: REMOVE: - implementation("com.nimbusds:nimbus-jose-jwt:9.37") + implementation("com.nimbusds:nimbus-jose-jwt:9.37.1") //api(project(":waltid-mdocs")) //implementation("id.walt:waltid-ssikit2:1.0.8a-SNAPSHOT") diff --git a/waltid-issuer/src/main/kotlin/id/walt/issuer/base/web/plugins/StatusPages.kt b/waltid-issuer/src/main/kotlin/id/walt/issuer/base/web/plugins/StatusPages.kt index 69583ca5b..2c5124202 100644 --- a/waltid-issuer/src/main/kotlin/id/walt/issuer/base/web/plugins/StatusPages.kt +++ b/waltid-issuer/src/main/kotlin/id/walt/issuer/base/web/plugins/StatusPages.kt @@ -19,6 +19,9 @@ private fun statusCodeForException(cause: Throwable) = when (cause) { fun Application.configureStatusPages() { install(StatusPages) { + exception { call, ex -> + call.respond(HttpStatusCode.NotFound, ex.message ?: "Not found") + } exception { call, cause -> call.respond(HttpStatusCode.Unauthorized, cause.message ?: "") } diff --git a/waltid-openid4vc/build.gradle.kts b/waltid-openid4vc/build.gradle.kts index 468ee28ec..c3af71840 100644 --- a/waltid-openid4vc/build.gradle.kts +++ b/waltid-openid4vc/build.gradle.kts @@ -63,7 +63,7 @@ kotlin { // isMingwX64 -> mingwX64("native") // else -> throw GradleException("Host OS is not supported in Kotlin/Native.") // } - val ktor_version = "2.3.5" + val ktor_version = "2.3.6" sourceSets { diff --git a/waltid-reporting/build.gradle.kts b/waltid-reporting/build.gradle.kts index d800f7d5a..592abe992 100644 --- a/waltid-reporting/build.gradle.kts +++ b/waltid-reporting/build.gradle.kts @@ -40,12 +40,12 @@ kotlin { implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0") // Ktor client - implementation("io.ktor:ktor-client-core:2.3.5") - implementation("io.ktor:ktor-client-serialization:2.3.5") - implementation("io.ktor:ktor-client-content-negotiation:2.3.5") - implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.5") - implementation("io.ktor:ktor-client-json:2.3.5") - implementation("io.ktor:ktor-client-logging:2.3.5") + implementation("io.ktor:ktor-client-core:2.3.6") + implementation("io.ktor:ktor-client-serialization:2.3.6") + implementation("io.ktor:ktor-client-content-negotiation:2.3.6") + implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.6") + implementation("io.ktor:ktor-client-json:2.3.6") + implementation("io.ktor:ktor-client-logging:2.3.6") // Scheduler implementation("it.justwrote:kjob-core:0.2.0") @@ -72,7 +72,7 @@ kotlin { val jvmMain by getting { dependencies { // Ktor client - implementation("io.ktor:ktor-client-cio:2.3.5") + implementation("io.ktor:ktor-client-cio:2.3.6") // Logging implementation("org.slf4j:slf4j-simple:2.0.9") diff --git a/waltid-sdjwt/build.gradle.kts b/waltid-sdjwt/build.gradle.kts index 7e8f0a282..e866cce25 100644 --- a/waltid-sdjwt/build.gradle.kts +++ b/waltid-sdjwt/build.gradle.kts @@ -18,7 +18,7 @@ repositories { @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class) kotlin { jvm { - jvmToolchain(18) // 16 possible? + jvmToolchain(17) // 16 possible? withJava() testRuns["test"].executionTask.configure { useJUnitPlatform() @@ -105,7 +105,7 @@ kotlin { } val jvmMain by getting { dependencies { - implementation("com.nimbusds:nimbus-jose-jwt:9.37") + implementation("com.nimbusds:nimbus-jose-jwt:9.37.1") } } val jvmTest by getting { diff --git a/waltid-verifiable-credentials/build.gradle.kts b/waltid-verifiable-credentials/build.gradle.kts index ca6847489..381d9b7fd 100644 --- a/waltid-verifiable-credentials/build.gradle.kts +++ b/waltid-verifiable-credentials/build.gradle.kts @@ -40,12 +40,12 @@ kotlin { implementation("io.github.optimumcode:json-schema-validator:0.0.2") // Ktor client - implementation("io.ktor:ktor-client-core:2.3.5") - implementation("io.ktor:ktor-client-serialization:2.3.5") - implementation("io.ktor:ktor-client-content-negotiation:2.3.5") - implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.5") - implementation("io.ktor:ktor-client-json:2.3.5") - implementation("io.ktor:ktor-client-logging:2.3.5") + implementation("io.ktor:ktor-client-core:2.3.6") + implementation("io.ktor:ktor-client-serialization:2.3.6") + implementation("io.ktor:ktor-client-content-negotiation:2.3.6") + implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.6") + implementation("io.ktor:ktor-client-json:2.3.6") + implementation("io.ktor:ktor-client-logging:2.3.6") // Coroutines implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") @@ -72,7 +72,7 @@ kotlin { val jvmMain by getting { dependencies { // Ktor client - implementation("io.ktor:ktor-client-cio:2.3.5") + implementation("io.ktor:ktor-client-cio:2.3.6") // Logging implementation("org.slf4j:slf4j-simple:2.0.9") diff --git a/waltid-verifier/build.gradle.kts b/waltid-verifier/build.gradle.kts index 65fd9c3e7..370b03159 100644 --- a/waltid-verifier/build.gradle.kts +++ b/waltid-verifier/build.gradle.kts @@ -5,7 +5,7 @@ import com.github.jk1.license.render.ReportRenderer*/ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile object Versions { - const val KOTLIN_VERSION = "1.9.10" // also change 2 plugins + const val KOTLIN_VERSION = "1.9.20" // also change 2 plugins const val KTOR_VERSION = "2.3.6" // also change 1 plugin const val COROUTINES_VERSION = "1.7.3" const val EXPOSED_VERSION = "0.43.0" @@ -16,8 +16,8 @@ plugins { kotlin("jvm") // Versions.KOTLIN_VERSION id("org.jetbrains.kotlin.plugin.serialization") // Versions.KOTLIN_VERSION - id("io.ktor.plugin") version "2.3.5" // Versions.KTOR_VERSION - id("org.owasp.dependencycheck") version "8.4.2" + id("io.ktor.plugin") version "2.3.6" // Versions.KTOR_VERSION + id("org.owasp.dependencycheck") version "8.4.3" id("com.github.jk1.dependency-license-report") version "2.5" application `maven-publish` @@ -63,7 +63,7 @@ dependencies { implementation("io.ktor:ktor-server-cio-jvm:${Versions.KTOR_VERSION}") // Ktor server external libs - implementation("io.github.smiley4:ktor-swagger-ui:2.6.0") + implementation("io.github.smiley4:ktor-swagger-ui:2.7.1") // Ktor client implementation("io.ktor:ktor-client-core-jvm:${Versions.KTOR_VERSION}")