Upgrading Shadow plugin to 7.1.2 (opensearch-project#2033)

Shadow plugin is used for publishing jars and this upgrades Log4J dependency for build. Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com> (cherry picked from commit 1f9517c)
kotwanikunal · Jun 22, 2023 · b17176d · b17176d
1 parent c428d93
commit b17176d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -111,8 +111,8 @@ dependencies {
   api 'org.apache.rat:apache-rat:0.13'
   api 'commons-io:commons-io:2.7'
   api "net.java.dev.jna:jna:5.5.0"
-  api 'com.github.jengelman.gradle.plugins:shadow:6.0.0'
   api 'de.thetaphi:forbiddenapis:3.2'
+  api 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
   api 'com.avast.gradle:gradle-docker-compose-plugin:0.14.12'
   api "org.yaml:snakeyaml:${props.getProperty('snakeyaml')}"
   api 'org.apache.maven:maven-model:3.6.2'

diff --git a/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchTestBasePlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchTestBasePlugin.java
@@ -214,7 +214,7 @@ public void execute(Task t) {
                     .getByName(SourceSet.MAIN_SOURCE_SET_NAME)
                     .getRuntimeClasspath();
                 // Add any "shadow" dependencies. These are dependencies that are *not* bundled into the shadow JAR
-                Configuration shadowConfig = project.getConfigurations().getByName(ShadowBasePlugin.getCONFIGURATION_NAME());
+                Configuration shadowConfig = project.getConfigurations().getByName(ShadowBasePlugin.CONFIGURATION_NAME);
                 // Add the shadow JAR artifact itself
                 FileCollection shadowJar = project.files(project.getTasks().named("shadowJar"));
 

diff --git a/buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java
@@ -112,7 +112,7 @@ public String call() throws Exception {
                     root.appendNode("description", project.getDescription());
                 }
                 Node dependenciesNode = (Node) ((NodeList) root.get("dependencies")).get(0);
-                project.getConfigurations().getByName(ShadowBasePlugin.getCONFIGURATION_NAME()).getAllDependencies().all(dependency -> {
+                project.getConfigurations().getByName(ShadowBasePlugin.CONFIGURATION_NAME).getAllDependencies().all(dependency -> {
                     if (dependency instanceof ProjectDependency) {
                         Node dependencyNode = dependenciesNode.appendNode("dependency");
                         dependencyNode.appendNode("groupId", dependency.getGroup());