diff --git a/org.jgrapes.util/bnd.bnd b/org.jgrapes.util/bnd.bnd index 15738f397f..85ec917b94 100644 --- a/org.jgrapes.util/bnd.bnd +++ b/org.jgrapes.util/bnd.bnd @@ -9,16 +9,15 @@ Export-Package: \ org.jgrapes.util;version="${api_version}",\ org.jgrapes.util.events;version="${api_version}" --privatepackage: \ - com.electronwill.nightconfig.core,\ - com.electronwill.nightconfig.core.conversion,\ - com.electronwill.nightconfig.core.file,\ - com.electronwill.nightconfig.core.io,\ - com.electronwill.nightconfig.core.utils,\ - com.electronwill.nightconfig.json,\ - com.electronwill.nightconfig.toml,\ - com.electronwill.nightconfig.yaml - +# Restrict nightconfig versions. Starting with 3.7, OSGi is no +# longer supported. +Import-Package: com.electronwill.nightconfig.core;version="[3.6.7,3.7.0)",\ + com.electronwill.nightconfig.core.file;version="[3.6.7,3.7.0)",\ + com.electronwill.nightconfig.json;version="[3.6.7,3.7.0)",\ + com.electronwill.nightconfig.toml;version="[3.6.7,3.7.0)",\ + com.electronwill.nightconfig.yaml;version="[3.6.7,3.7.0)",\ + * + -sources: true -dsannotations: diff --git a/org.jgrapes.util/build.gradle b/org.jgrapes.util/build.gradle index c8d7c56a7e..15353862e1 100644 --- a/org.jgrapes.util/build.gradle +++ b/org.jgrapes.util/build.gradle @@ -1,12 +1,12 @@ dependencies { api project(':org.jgrapes.core') - implementation 'com.electronwill.night-config:core:[3.7.0,4)' - implementation 'com.electronwill.night-config:json:[3.7.0,4)' - implementation 'com.electronwill.night-config:toml:[3.7.0,4)' - implementation 'com.electronwill.night-config:yaml:[3.7.0,4)' + implementation 'com.electronwill.night-config:core:[3.6.7,3.7.0)' + implementation 'com.electronwill.night-config:json:[3.6.7,3.7.0)' + implementation 'com.electronwill.night-config:toml:[3.6.7,3.7.0)' + implementation 'com.electronwill.night-config:yaml:[3.6.7,3.7.0)' // https://security.snyk.io/package/maven/org.yaml:snakeyaml - implementation 'org.yaml:snakeyaml:[1.33,2]' + implementation 'org.yaml:snakeyaml:[1.33,2)' testImplementation 'org.jdrupes.json:json:[2.0.0,2.1.0)' testRuntimeOnly project.files('test-resources')