Upgrade to gradle 8.5 and add java 21 build (#995)

json-path · Jan 29, 2024 · 2d4cc06 · 2d4cc06
1 parent 83ced52
commit 2d4cc06
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 302 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 17, 18] # todo: update to latest Gradle version for Java 21 support
+        java: [ 8, 11, 17, 18, 21 ]
       fail-fast: false
       max-parallel: 4
     name: JDK ${{ matrix.java }}

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,6 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
         classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.1.0'
     }
 }
@@ -114,10 +113,11 @@ subprojects {
             mavenJava(MavenPublication) {
                 from components.java
 
-                artifactId = jar.baseName
+                artifactId = project.name
+                //artifactId = jar.archiveBaseName
 
                 pom {
-                    name = jar.baseName
+                    name = project.name
                     description = 'A library to query and verify JSON'
                     url = 'https://github.com/jayway/JsonPath'
 
@@ -149,9 +149,6 @@ subprojects {
 }
 
 wrapper {
-    gradleVersion = '7.4.2'
+    gradleVersion = '8.5'
 }
 
-//Task used by Heroku for staging
-task stage(dependsOn: [':json-path-web-test:clean', 'json-path-web-test:jar', 'json-path-web-test:shadowJar']) {}
-
diff --git a/gradle/binaryCompatibility.gradle b/gradle/binaryCompatibility.gradle
diff --git a/gradle/binarycompat-report.groovy b/gradle/binarycompat-report.groovy
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/json-path-assert/build.gradle b/json-path-assert/build.gradle
@@ -1,7 +1,6 @@
 description = "Assertions on Json using JsonPath"
 
 jar {
-    baseName 'json-path-assert'
     bnd(
             'Implementation-Title': 'json-path-assert', 'Implementation-Version': archiveVersion
     )

diff --git a/json-path/build.gradle b/json-path/build.gradle
@@ -1,7 +1,6 @@
 description = "Java port of Stefan Goessner JsonPath."
 
 jar {
-    baseName 'json-path'
     bnd(
             'Automatic-Module-Name': 'json.path',
             'Implementation-Title': 'json-path', 'Implementation-Version': archiveVersion,