From 1f9517c4caee48eda6eee77f603d815af1fd7770 Mon Sep 17 00:00:00 2001 From: Sarat Vemulapalli Date: Wed, 2 Feb 2022 06:51:23 -0800 Subject: [PATCH] Upgrading Shadow plugin to 7.1.2 (#2033) Shadow plugin is used for publishing jars and this upgrades Log4J dependency for build. Signed-off-by: Sarat Vemulapalli --- buildSrc/build.gradle | 2 +- .../java/org/opensearch/gradle/OpenSearchTestBasePlugin.java | 2 +- buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 06a8b01346efd..575aca98e436f 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -111,7 +111,7 @@ 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 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2' api 'de.thetaphi:forbiddenapis:3.0' api 'com.avast.gradle:gradle-docker-compose-plugin:0.14.12' 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 index 556060d8afe4a..8a972bfa37e78 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchTestBasePlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchTestBasePlugin.java @@ -217,7 +217,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 index e2bd3e71f5fc9..d164b54c7506c 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java @@ -107,7 +107,7 @@ public String call() throws Exception { root.appendNode("name", project.getName()); 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());