Adding asm to version file and upgrading (#2933) (#2951)

Signed-off-by: Vacha Shah <[email protected]> (cherry picked from commit fc378c7) Co-authored-by: Vacha Shah <[email protected]>
opensearch-project · Apr 18, 2022 · 98af7e0 · 98af7e0
1 parent b349851
commit 98af7e0
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 24 deletions.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -16,6 +16,7 @@ icu4j             = 70.1
 supercsv          = 2.4.0
 log4j             = 2.17.1
 slf4j             = 1.6.2
+asm               = 9.3
 
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 5.5.0

diff --git a/modules/lang-expression/build.gradle b/modules/lang-expression/build.gradle
@@ -38,9 +38,9 @@ opensearchplugin {
 dependencies {
   api "org.apache.lucene:lucene-expressions:${versions.lucene}"
   api 'org.antlr:antlr4-runtime:4.9.3'
-  api 'org.ow2.asm:asm:9.2'
-  api 'org.ow2.asm:asm-commons:9.2'
-  api 'org.ow2.asm:asm-tree:9.2'
+  api "org.ow2.asm:asm:${versions.asm}"
+  api "org.ow2.asm:asm-commons:${versions.asm}"
+  api "org.ow2.asm:asm-tree:${versions.asm}"
 }
 restResources {
   restApi {

diff --git a/modules/lang-expression/licenses/asm-9.2.jar.sha1 b/modules/lang-expression/licenses/asm-9.2.jar.sha1
diff --git a/modules/lang-expression/licenses/asm-9.3.jar.sha1 b/modules/lang-expression/licenses/asm-9.3.jar.sha1
@@ -0,0 +1 @@
+8e6300ef51c1d801a7ed62d07cd221aca3a90640
diff --git a/modules/lang-expression/licenses/asm-commons-9.2.jar.sha1 b/modules/lang-expression/licenses/asm-commons-9.2.jar.sha1
diff --git a/modules/lang-expression/licenses/asm-commons-9.3.jar.sha1 b/modules/lang-expression/licenses/asm-commons-9.3.jar.sha1
@@ -0,0 +1 @@
+1f2a432d1212f5c352ae607d7b61dcae20c20af5
diff --git a/modules/lang-expression/licenses/asm-tree-9.2.jar.sha1 b/modules/lang-expression/licenses/asm-tree-9.2.jar.sha1
diff --git a/modules/lang-expression/licenses/asm-tree-9.3.jar.sha1 b/modules/lang-expression/licenses/asm-tree-9.3.jar.sha1
@@ -0,0 +1 @@
+78d2ecd61318b5a58cd04fb237636c0e86b77d97
diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle
@@ -49,11 +49,11 @@ testClusters.all {
 
 dependencies {
   api 'org.antlr:antlr4-runtime:4.9.3'
-  api 'org.ow2.asm:asm-util:9.2'
-  api 'org.ow2.asm:asm-tree:9.2'
-  api 'org.ow2.asm:asm-commons:9.2'
-  api 'org.ow2.asm:asm-analysis:9.2'
-  api 'org.ow2.asm:asm:9.2'
+  api "org.ow2.asm:asm-util:${versions.asm}"
+  api "org.ow2.asm:asm-tree:${versions.asm}"
+  api "org.ow2.asm:asm-commons:${versions.asm}"
+  api "org.ow2.asm:asm-analysis:${versions.asm}"
+  api "org.ow2.asm:asm:${versions.asm}"
   api project('spi')
 }
 
@@ -69,11 +69,11 @@ shadowJar {
   classifier = null
   relocate 'org.objectweb', 'org.opensearch.repackage.org.objectweb'
   dependencies {
-    include(dependency('org.ow2.asm:asm:9.2'))
-    include(dependency('org.ow2.asm:asm-util:9.2'))
-    include(dependency('org.ow2.asm:asm-tree:9.2'))
-    include(dependency('org.ow2.asm:asm-commons:9.2'))
-    include(dependency('org.ow2.asm:asm-analysis:9.2'))
+    include(dependency("org.ow2.asm:asm:${versions.asm}"))
+    include(dependency("org.ow2.asm:asm-util:${versions.asm}"))
+    include(dependency("org.ow2.asm:asm-tree:${versions.asm}"))
+    include(dependency("org.ow2.asm:asm-commons:${versions.asm}"))
+    include(dependency("org.ow2.asm:asm-analysis:${versions.asm}"))
   }
 }
 

diff --git a/modules/lang-painless/licenses/asm-9.2.jar.sha1 b/modules/lang-painless/licenses/asm-9.2.jar.sha1
diff --git a/modules/lang-painless/licenses/asm-9.3.jar.sha1 b/modules/lang-painless/licenses/asm-9.3.jar.sha1
@@ -0,0 +1 @@
+8e6300ef51c1d801a7ed62d07cd221aca3a90640
diff --git a/modules/lang-painless/licenses/asm-analysis-9.2.jar.sha1 b/modules/lang-painless/licenses/asm-analysis-9.2.jar.sha1
diff --git a/modules/lang-painless/licenses/asm-analysis-9.3.jar.sha1 b/modules/lang-painless/licenses/asm-analysis-9.3.jar.sha1
@@ -0,0 +1 @@
+4b071f211b37c38e0e9f5998550197c8593f6ad8
diff --git a/modules/lang-painless/licenses/asm-commons-9.2.jar.sha1 b/modules/lang-painless/licenses/asm-commons-9.2.jar.sha1
diff --git a/modules/lang-painless/licenses/asm-commons-9.3.jar.sha1 b/modules/lang-painless/licenses/asm-commons-9.3.jar.sha1
@@ -0,0 +1 @@
+1f2a432d1212f5c352ae607d7b61dcae20c20af5
diff --git a/modules/lang-painless/licenses/asm-tree-9.2.jar.sha1 b/modules/lang-painless/licenses/asm-tree-9.2.jar.sha1
diff --git a/modules/lang-painless/licenses/asm-tree-9.3.jar.sha1 b/modules/lang-painless/licenses/asm-tree-9.3.jar.sha1
@@ -0,0 +1 @@
+78d2ecd61318b5a58cd04fb237636c0e86b77d97
diff --git a/modules/lang-painless/licenses/asm-util-9.2.jar.sha1 b/modules/lang-painless/licenses/asm-util-9.2.jar.sha1
diff --git a/modules/lang-painless/licenses/asm-util-9.3.jar.sha1 b/modules/lang-painless/licenses/asm-util-9.3.jar.sha1
@@ -0,0 +1 @@
+9595bc05510d0bd4b610188b77333fe4851a1975
diff --git a/test/logger-usage/build.gradle b/test/logger-usage/build.gradle
@@ -31,9 +31,9 @@
 apply plugin: 'opensearch.java'
 
 dependencies {
-  api 'org.ow2.asm:asm:9.2'
-  api 'org.ow2.asm:asm-tree:9.2'
-  api 'org.ow2.asm:asm-analysis:9.3'
+  api "org.ow2.asm:asm:${versions.asm}"
+  api "org.ow2.asm:asm-tree:${versions.asm}"
+  api "org.ow2.asm:asm-analysis:${versions.asm}"
   api "org.apache.logging.log4j:log4j-api:${versions.log4j}"
   testImplementation project(":test:framework")
 }