diff --git a/build/templates/products/client.yaml b/build/templates/products/client.yaml index 7f95a234ad..3ed99a8b00 100644 --- a/build/templates/products/client.yaml +++ b/build/templates/products/client.yaml @@ -27,7 +27,6 @@ HALE: - asm-tree - asm-util - au.com.bytecode.opencsv - - cal10n.api - cern.colt - ch.qos.logback.classic - ch.qos.logback.core diff --git a/common/features/eu.esdihumboldt.hale.common.feature.base/feature.xml b/common/features/eu.esdihumboldt.hale.common.feature.base/feature.xml index 17c63256e6..c9ab0a105a 100644 --- a/common/features/eu.esdihumboldt.hale.common.feature.base/feature.xml +++ b/common/features/eu.esdihumboldt.hale.common.feature.base/feature.xml @@ -58,13 +58,6 @@ version="0.0.0" unpack="false"/> - - - diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.application/Infocenter.product b/doc/plugins/eu.esdihumboldt.hale.doc.application/Infocenter.product index 4975382e8e..4404c50c49 100644 --- a/doc/plugins/eu.esdihumboldt.hale.doc.application/Infocenter.product +++ b/doc/plugins/eu.esdihumboldt.hale.doc.application/Infocenter.product @@ -1,7 +1,7 @@ - + @@ -24,18 +24,18 @@ - - + + @@ -198,9 +198,9 @@ + - diff --git a/platform/hale-platform.target b/platform/hale-platform.target index 69f5f36738..76098a5b21 100644 --- a/platform/hale-platform.target +++ b/platform/hale-platform.target @@ -48,8 +48,8 @@ - - + + \ No newline at end of file diff --git a/util/plugins/eu.esdihumboldt.util.config/src/eu/esdihumboldt/util/config/ConfigYaml.groovy b/util/plugins/eu.esdihumboldt.util.config/src/eu/esdihumboldt/util/config/ConfigYaml.groovy index ed5ec33d5e..20fa272d44 100644 --- a/util/plugins/eu.esdihumboldt.util.config/src/eu/esdihumboldt/util/config/ConfigYaml.groovy +++ b/util/plugins/eu.esdihumboldt.util.config/src/eu/esdihumboldt/util/config/ConfigYaml.groovy @@ -18,6 +18,7 @@ package eu.esdihumboldt.util.config import java.nio.charset.StandardCharsets import org.yaml.snakeyaml.DumperOptions +import org.yaml.snakeyaml.LoaderOptions import org.yaml.snakeyaml.Yaml import org.yaml.snakeyaml.constructor.SafeConstructor @@ -50,7 +51,8 @@ class ConfigYaml { * @return the loaded configuration */ static Config load(InputStream input) { - Yaml yaml = new Yaml(new SafeConstructor()); + LoaderOptions loadOptions = new LoaderOptions(); + Yaml yaml = new Yaml(new SafeConstructor(loadOptions)); Map result = yaml.load(input) new Config(result ?: [:]) } @@ -62,7 +64,8 @@ class ConfigYaml { * @return the loaded configuration */ static Config load(Reader reader) { - Yaml yaml = new Yaml(new SafeConstructor()); + LoaderOptions loadOptions = new LoaderOptions(); + Yaml yaml = new Yaml(new SafeConstructor(loadOptions)); Map result = yaml.load(reader) new Config(result ?: [:]) }