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

Fixes vulnerabilities on 4.0.z #17510

Merged
merged 2 commits into from Sep 8, 2020
Merged

Fixes vulnerabilities on 4.0.z #17510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcd3b3a
Upgrade SnakeYAML to v2.1 (#17446)
kierendavies Sep 8, 2020
a5039d6
Updated to Jackson version to address a Twistlock-reported issue: CVE…
keith-f Sep 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...cast/src/main/java/com/hazelcast/internal/config/AbstractYamlConfigRootTagRecognizer.java
View file
Open in desktop
Expand Up @@ -22,8 +22,8 @@
import com.hazelcast.internal.yaml.YamlLoader;
import com.hazelcast.logging.ILogger;
import com.hazelcast.logging.Logger;
import org.snakeyaml.engine.v1.api.ConstructNode;
import org.snakeyaml.engine.v1.api.LoadSettingsBuilder;
import org.snakeyaml.engine.v2.api.ConstructNode;
import org.snakeyaml.engine.v2.api.LoadSettingsBuilder;

import java.util.Optional;

Expand Down
7 changes: 3 additions & 4 deletions hazelcast/src/main/java/com/hazelcast/internal/yaml/YamlLoader.java
View file
Open in desktop
Expand Up @@ -16,9 +16,8 @@

package com.hazelcast.internal.yaml;

import org.snakeyaml.engine.v1.api.Load;
import org.snakeyaml.engine.v1.api.LoadSettings;
import org.snakeyaml.engine.v1.api.LoadSettingsBuilder;
import org.snakeyaml.engine.v2.api.Load;
import org.snakeyaml.engine.v2.api.LoadSettings;

import java.io.InputStream;
import java.io.Reader;
Expand Down Expand Up @@ -144,7 +143,7 @@ public static YamlNode load(String yaml) {
}

private static Load getLoad() {
LoadSettings settings = new LoadSettingsBuilder().build();
LoadSettings settings = LoadSettings.builder().build();
return new Load(settings);
}

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@
<log4j2.version>2.13.0</log4j2.version>
<slf4j.api.version>1.7.25</slf4j.api.version>

<jackson.version>2.9.7</jackson.version>
<jackson.version>2.11.2</jackson.version>
<junit.version>4.12</junit.version>
<hamcrest.version>1.3</hamcrest.version>
<mockito.version>2.19.0</mockito.version>
Expand All @@ -112,7 +112,7 @@
<jsr107.api.version>1.1.1</jsr107.api.version>
<jsr107.tck.version>1.1.1</jsr107.tck.version>

<snakeyaml.engine.version>1.0</snakeyaml.engine.version>
<snakeyaml.engine.version>2.1</snakeyaml.engine.version>

<h2.version>1.3.160</h2.version>
<atomikos.version>3.9.3</atomikos.version>
Expand Down