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

kallestenflo · web-flow · commit 2d4cc06cd24e · 2024-01-29T18:04:10.000+01:00
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,

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ buildscript {`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'`
`10`	`9`	`classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.1.0'`
`11`	`10`	`}`
`12`	`11`	`}`
`@@ -114,10 +113,11 @@ subprojects {`
`114`	`113`	`mavenJava(MavenPublication) {`
`115`	`114`	`from components.java`
`116`	`115`
`117`		`- artifactId = jar.baseName`
	`116`	`+ artifactId = project.name`
	`117`	`+ //artifactId = jar.archiveBaseName`
`118`	`118`
`119`	`119`	`pom {`
`120`		`- name = jar.baseName`
	`120`	`+ name = project.name`
`121`	`121`	`description = 'A library to query and verify JSON'`
`122`	`122`	`url = 'https://github.com/jayway/JsonPath'`
`123`	`123`
`@@ -149,9 +149,6 @@ subprojects {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`wrapper {`
`152`		`- gradleVersion = '7.4.2'`
	`152`	`+ gradleVersion = '8.5'`
`153`	`153`	`}`
`154`	`154`
`155`		`-//Task used by Heroku for staging`
`156`		`-task stage(dependsOn: [':json-path-web-test:clean', 'json-path-web-test:jar', 'json-path-web-test:shadowJar']) {}`
`157`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`description = "Assertions on Json using JsonPath"`
`2`	`2`
`3`	`3`	`jar {`
`4`		`- baseName 'json-path-assert'`
`5`	`4`	`bnd(`
`6`	`5`	`'Implementation-Title': 'json-path-assert', 'Implementation-Version': archiveVersion`
`7`	`6`	`)`