github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 17:34:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix hadoop client api patch configuration cache compatibility (#119324)

Browse source
This commit is contained in:
Rene Groeschke 2024-12-30 09:52:20 +01:00 • committed by GitHub
parent 12e86b1cd0
commit dee3c6e44f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/repository-hdfs/hadoop-client-api/build.gradle
View file

@ -1,3 +1,5 @@
import org.gradle.api.file.ArchiveOperations
apply plugin: 'elasticsearch.java' apply plugin: 'elasticsearch.java'
sourceSets { sourceSets {
@ -27,16 +29,23 @@ def patchTask = tasks.register("patchClasses", JavaExec) {
outputs.dir(outputDir) outputs.dir(outputDir)
classpath = sourceSets.patcher.runtimeClasspath classpath = sourceSets.patcher.runtimeClasspath
mainClass = 'org.elasticsearch.hdfs.patch.HdfsClassPatcher' mainClass = 'org.elasticsearch.hdfs.patch.HdfsClassPatcher'
def thejar = configurations.thejar
doFirst { doFirst {
args(configurations.thejar.singleFile, outputDir.get().asFile) args(thejar.singleFile, outputDir.get().asFile)
} }
} }
interface InjectedArchiveOps {
@Inject ArchiveOperations getArchiveOperations()
}
tasks.named('jar').configure { tasks.named('jar').configure {
dependsOn(configurations.thejar) dependsOn(configurations.thejar)
def injected = project.objects.newInstance(InjectedArchiveOps)
def thejar = configurations.thejar
from(patchTask) from(patchTask)
from({ project.zipTree(configurations.thejar.singleFile) }) { from({ injected.getArchiveOperations().zipTree(thejar.singleFile) }) {
eachFile { eachFile {
if (outputDir.get().file(it.relativePath.pathString).asFile.exists()) { if (outputDir.get().file(it.relativePath.pathString).asFile.exists()) {
it.exclude() it.exclude()