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

Bumps snakeyaml to 2.0 #6511

Merged
merged 2 commits into from
Mar 1, 2023
Merged

Bumps snakeyaml to 2.0 #6511

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
11bce3d
Bumps snakeyaml to 2.0
owaiskazi19 Feb 28, 2023
88d2cd8
Moved changelog under 2.x
owaiskazi19 Feb 28, 2023
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: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Dependencies
- Bump `org.apache.logging.log4j:log4j-core` from 2.18.0 to 2.20.0 ([#6490](https://github.com/opensearch-project/OpenSearch/pull/6490))
- Bump `com.azure:azure-storage-common` from 12.19.3 to 12.20.0 ([#6492](https://github.com/opensearch-project/OpenSearch/pull/6492)
- Bump `snakeyaml` from 1.33 to 2.0 ([#6511](https://github.com/opensearch-project/OpenSearch/pull/6511))

### Changed
- Require MediaType in Strings.toString API ([#6009](https://github.com/opensearch-project/OpenSearch/pull/6009))
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spatial4j = 0.7
jts = 1.15.0
jackson = 2.14.2
jackson_databind = 2.14.2
snakeyaml = 1.33
snakeyaml = 2.0
icu4j = 70.1
supercsv = 2.4.0
# Update to 2.17.2+ is breaking OpenSearchJsonLayout (see https://issues.apache.org/jira/browse/LOG4J2-3562)
Expand Down
1 change: 0 additions & 1 deletion libs/x-content/licenses/snakeyaml-1.33.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions libs/x-content/licenses/snakeyaml-2.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3aab2116756442bf0d4cd1c089b24d34c3baa253
3 changes: 1 addition & 2 deletions server/src/main/java/org/opensearch/extensions/ExtensionsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
import org.opensearch.transport.TransportService;
import org.yaml.snakeyaml.Yaml;
import org.opensearch.env.EnvironmentSettingsResponse;
import org.yaml.snakeyaml.constructor.SafeConstructor;

/**
* The main class for managing Extension communication with the OpenSearch Node.
Expand Down Expand Up @@ -558,7 +557,7 @@ public String executor() {
}

private ExtensionsSettings readFromExtensionsYml(Path filePath) throws IOException {
Yaml yaml = new Yaml(new SafeConstructor());
Yaml yaml = new Yaml();
try (InputStream inputStream = Files.newInputStream(filePath)) {
Map<String, Object> obj = yaml.load(inputStream);
if (obj == null) {
Expand Down