Skip to content

Commit

Permalink
Routine dependency updates: Netty 4.1.91.Final, ASM 9.5, ByteBuddy 1.…
Browse files Browse the repository at this point in the history
…14.3 (#6981)

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 5094541)
Signed-off-by: Andriy Redko <[email protected]>
  • Loading branch information
reta committed Apr 5, 2023
1 parent 3accec8 commit 5286c42
Show file tree
Hide file tree
Showing 64 changed files with 46 additions and 35 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `org.apache.maven:maven-model` from 3.6.2 to 3.9.1
- Bump `org.codehaus.jettison:jettison` from 1.5.3 to 1.5.4 ([#6878](https://github.com/opensearch-project/OpenSearch/pull/6878))
- Add `com.github.luben:zstd-jni:1.5.4-1` ([#3577](https://github.com/opensearch-project/OpenSearch/pull/3577))
- Bump: Netty from 4.1.90.Final to 4.1.91.Final , ASM 9.4 to ASM 9.5, ByteBuddy 1.14.2 to 1.14.3 ([#6981](https://github.com/opensearch-project/OpenSearch/pull/6981))

### Changed
- Require MediaType in Strings.toString API ([#6009](https://github.com/opensearch-project/OpenSearch/pull/6009))
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ 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.4
asm = 9.5
jettison = 1.5.4
woodstox = 6.4.0
kotlin = 1.7.10
Expand All @@ -25,7 +25,7 @@ guava = 31.1-jre
# when updating the JNA version, also update the version in buildSrc/build.gradle
jna = 5.5.0

netty = 4.1.90.Final
netty = 4.1.91.Final
joda = 2.12.2

# client dependencies
Expand All @@ -48,7 +48,7 @@ junit = 4.13.2
hamcrest = 2.1
mockito = 5.2.0
objenesis = 3.2
bytebuddy = 1.14.2
bytebuddy = 1.14.3

# benchmark dependencies
jmh = 1.35
1 change: 0 additions & 1 deletion modules/lang-expression/licenses/asm-9.4.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-expression/licenses/asm-9.5.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dc6ea1875f4d64fbc85e1691c95b96a3d8569c90
1 change: 0 additions & 1 deletion modules/lang-expression/licenses/asm-commons-9.4.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-expression/licenses/asm-commons-9.5.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
19ab5b5800a3910d30d3a3e64fdb00fd0cb42de0
1 change: 0 additions & 1 deletion modules/lang-expression/licenses/asm-tree-9.4.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-expression/licenses/asm-tree-9.5.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fd33c8b6373abaa675be407082fdfda35021254a
1 change: 0 additions & 1 deletion modules/lang-painless/licenses/asm-9.4.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-painless/licenses/asm-9.5.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dc6ea1875f4d64fbc85e1691c95b96a3d8569c90
1 change: 0 additions & 1 deletion modules/lang-painless/licenses/asm-analysis-9.4.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-painless/licenses/asm-analysis-9.5.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
490bacc77de7cbc0be1a30bb3471072d705be4a4
1 change: 0 additions & 1 deletion modules/lang-painless/licenses/asm-commons-9.4.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-painless/licenses/asm-commons-9.5.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
19ab5b5800a3910d30d3a3e64fdb00fd0cb42de0
1 change: 0 additions & 1 deletion modules/lang-painless/licenses/asm-tree-9.4.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-painless/licenses/asm-tree-9.5.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fd33c8b6373abaa675be407082fdfda35021254a
1 change: 0 additions & 1 deletion modules/lang-painless/licenses/asm-util-9.4.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-painless/licenses/asm-util-9.5.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
64b5a1fc8c1b15ed2efd6a063e976bc8d3dc5ffe
7 changes: 6 additions & 1 deletion modules/transport-netty4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,11 @@ thirdPartyAudit {
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator'
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator',
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$1',
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$2',
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$3',
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$4',
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$5'
)
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d8f180291c3501e931968ca7e40ae0323c4eacee

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3044b8e325e33f72c96ac1ea51dda85bef090cc0

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4519d2ff470941f0086214b19c9acf992868112f

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
93e5056462a242718e7689d81180d125c79d7723

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
444cf41e4fe28c47ffebba5e77b9458a12f938a1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
04725d117d4b71ef0e743aa79062489b45472b26

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c2f6bd7143194ca842b535546a405c06aa993934

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
80990b5885b8b67be096d7090cba18f05c67120e

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2c0242c69eee44ee559d02c564dbceee8bf0a5c7

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4ee7027e1653c6ee3f843191e0d932f29e8e14e1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8f0a52677da411a8ab762c426d723c7f54471504

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2e3e57eae1a61e4e5f558e39619186fec6c424d3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e1567967f5a85a469b10b7394e3e2b90ea5c0b12

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
80990b5885b8b67be096d7090cba18f05c67120e

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d96d417b6c6b4a786d54418e09593c4b2292f437
7 changes: 6 additions & 1 deletion plugins/transport-nio/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,11 @@ thirdPartyAudit {
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',

'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator'
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator',
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$1',
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$2',
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$3',
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$4',
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$5'
)
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d8f180291c3501e931968ca7e40ae0323c4eacee

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3044b8e325e33f72c96ac1ea51dda85bef090cc0

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4519d2ff470941f0086214b19c9acf992868112f

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
93e5056462a242718e7689d81180d125c79d7723

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
444cf41e4fe28c47ffebba5e77b9458a12f938a1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
04725d117d4b71ef0e743aa79062489b45472b26

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c2f6bd7143194ca842b535546a405c06aa993934

0 comments on commit 5286c42

Please sign in to comment.