From f5733dc39e9d7955cef62db15897ad192350f419 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 06:00:05 +0000 Subject: [PATCH] deps: update hoplite to v2.8.2 --- gradle/libs.versions.toml | 2 +- model/src/main/kotlin/config/OrtConfiguration.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a40c6c3d2086..46d65eb5d3bc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,7 +26,7 @@ flexmark = "0.64.8" freemarker = "2.3.33" greenmail = "2.0.1" hikari = "6.0.0" -hoplite = "2.7.5" +hoplite = "2.8.2" jackson = "2.18.0" jakartaMail = "2.0.1" jgit = "6.10.0.202406032230-r" diff --git a/model/src/main/kotlin/config/OrtConfiguration.kt b/model/src/main/kotlin/config/OrtConfiguration.kt index f9113aac1bfc..3e4eb72c071b 100644 --- a/model/src/main/kotlin/config/OrtConfiguration.kt +++ b/model/src/main/kotlin/config/OrtConfiguration.kt @@ -23,6 +23,7 @@ import com.sksamuel.hoplite.ConfigLoaderBuilder import com.sksamuel.hoplite.PropertySource import com.sksamuel.hoplite.addEnvironmentSource import com.sksamuel.hoplite.fp.getOrElse +import com.sksamuel.hoplite.resolver.context.ContextResolverMode import java.io.File @@ -172,7 +173,7 @@ data class OrtConfiguration( val loader = ConfigLoaderBuilder.default() .addEnvironmentSource() .addPropertySources(sources) - .allowUnresolvedSubstitutions() + .withContextResolverMode(ContextResolverMode.SkipUnresolved) .build() val config = loader.loadConfig()