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

Remove deprecated AbstractArchiveTask Gradle API usages (#58657) (#58894) 

* Fix deprecated ArchiveTask configurations
This commit is contained in:
Rene Groeschke 2020-07-02 13:08:34 +02:00 committed by GitHub
parent 965f77fa44
commit 70713a0a19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle
View File

@ -11,7 +11,7 @@ dependencies {
["0.0.1", "0.0.2"].forEach { v -> ["0.0.1", "0.0.2"].forEach { v ->
["elasticsearch", "other"].forEach { p -> ["elasticsearch", "other"].forEach { p ->
tasks.register("dummy-${p}-${v}", Jar) { tasks.register("dummy-${p}-${v}", Jar) {
destinationDir = file("${buildDir}/testrepo/org/${p}/gradle/dummy-io/${v}/") destinationDirectory = file("${buildDir}/testrepo/org/${p}/gradle/dummy-io/${v}/")
archiveFileName = "dummy-io-${v}.jar" archiveFileName = "dummy-io-${v}.jar"
from sourceSets.main.output from sourceSets.main.output
include "**/TestingIO.class" include "**/TestingIO.class"

2
distribution/archives/build.gradle
View File

@ -147,7 +147,7 @@ tasks.register('buildOssNoJdkWindowsZip', Zip) {
} }
Closure commonTarConfig = { Closure commonTarConfig = {
extension = 'tar.gz' archiveExtension = 'tar.gz'
compression = Compression.GZIP compression = Compression.GZIP
dirMode 0755 dirMode 0755
fileMode 0644 fileMode 0644

6
distribution/packages/build.gradle
View File

@ -124,10 +124,10 @@ Closure commonPackageConfig(String type, boolean oss, boolean jdk, String archit
// Follow elasticsearch's file naming convention // Follow elasticsearch's file naming convention
String jdkString = jdk ? "" : "no-jdk-" String jdkString = jdk ? "" : "no-jdk-"
String prefix = "${architecture == 'aarch64' ? 'aarch64-' : ''}${oss ? 'oss-' : ''}${jdk ? '' : 'no-jdk-'}${type}" String prefix = "${architecture == 'aarch64' ? 'aarch64-' : ''}${oss ? 'oss-' : ''}${jdk ? '' : 'no-jdk-'}${type}"
destinationDir = file("${prefix}/build/distributions") destinationDirectory = file("${prefix}/build/distributions")
// SystemPackagingTask overrides default archive task convention mappings, but doesn't provide a setter so we have to override the convention mapping itself // SystemPackagingTask overrides default archive task convention mappings, but doesn't provide a setter so we have to override the convention mapping itself
conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDir}/${packageName}-${project.version}-${jdkString}${archString}.${type}")) } conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}-${project.version}-${jdkString}${archString}.${type}")) }
String packagingFiles = "build/packaging/${oss ? 'oss-' : ''}${jdk ? '' : 'no-jdk-'}${type}" String packagingFiles = "build/packaging/${oss ? 'oss-' : ''}${jdk ? '' : 'no-jdk-'}${type}"
@ -333,7 +333,7 @@ Closure commonDebConfig(boolean oss, boolean jdk, String architecture) {
customFields['License'] = 'Elastic-License' customFields['License'] = 'Elastic-License'
} }
version = project.version.replace('-', '~') archiveVersion = project.version.replace('-', '~')
packageGroup 'web' packageGroup 'web'
// versions found on oldest supported distro, centos-6 // versions found on oldest supported distro, centos-6

2
modules/lang-painless/build.gradle
View File

@ -68,7 +68,7 @@ task apiJavadoc(type: Javadoc) {
} }
task apiJavadocJar(type: Jar) { task apiJavadocJar(type: Jar) {
classifier = 'apiJavadoc' archiveClassifier = 'apiJavadoc'
from apiJavadoc from apiJavadoc
} }