From 654f6925e763dc6febe82161a992fb21d1a0f470 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Tue, 25 Oct 2022 21:26:55 -0400 Subject: [PATCH] Dependency updates: asm 9.3 -> 9.4, bytebuddy 1.12.12 -> 1.12.18 (#4889) (#4911) Signed-off-by: Andriy Redko Signed-off-by: Andriy Redko Signed-off-by: Andriy Redko --- CHANGELOG.md | 3 +++ buildSrc/version.properties | 6 ++++-- modules/lang-expression/licenses/asm-9.3.jar.sha1 | 1 - modules/lang-expression/licenses/asm-9.4.jar.sha1 | 1 + modules/lang-expression/licenses/asm-commons-9.3.jar.sha1 | 1 - modules/lang-expression/licenses/asm-commons-9.4.jar.sha1 | 1 + modules/lang-expression/licenses/asm-tree-9.3.jar.sha1 | 1 - modules/lang-expression/licenses/asm-tree-9.4.jar.sha1 | 1 + modules/lang-painless/licenses/asm-9.3.jar.sha1 | 1 - modules/lang-painless/licenses/asm-9.4.jar.sha1 | 1 + modules/lang-painless/licenses/asm-analysis-9.3.jar.sha1 | 1 - modules/lang-painless/licenses/asm-analysis-9.4.jar.sha1 | 1 + modules/lang-painless/licenses/asm-commons-9.3.jar.sha1 | 1 - modules/lang-painless/licenses/asm-commons-9.4.jar.sha1 | 1 + modules/lang-painless/licenses/asm-tree-9.3.jar.sha1 | 1 - modules/lang-painless/licenses/asm-tree-9.4.jar.sha1 | 1 + modules/lang-painless/licenses/asm-util-9.3.jar.sha1 | 1 - modules/lang-painless/licenses/asm-util-9.4.jar.sha1 | 1 + 18 files changed, 15 insertions(+), 10 deletions(-) delete mode 100644 modules/lang-expression/licenses/asm-9.3.jar.sha1 create mode 100644 modules/lang-expression/licenses/asm-9.4.jar.sha1 delete mode 100644 modules/lang-expression/licenses/asm-commons-9.3.jar.sha1 create mode 100644 modules/lang-expression/licenses/asm-commons-9.4.jar.sha1 delete mode 100644 modules/lang-expression/licenses/asm-tree-9.3.jar.sha1 create mode 100644 modules/lang-expression/licenses/asm-tree-9.4.jar.sha1 delete mode 100644 modules/lang-painless/licenses/asm-9.3.jar.sha1 create mode 100644 modules/lang-painless/licenses/asm-9.4.jar.sha1 delete mode 100644 modules/lang-painless/licenses/asm-analysis-9.3.jar.sha1 create mode 100644 modules/lang-painless/licenses/asm-analysis-9.4.jar.sha1 delete mode 100644 modules/lang-painless/licenses/asm-commons-9.3.jar.sha1 create mode 100644 modules/lang-painless/licenses/asm-commons-9.4.jar.sha1 delete mode 100644 modules/lang-painless/licenses/asm-tree-9.3.jar.sha1 create mode 100644 modules/lang-painless/licenses/asm-tree-9.4.jar.sha1 delete mode 100644 modules/lang-painless/licenses/asm-util-9.3.jar.sha1 create mode 100644 modules/lang-painless/licenses/asm-util-9.4.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ceb3f2bd9ebd..0af8d74cd1c61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Add BWC version 1.3.7 ([#4711](https://github.com/opensearch-project/OpenSearch/pull/4711)) - Bumps `jettison` from 1.5.0 to 1.5.1 ([#4712](https://github.com/opensearch-project/OpenSearch/pull/4712)) +### Dependencies +- Dependency updates: asm 9.3 -> 9.4, bytebuddy 1.12.12 -> 1.12.18 ([#4889](https://github.com/opensearch-project/OpenSearch/pull/4889)) + ### Changed - Dependency updates (httpcore, mockito, slf4j, httpasyncclient, commons-codec) ([#4308](https://github.com/opensearch-project/OpenSearch/pull/4308)) - Use RemoteSegmentStoreDirectory instead of RemoteDirectory ([#4240](https://github.com/opensearch-project/OpenSearch/pull/4240)) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 8e9f48860dabe..29ceea9987839 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -14,9 +14,10 @@ jackson_databind = 2.13.4.2 snakeyaml = 1.32 icu4j = 70.1 supercsv = 2.4.0 +# Update to 2.17.2+ is breaking OpenSearchJsonLayout (see https://issues.apache.org/jira/browse/LOG4J2-3562) log4j = 2.17.1 slf4j = 1.7.36 -asm = 9.3 +asm = 9.4 # when updating the JNA version, also update the version in buildSrc/build.gradle jna = 5.5.0 @@ -42,9 +43,10 @@ bouncycastle=1.70 randomizedrunner = 2.7.1 junit = 4.13.2 hamcrest = 2.1 +# Update to 4.8.0 is using reflection without SecurityManager checks (fails with java.security.AccessControlException) mockito = 4.7.0 objenesis = 3.2 -bytebuddy = 1.12.12 +bytebuddy = 1.12.18 # benchmark dependencies jmh = 1.35 diff --git a/modules/lang-expression/licenses/asm-9.3.jar.sha1 b/modules/lang-expression/licenses/asm-9.3.jar.sha1 deleted file mode 100644 index 71d3966a6f6f9..0000000000000 --- a/modules/lang-expression/licenses/asm-9.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8e6300ef51c1d801a7ed62d07cd221aca3a90640 \ No newline at end of file diff --git a/modules/lang-expression/licenses/asm-9.4.jar.sha1 b/modules/lang-expression/licenses/asm-9.4.jar.sha1 new file mode 100644 index 0000000000000..75f2b0fe9a112 --- /dev/null +++ b/modules/lang-expression/licenses/asm-9.4.jar.sha1 @@ -0,0 +1 @@ +b4e0e2d2e023aa317b7cfcfc916377ea348e07d1 \ No newline at end of file diff --git a/modules/lang-expression/licenses/asm-commons-9.3.jar.sha1 b/modules/lang-expression/licenses/asm-commons-9.3.jar.sha1 deleted file mode 100644 index fd7cd4943a57c..0000000000000 --- a/modules/lang-expression/licenses/asm-commons-9.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1f2a432d1212f5c352ae607d7b61dcae20c20af5 \ No newline at end of file diff --git a/modules/lang-expression/licenses/asm-commons-9.4.jar.sha1 b/modules/lang-expression/licenses/asm-commons-9.4.jar.sha1 new file mode 100644 index 0000000000000..e0e2a2f4e63e9 --- /dev/null +++ b/modules/lang-expression/licenses/asm-commons-9.4.jar.sha1 @@ -0,0 +1 @@ +8fc2810ddbcbbec0a8bbccb3f8eda58321839912 \ No newline at end of file diff --git a/modules/lang-expression/licenses/asm-tree-9.3.jar.sha1 b/modules/lang-expression/licenses/asm-tree-9.3.jar.sha1 deleted file mode 100644 index 238f0006424d3..0000000000000 --- a/modules/lang-expression/licenses/asm-tree-9.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -78d2ecd61318b5a58cd04fb237636c0e86b77d97 \ No newline at end of file diff --git a/modules/lang-expression/licenses/asm-tree-9.4.jar.sha1 b/modules/lang-expression/licenses/asm-tree-9.4.jar.sha1 new file mode 100644 index 0000000000000..50ce6d740aab7 --- /dev/null +++ b/modules/lang-expression/licenses/asm-tree-9.4.jar.sha1 @@ -0,0 +1 @@ +a99175a17d7fdc18cbcbd0e8ea6a5d276844190a \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-9.3.jar.sha1 b/modules/lang-painless/licenses/asm-9.3.jar.sha1 deleted file mode 100644 index 71d3966a6f6f9..0000000000000 --- a/modules/lang-painless/licenses/asm-9.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8e6300ef51c1d801a7ed62d07cd221aca3a90640 \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-9.4.jar.sha1 b/modules/lang-painless/licenses/asm-9.4.jar.sha1 new file mode 100644 index 0000000000000..75f2b0fe9a112 --- /dev/null +++ b/modules/lang-painless/licenses/asm-9.4.jar.sha1 @@ -0,0 +1 @@ +b4e0e2d2e023aa317b7cfcfc916377ea348e07d1 \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-analysis-9.3.jar.sha1 b/modules/lang-painless/licenses/asm-analysis-9.3.jar.sha1 deleted file mode 100644 index f5a04d0196823..0000000000000 --- a/modules/lang-painless/licenses/asm-analysis-9.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4b071f211b37c38e0e9f5998550197c8593f6ad8 \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-analysis-9.4.jar.sha1 b/modules/lang-painless/licenses/asm-analysis-9.4.jar.sha1 new file mode 100644 index 0000000000000..850a070775e4d --- /dev/null +++ b/modules/lang-painless/licenses/asm-analysis-9.4.jar.sha1 @@ -0,0 +1 @@ +0a5fec9dfc039448d4fd098fbaffcaf55373b223 \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-commons-9.3.jar.sha1 b/modules/lang-painless/licenses/asm-commons-9.3.jar.sha1 deleted file mode 100644 index fd7cd4943a57c..0000000000000 --- a/modules/lang-painless/licenses/asm-commons-9.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1f2a432d1212f5c352ae607d7b61dcae20c20af5 \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-commons-9.4.jar.sha1 b/modules/lang-painless/licenses/asm-commons-9.4.jar.sha1 new file mode 100644 index 0000000000000..e0e2a2f4e63e9 --- /dev/null +++ b/modules/lang-painless/licenses/asm-commons-9.4.jar.sha1 @@ -0,0 +1 @@ +8fc2810ddbcbbec0a8bbccb3f8eda58321839912 \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-tree-9.3.jar.sha1 b/modules/lang-painless/licenses/asm-tree-9.3.jar.sha1 deleted file mode 100644 index 238f0006424d3..0000000000000 --- a/modules/lang-painless/licenses/asm-tree-9.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -78d2ecd61318b5a58cd04fb237636c0e86b77d97 \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-tree-9.4.jar.sha1 b/modules/lang-painless/licenses/asm-tree-9.4.jar.sha1 new file mode 100644 index 0000000000000..50ce6d740aab7 --- /dev/null +++ b/modules/lang-painless/licenses/asm-tree-9.4.jar.sha1 @@ -0,0 +1 @@ +a99175a17d7fdc18cbcbd0e8ea6a5d276844190a \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-util-9.3.jar.sha1 b/modules/lang-painless/licenses/asm-util-9.3.jar.sha1 deleted file mode 100644 index 8859c317794ba..0000000000000 --- a/modules/lang-painless/licenses/asm-util-9.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9595bc05510d0bd4b610188b77333fe4851a1975 \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-util-9.4.jar.sha1 b/modules/lang-painless/licenses/asm-util-9.4.jar.sha1 new file mode 100644 index 0000000000000..8c5854f41bcda --- /dev/null +++ b/modules/lang-painless/licenses/asm-util-9.4.jar.sha1 @@ -0,0 +1 @@ +ab1e0a84b72561dbaf1ee260321e72148ebf4b19 \ No newline at end of file