Skip to content

Commit 6b1986e

Browse files
authored
Fix Shadow JAR dependency publication (opensearch-project#11369) (opensearch-project#11396)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io> (cherry picked from commit 7aa65b4)
1 parent f7c8dd3 commit 6b1986e

File tree

2 files changed

+1
-25
lines changed

2 files changed

+1
-25
lines changed

modules/lang-painless/build.gradle

-25
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import com.github.jengelman.gradle.plugins.shadow.ShadowBasePlugin
3333

3434
apply plugin: 'opensearch.validate-rest-spec'
3535
apply plugin: 'opensearch.yaml-rest-test'
36-
apply plugin: 'com.github.johnrengelman.shadow'
3736

3837
opensearchplugin {
3938
description 'An easy, safe and fast scripting language for OpenSearch'
@@ -62,30 +61,6 @@ dependencies {
6261
api project('spi')
6362
}
6463

65-
test {
66-
doFirst {
67-
test.classpath -= project.files(project.tasks.named('shadowJar'))
68-
test.classpath -= project.configurations.getByName(ShadowBasePlugin.CONFIGURATION_NAME)
69-
test.classpath += project.extensions.getByType(SourceSetContainer).getByName(SourceSet.MAIN_SOURCE_SET_NAME).runtimeClasspath
70-
}
71-
}
72-
73-
shadowJar {
74-
archiveClassifier.set('')
75-
relocate 'org.objectweb', 'org.opensearch.repackage.org.objectweb'
76-
dependencies {
77-
include(dependency("org.ow2.asm:asm:${versions.asm}"))
78-
include(dependency("org.ow2.asm:asm-util:${versions.asm}"))
79-
include(dependency("org.ow2.asm:asm-tree:${versions.asm}"))
80-
include(dependency("org.ow2.asm:asm-commons:${versions.asm}"))
81-
include(dependency("org.ow2.asm:asm-analysis:${versions.asm}"))
82-
}
83-
}
84-
85-
tasks.validateNebulaPom.dependsOn tasks.generatePomFileForShadowPublication
86-
tasks.validateShadowPom.dependsOn tasks.generatePomFileForNebulaPublication
87-
tasks.withType(AbstractPublishToMaven)*.dependsOn "generatePomFileForShadowPublication", "generatePomFileForNebulaPublication"
88-
8964
tasks.named("dependencyLicenses").configure {
9065
mapping from: /asm-.*/, to: 'asm'
9166
}

release-notes/opensearch.release-notes-2.11.1.md

+1
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
### Fixed
99
- [BUG] Disable sort optimization for HALF_FLOAT ([#10999](https://github.com/opensearch-project/OpenSearch/pull/10999))
1010
- Adding version condition while adding geoshape doc values to the index, to ensure backward compatibility.([#11095](https://github.com/opensearch-project/OpenSearch/pull/11095))
11+
- Remove shadowJar from `lang-painless` module publication ([#11369](https://github.com/opensearch-project/OpenSearch/issues/11369))

0 commit comments

Comments
 (0)