From 14ab482c6769504a62ad648511edd24987de8001 Mon Sep 17 00:00:00 2001
From: singingbush <singingbush@hotmail.com>
Date: Thu, 26 Jan 2023 20:37:32 +0000
Subject: [PATCH] Update Gradle to 7.6 and use v3 GitHub Actions

---
 .github/workflows/ci.yml                 | 9 ++++++---
 build.gradle                             | 4 +++-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 json-path-assert/build.gradle            | 2 ++
 json-path/build.gradle                   | 2 ++
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2b855664..6e9eca35 100644
--- 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, 19]
       fail-fast: false
       max-parallel: 4
     name: JDK ${{ matrix.java }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: zulu
           java-version: ${{ matrix.java }}
+          cache: gradle
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
diff --git a/build.gradle b/build.gradle
index 9e805982..e8c6bef4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,13 +27,15 @@ ext {
             test: [
                     'commons-io:commons-io:2.11.0',
                     'junit:junit:4.13.+',
-                    'org.junit.vintage:junit-vintage-engine:5.8.+',
+                    'org.junit.vintage:junit-vintage-engine:5.9.+',
                     'org.assertj:assertj-core:3.22.0',
                     '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.logging.log4j:log4j-slf4j-impl:2.19.+',
+                    'org.apache.logging.log4j:log4j-jul:2.19.+',
                     'com.google.code.gson:gson:2.10.1',
                     'org.hamcrest:hamcrest:2.2',
                     'com.fasterxml.jackson.core:jackson-databind:2.14.2',
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fce..070cb702 100644
--- 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-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/json-path-assert/build.gradle b/json-path-assert/build.gradle
index bad55321..cc1e9ae2 100644
--- a/json-path-assert/build.gradle
+++ b/json-path-assert/build.gradle
@@ -16,4 +16,6 @@ dependencies {
     testImplementation libs.jsonSmart
     testImplementation libs.test
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
+    testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'
+    testRuntimeOnly 'org.apache.logging.log4j:log4j-jul'
 }
diff --git a/json-path/build.gradle b/json-path/build.gradle
index 5ae733be..9fe2d951 100644
--- a/json-path/build.gradle
+++ b/json-path/build.gradle
@@ -23,4 +23,6 @@ dependencies {
 
     testImplementation libs.test
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
+    testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'
+    testRuntimeOnly 'org.apache.logging.log4j:log4j-jul'
 }