From d7d41085f81a5e7eab6e31849f8bfc2b5cfc61d3 Mon Sep 17 00:00:00 2001
From: Marc Handalian <handalm@amazon.com>
Date: Fri, 1 Apr 2022 13:40:42 -0700
Subject: [PATCH] Add Shadow jar publication to lang-painless module. (#2681)

* Add Shadow jar publication to lang-painless module.

This change creates a shadow jar for asm dependencies so
that they do not conflict with direct asm dependencies from log4j AL2 patch.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Remove security.manager systemProperty that is not required.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Add explicit task dependency for publishing to maven local required by gradle.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Move asm dependencies back to api scope.

Signed-off-by: Marc Handalian <handalm@amazon.com>
---
 modules/lang-painless/build.gradle            | 30 ++++++++++++++++++-
 .../licenses/asm-analysis-7.2.jar.sha1        |  1 -
 .../licenses/asm-analysis-9.2.jar.sha1        |  1 +
 3 files changed, 30 insertions(+), 2 deletions(-)
 delete mode 100644 modules/lang-painless/licenses/asm-analysis-7.2.jar.sha1
 create mode 100644 modules/lang-painless/licenses/asm-analysis-9.2.jar.sha1

diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle
index c524f9a7e2f..ffbb3e60eb5 100644
--- a/modules/lang-painless/build.gradle
+++ b/modules/lang-painless/build.gradle
@@ -29,8 +29,11 @@
  */
 
 import org.opensearch.gradle.testclusters.DefaultTestClustersTask;
+import com.github.jengelman.gradle.plugins.shadow.ShadowBasePlugin
+
 apply plugin: 'opensearch.validate-rest-spec'
 apply plugin: 'opensearch.yaml-rest-test'
+apply plugin: 'com.github.johnrengelman.shadow'
 
 opensearchplugin {
   description 'An easy, safe and fast scripting language for OpenSearch'
@@ -49,11 +52,36 @@ dependencies {
   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:7.2'
+  api 'org.ow2.asm:asm-analysis:9.2'
   api 'org.ow2.asm:asm:9.2'
   api project('spi')
 }
 
+test {
+  doFirst {
+    test.classpath -= project.files(project.tasks.named('shadowJar'))
+    test.classpath -= project.configurations.getByName(ShadowBasePlugin.CONFIGURATION_NAME)
+    test.classpath += project.extensions.getByType(SourceSetContainer).getByName(SourceSet.MAIN_SOURCE_SET_NAME).runtimeClasspath
+  }
+}
+
+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'))
+  }
+}
+
+tasks.validateNebulaPom.dependsOn tasks.generatePomFileForShadowPublication
+tasks.validateShadowPom.dependsOn tasks.generatePomFileForNebulaPublication
+tasks.publishNebulaPublicationToMavenLocal.dependsOn tasks.generatePomFileForShadowPublication
+tasks.publishShadowPublicationToMavenLocal.dependsOn tasks.generatePomFileForNebulaPublication
+
 tasks.named("dependencyLicenses").configure {
   mapping from: /asm-.*/, to: 'asm'
 }
diff --git a/modules/lang-painless/licenses/asm-analysis-7.2.jar.sha1 b/modules/lang-painless/licenses/asm-analysis-7.2.jar.sha1
deleted file mode 100644
index 849b5e0bfa6..00000000000
--- a/modules/lang-painless/licenses/asm-analysis-7.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b6e6abe057f23630113f4167c34bda7086691258
\ No newline at end of file
diff --git a/modules/lang-painless/licenses/asm-analysis-9.2.jar.sha1 b/modules/lang-painless/licenses/asm-analysis-9.2.jar.sha1
new file mode 100644
index 00000000000..b93483a24da
--- /dev/null
+++ b/modules/lang-painless/licenses/asm-analysis-9.2.jar.sha1
@@ -0,0 +1 @@
+7487dd756daf96cab9986e44b9d7bcb796a61c10
\ No newline at end of file