honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix deprecated property usage in archive tasks (#58269) (#58308)

This commit is contained in:
Rene Groeschke 2020-06-23 09:11:46 +02:00 committed by GitHub
parent 3169e4c70e
commit bd2dd81bc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distribution/archives/build.gradle
View File

@ -108,8 +108,8 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
tasks.withType(AbstractArchiveTask).configureEach { tasks.withType(AbstractArchiveTask).configureEach {
dependsOn createLogsDir, createPluginsDir, createJvmOptionsDir dependsOn createLogsDir, createPluginsDir, createJvmOptionsDir
String subdir = it.name.substring('build'.size()).replaceAll(/[A-Z]/) { '-' + it.toLowerCase() }.substring(1) String subdir = it.name.substring('build'.size()).replaceAll(/[A-Z]/) { '-' + it.toLowerCase() }.substring(1)
destinationDir = file("${subdir}/build/distributions") destinationDirectory = file("${subdir}/build/distributions")
baseName = "elasticsearch${subdir.contains('oss') ? '-oss' : ''}" archiveBaseName = "elasticsearch${subdir.contains('oss') ? '-oss' : ''}"
} }
Closure commonZipConfig = { Closure commonZipConfig = {

2
distribution/docker/docker-build-context/build.gradle
View File

@ -1,7 +1,7 @@
apply plugin: 'base' apply plugin: 'base'
task buildDockerBuildContext(type: Tar) { task buildDockerBuildContext(type: Tar) {
extension = 'tar.gz' archiveExtension = 'tar.gz'
compression = Compression.GZIP compression = Compression.GZIP
archiveClassifier = "docker-build-context" archiveClassifier = "docker-build-context"
archiveBaseName = "elasticsearch" archiveBaseName = "elasticsearch"

2
distribution/docker/oss-docker-build-context/build.gradle
View File

@ -1,7 +1,7 @@
apply plugin: 'base' apply plugin: 'base'
task buildOssDockerBuildContext(type: Tar) { task buildOssDockerBuildContext(type: Tar) {
extension = 'tar.gz' archiveExtension = 'tar.gz'
compression = Compression.GZIP compression = Compression.GZIP
archiveClassifier = "docker-build-context" archiveClassifier = "docker-build-context"
archiveBaseName = "elasticsearch-oss" archiveBaseName = "elasticsearch-oss"

2
qa/wildfly/build.gradle
View File

@ -50,7 +50,7 @@ dependencies {
} }
war { war {
archiveName 'example-app.war' archiveFileName = 'example-app.war'
} }
elasticsearch_distributions { elasticsearch_distributions {

2
x-pack/license-tools/build.gradle
View File

@ -13,7 +13,7 @@ project.forbiddenPatterns {
tasks.named("dependencyLicenses").configure { it.enabled = false } tasks.named("dependencyLicenses").configure { it.enabled = false }
task buildZip(type: Zip, dependsOn: jar) { task buildZip(type: Zip, dependsOn: jar) {
String parentDir = "license-tools-${version}" String parentDir = "license-tools-${archiveVersion}"
into(parentDir + '/lib') { into(parentDir + '/lib') {
from jar from jar
from configurations.runtime from configurations.runtime