From bd2dd81bc6e225053e4824ef42f4afd2794af007 Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@elastic.co>
Date: Tue, 23 Jun 2020 09:11:46 +0200
Subject: [PATCH] Fix deprecated property usage in archive tasks (#58269)
 (#58308)

---
 distribution/archives/build.gradle                        | 4 ++--
 distribution/docker/docker-build-context/build.gradle     | 2 +-
 distribution/docker/oss-docker-build-context/build.gradle | 2 +-
 qa/wildfly/build.gradle                                   | 2 +-
 x-pack/license-tools/build.gradle                         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/distribution/archives/build.gradle b/distribution/archives/build.gradle
index 50f4152b081..10226559a71 100644
--- a/distribution/archives/build.gradle
+++ b/distribution/archives/build.gradle
@@ -108,8 +108,8 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
 tasks.withType(AbstractArchiveTask).configureEach {
   dependsOn createLogsDir, createPluginsDir, createJvmOptionsDir
   String subdir = it.name.substring('build'.size()).replaceAll(/[A-Z]/) { '-' + it.toLowerCase() }.substring(1)
-  destinationDir = file("${subdir}/build/distributions")
-  baseName = "elasticsearch${subdir.contains('oss') ? '-oss' : ''}"
+  destinationDirectory = file("${subdir}/build/distributions")
+  archiveBaseName = "elasticsearch${subdir.contains('oss') ? '-oss' : ''}"
 }
 
 Closure commonZipConfig = {
diff --git a/distribution/docker/docker-build-context/build.gradle b/distribution/docker/docker-build-context/build.gradle
index 3bd3a9059c7..b641e697c4a 100644
--- a/distribution/docker/docker-build-context/build.gradle
+++ b/distribution/docker/docker-build-context/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'base'
 
 task buildDockerBuildContext(type: Tar) {
-  extension = 'tar.gz'
+  archiveExtension = 'tar.gz'
   compression = Compression.GZIP
   archiveClassifier = "docker-build-context"
   archiveBaseName = "elasticsearch"
diff --git a/distribution/docker/oss-docker-build-context/build.gradle b/distribution/docker/oss-docker-build-context/build.gradle
index 904828d7651..a3603254d13 100644
--- a/distribution/docker/oss-docker-build-context/build.gradle
+++ b/distribution/docker/oss-docker-build-context/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'base'
 
 task buildOssDockerBuildContext(type: Tar) {
-  extension = 'tar.gz'
+  archiveExtension = 'tar.gz'
   compression = Compression.GZIP
   archiveClassifier = "docker-build-context"
   archiveBaseName = "elasticsearch-oss"
diff --git a/qa/wildfly/build.gradle b/qa/wildfly/build.gradle
index 25803550336..ce16b69c402 100644
--- a/qa/wildfly/build.gradle
+++ b/qa/wildfly/build.gradle
@@ -50,7 +50,7 @@ dependencies {
 }
 
 war {
-  archiveName 'example-app.war'
+  archiveFileName = 'example-app.war'
 }
 
 elasticsearch_distributions {
diff --git a/x-pack/license-tools/build.gradle b/x-pack/license-tools/build.gradle
index 5811437e664..fe74a868edc 100644
--- a/x-pack/license-tools/build.gradle
+++ b/x-pack/license-tools/build.gradle
@@ -13,7 +13,7 @@ project.forbiddenPatterns {
 tasks.named("dependencyLicenses").configure { it.enabled = false }
 
 task buildZip(type: Zip, dependsOn: jar) {
-  String parentDir = "license-tools-${version}"
+  String parentDir = "license-tools-${archiveVersion}"
   into(parentDir + '/lib') {
     from jar
     from configurations.runtime