From dbc87d23259270a6527fa6451f5ed85d415efba6 Mon Sep 17 00:00:00 2001
From: Levent Divilioglu <bzdgn@users.noreply.github.com>
Date: Sat, 4 Feb 2023 16:41:46 +0100
Subject: [PATCH] Use alternative property names for the deprecated properties

---
 build.gradle                    | 4 ++--
 json-path-assert/build.gradle   | 4 ++--
 json-path-web-test/build.gradle | 4 ++--
 json-path/build.gradle          | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index b68f6b71..680bfdac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -99,10 +99,10 @@ subprojects {
             mavenJava(MavenPublication) {
                 from components.java
 
-                artifactId = jar.baseName
+                artifactId = jar.archiveBaseName
 
                 pom {
-                    name = jar.baseName
+                    name = jar.archiveBaseName
                     description = project.description
                     url = 'https://github.com/jayway/JsonPath'
 
diff --git a/json-path-assert/build.gradle b/json-path-assert/build.gradle
index e0cc9710..79f22232 100644
--- a/json-path-assert/build.gradle
+++ b/json-path-assert/build.gradle
@@ -2,9 +2,9 @@
 description = "Assertions on Json using JsonPath"
 
 jar {
-    baseName 'json-path-assert'
+    archiveBaseName = 'json-path-assert'
     bnd (
-        'Implementation-Title': 'json-path-assert', 'Implementation-Version': version
+        'Implementation-Title': 'json-path-assert', 'Implementation-Version': archiveVersion
     )
 }
 
diff --git a/json-path-web-test/build.gradle b/json-path-web-test/build.gradle
index a708daf6..4f0d0157 100644
--- a/json-path-web-test/build.gradle
+++ b/json-path-web-test/build.gradle
@@ -18,10 +18,10 @@ task createBuildInfoFile {
 
 jar {
     dependsOn createBuildInfoFile
-    baseName 'json-path-web-test'
+    archiveVersion = 'json-path-web-test'
     bnd (
         'Implementation-Title': 'json-path-web-test',
-        'Implementation-Version': version,
+        'Implementation-Version': archiveVersion,
         'Main-Class': mainClassName
     )
 }
diff --git a/json-path/build.gradle b/json-path/build.gradle
index cc89e17b..7d8ab1a6 100644
--- a/json-path/build.gradle
+++ b/json-path/build.gradle
@@ -2,9 +2,9 @@
 description = "Java port of Stefan Goessner JsonPath."
 
 jar {
-    baseName 'json-path'
+    archiveBaseName = 'json-path'
     bnd (
-        'Implementation-Title': 'json-path', 'Implementation-Version': version,
+        'Implementation-Title': 'json-path', 'Implementation-Version': archiveVersion,
         'Import-Package': 'org.json.*;resolution:=optional, com.google.gson.*;resolution:=optional, com.fasterxml.jackson.*;resolution:=optional, org.apache.tapestry5.json.*;resolution:=optional, org.codehaus.jettison.*;resolution:=optional, jakarta.json.*;resolution:=optional, *',
         'Export-Package': 'com.jayway.jsonpath,com.jayway.jsonpath.spi,com.jayway.jsonpath.spi.cache,com.jayway.jsonpath.spi.json,com.jayway.jsonpath.spi.mapper'
     )
@@ -68,9 +68,9 @@ task distZip(type: Zip, dependsOn: assemble) {
 }
 
 task distTar(type: Tar, dependsOn: assemble) {
-    classifier = 'with-dependencies'
+    archiveClassifier = 'with-dependencies'
     compression = Compression.GZIP
-    extension = 'tar.gz'
+    archiveExtension = 'tar.gz'
 
     from('build/docs') {
         into 'api'