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

build: Update dependencies in hale-platform to resolve security issues #1079

Merged
merged 1 commit into from
Nov 30, 2023
Merged

build: Update dependencies in hale-platform to resolve security issues #1079

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
1 change: 0 additions & 1 deletion build/templates/products/client.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions common/features/eu.esdihumboldt.hale.common.feature.base/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,6 @@
version="0.0.0"
unpack="false"/>

<plugin
id="cal10n.api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.gemini.blueprint.extender"
download-size="0"
Expand Down
1 change: 0 additions & 1 deletion common/plugins/eu.esdihumboldt.hale.common.test/Tests.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<plugin id="assertj-core"/>
<plugin id="bcpkix"/>
<plugin id="bcprov"/>
<plugin id="cal10n.api"/>
<plugin id="ch.qos.logback.classic"/>
<plugin id="ch.qos.logback.core"/>
<plugin id="colt"/>
Expand Down
8 changes: 4 additions & 4 deletions doc/plugins/eu.esdihumboldt.hale.doc.application/Infocenter.product
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="halestudio Infocenter" uid="eu.esdihumboldt.hale.infocenter" id="eu.esdihumboldt.hale.doc.application.InfoCenter" application="eu.esdihumboldt.hale.doc.application.infocenterApplication" version="5.1.0.qualifier" useFeatures="false" includeLaunchers="true">
<product name="halestudio Infocenter" uid="eu.esdihumboldt.hale.infocenter" id="eu.esdihumboldt.hale.doc.application.InfoCenter" application="eu.esdihumboldt.hale.doc.application.infocenterApplication" version="5.1.0.qualifier" useFeatures="false" includeLaunchers="true" autoIncludeRequirements="true">

<configIni use="default">
</configIni>
Expand All @@ -24,18 +24,18 @@
<vm>
</vm>


<plugins>
<plugin id="aopalliance"/>
<plugin id="asm"/>
<plugin id="asm.asm-analysis"/>
<plugin id="asm.asm-tree"/>
<plugin id="asm.asm-util"/>
<plugin id="cal10n.api"/>
<plugin id="ch.qos.logback.classic"/>
<plugin id="ch.qos.logback.core"/>
<plugin id="colt"/>
<plugin id="com.conversantmedia.disruptor"/>
<plugin id="com.fasterxml.jackson.core.jackson-core"/>
<plugin id="com.fasterxml.jackson.core.jackson-databind"/>
<plugin id="com.google.guava"/>
<plugin id="com.googlecode.json-simple"/>
<plugin id="com.iabcinc.jmep"/>
Expand Down Expand Up @@ -198,9 +198,9 @@
<plugin id="net.sourceforge.schemacrawler"/>
<plugin id="org.apache.commons.codec"/>
<plugin id="org.apache.commons.collections"/>
<plugin id="org.apache.commons.commons-io"/>
<plugin id="org.apache.commons.commons-text"/>
<plugin id="org.apache.commons.configuration"/>
<plugin id="org.apache.commons.io"/>
<plugin id="org.apache.commons.jxpath"/>
<plugin id="org.apache.commons.lang"/>
<plugin id="org.apache.commons.lang3"/>
Expand Down
4 changes: 2 additions & 2 deletions platform/hale-platform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
<unit id="de.fhg.igd.equinox.test.feature.feature.group" version="1.2.0.202203220819"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://gitlab.wetransform.to/hale/hale-build-support/raw/556667e05ea86da8d32e6aade07489e7872806bc/updatesites/platform"/>
<unit id="eu.esdihumboldt.hale.platform.feature.group" version="5.0.0.i202310282027"/>
<repository location="https://gitlab.wetransform.to/hale/hale-build-support/raw/7e9960b2eb198eff1d17ef72348d4495850de255/updatesites/platform"/>
<unit id="eu.esdihumboldt.hale.platform.feature.group" version="5.0.0.i20231129"/>
</location>
</locations>
</target>
7 changes: 5 additions & 2 deletions util/plugins/eu.esdihumboldt.util.config/src/eu/esdihumboldt/util/config/ConfigYaml.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 ?: [:])
}
Expand All @@ -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 ?: [:])
}
Expand Down