Merge branch 'master' into json-smart-bump

json-path · Jan 2, 2024 · 832ec8a · 832ec8a
2 parents 9a6be0d + 2d57ab3
commit 832ec8a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,17 +10,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 17, 18]
+        java: [8, 11, 17, 18] # todo: update to latest Gradle version for Java 21 support
       fail-fast: false
       max-parallel: 4
     name: JDK ${{ matrix.java }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
+          distribution: temurin
+          cache: 'gradle'
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 

diff --git a/build.gradle b/build.gradle
@@ -14,33 +14,33 @@ buildscript {
 ext {
     libs = [
             jsonSmart: 'net.minidev:json-smart:2.5.0',
-            slf4jApi: 'org.slf4j:slf4j-api:1.7.36',
+            slf4jApi: 'org.slf4j:slf4j-api:2.0.9',
             gson: 'com.google.code.gson:gson:2.10.1',
             hamcrest: 'org.hamcrest:hamcrest:2.2',
-            jacksonDatabind: 'com.fasterxml.jackson.core:jackson-databind:2.14.2',
+            jacksonDatabind: 'com.fasterxml.jackson.core:jackson-databind:2.15.3',
             jettison: 'org.codehaus.jettison:jettison:1.5.4',
-            jsonOrg: 'org.json:json:20230227',
-            tapestryJson: 'org.apache.tapestry:tapestry-json:5.8.1',
-            jakartaJsonP: 'jakarta.json:jakarta.json-api:2.0.1',
+            jsonOrg: 'org.json:json:20231013',
+            tapestryJson: 'org.apache.tapestry:tapestry-json:5.8.3',
+            jakartaJsonP: 'jakarta.json:jakarta.json-api:2.0.2',
             jakartaJsonB: 'jakarta.json.bind:jakarta.json.bind-api:2.0.0',
 
             test: [
-                    'commons-io:commons-io:2.11.0',
+                    'commons-io:commons-io:2.15.0',
                     'junit:junit:4.13.+',
-                    'org.junit.vintage:junit-vintage-engine:5.8.+',
-                    'org.assertj:assertj-core:3.22.0',
+                    'org.junit.vintage:junit-vintage-engine:5.10.+',
+                    'org.assertj:assertj-core:3.24.2',
                     'org.hamcrest:hamcrest:2.2',
                     'org.glassfish:jakarta.json:2.0.1',
                     'org.eclipse:yasson:2.0.4',
-                    //'org.apache.johnzon:johnzon-jsonb:1.2.12',
-                    'org.slf4j:slf4j-simple:1.7.36',
+                    //'org.apache.johnzon:johnzon-jsonb:1.2.21',
+                    'org.slf4j:slf4j-simple:2.0.9',
                     'com.google.code.gson:gson:2.10.1',
                     'org.hamcrest:hamcrest:2.2',
-                    'com.fasterxml.jackson.core:jackson-databind:2.14.2',
+                    'com.fasterxml.jackson.core:jackson-databind:2.15.3',
                     'org.codehaus.jettison:jettison:1.5.4',
-                    'org.json:json:20140107',
-                    'org.apache.tapestry:tapestry-json:5.8.1',
-                    'jakarta.json:jakarta.json-api:2.0.1',
+                    'org.json:json:20231013',
+                    'org.apache.tapestry:tapestry-json:5.8.3',
+                    'jakarta.json:jakarta.json-api:2.0.2',
                     'jakarta.json.bind:jakarta.json.bind-api:2.0.0'
 
             ]
@@ -64,8 +64,8 @@ subprojects {
     apply plugin: 'signing'
     apply plugin: 'biz.aQute.bnd.builder'
 
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 
     repositories {
         mavenCentral()

diff --git a/json-path/build.gradle b/json-path/build.gradle
@@ -4,6 +4,7 @@ description = "Java port of Stefan Goessner JsonPath."
 jar {
     baseName 'json-path'
     bnd (
+        'Automatic-Module-Name': 'json.path',
         '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'