Skip to content

Commit 6b557db

Browse files
authored
Bump shadow-gradle-plugin from 8.3.9 to 9.3.1 (opensearch-project#20569)
Signed-off-by: Andrew Ross <andrross@amazon.com>
1 parent 718d36a commit 6b557db

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
3131
- Fix the regression of terms agg optimization at high cardinality ([#20623](https://github.com/opensearch-project/OpenSearch/pull/20623))
3232

3333
### Dependencies
34+
- Bump shadow-gradle-plugin from 8.3.9 to 9.3.1 ([#20569](https://github.com/opensearch-project/OpenSearch/pull/20569))
3435
- Bump `ch.qos.logback:logback-core` and `ch.qos.logback:logback-classic` from 1.5.24 to 1.5.27 ([#20525](https://github.com/opensearch-project/OpenSearch/pull/20525))
3536
- Bump `org.apache.commons:commons-text` from 1.14.0 to 1.15.0 ([#20576](https://github.com/opensearch-project/OpenSearch/pull/20576))
3637
- Bump `aws-actions/configure-aws-credentials` from 5 to 6 ([#20577](https://github.com/opensearch-project/OpenSearch/pull/20577))

buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ dependencies {
111111
api 'org.apache.rat:apache-rat:0.15'
112112
api "commons-io:commons-io:${props.getProperty('commonsio')}"
113113
api "net.java.dev.jna:jna:5.16.0"
114-
api 'com.gradleup.shadow:shadow-gradle-plugin:8.3.9'
114+
api 'com.gradleup.shadow:shadow-gradle-plugin:9.3.1'
115115
api 'org.jdom:jdom2:2.0.6.1'
116116
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${props.getProperty('kotlin')}"
117117
api 'de.thetaphi:forbiddenapis:3.10'

buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
package org.opensearch.gradle;
3434

3535
import com.github.jengelman.gradle.plugins.shadow.ShadowBasePlugin;
36-
import com.github.jengelman.gradle.plugins.shadow.ShadowExtension;
3736
import groovy.util.Node;
3837
import groovy.util.NodeList;
3938

@@ -103,8 +102,7 @@ public String call() throws Exception {
103102

104103
project.getPluginManager().withPlugin("com.github.johnrengelman.shadow", plugin -> {
105104
MavenPublication publication = publishing.getPublications().maybeCreate("shadow", MavenPublication.class);
106-
ShadowExtension shadow = project.getExtensions().getByType(ShadowExtension.class);
107-
shadow.component(publication);
105+
publication.from(project.getComponents().getByName("shadow"));
108106
// Workaround for https://github.com/johnrengelman/shadow/issues/334
109107
// Here we manually add any project dependencies in the "shadow" configuration to our generated POM
110108
publication.getPom().withXml(xml -> {

0 commit comments

Comments
 (0)