Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deps: update hoplite to v2.8.2 #9156

Merged
merged 1 commit into from
Sep 30, 2024
Merged

deps: update hoplite to v2.8.2 #9156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion model/src/main/kotlin/config/OrtConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -172,7 +173,7 @@ data class OrtConfiguration(
val loader = ConfigLoaderBuilder.default()
.addEnvironmentSource()
.addPropertySources(sources)
.allowUnresolvedSubstitutions()
.withContextResolverMode(ContextResolverMode.SkipUnresolved)
.build()

val config = loader.loadConfig<OrtConfigurationWrapper>()
Expand Down
Loading