From 8b84f5b7d78979be979940b8ded1cbbeb868e32c Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Tue, 21 Sep 2021 22:17:24 +0200
Subject: [PATCH] #2591 Update dependencies so tests run on Java 18

Update GitHub Actions for tests to run on Java 11, 13, 16, 17 and 18-ea
---
 .github/workflows/java-ea.yml | 4 ++--
 .github/workflows/main.yml    | 4 ++--
 parent/pom.xml                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/java-ea.yml b/.github/workflows/java-ea.yml
index 598a8979a..f2b2a99be 100644
--- a/.github/workflows/java-ea.yml
+++ b/.github/workflows/java-ea.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [17-ea]
+        java: [18-ea]
     name: 'Linux JDK ${{ matrix.java }}'
     runs-on: ubuntu-latest
     steps:
@@ -21,4 +21,4 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
       - name: 'Test'
-        run: ./mvnw ${MAVEN_ARGS} install -DskipDistribution=true
+        run: ./mvnw ${MAVEN_ARGS} -Djacoco.skip=true install -DskipDistribution=true
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 741f8bce6..b02363162 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 13, 16]
+        java: [11, 13, 16, 17]
     name: 'Linux JDK ${{ matrix.java }}'
     runs-on: ubuntu-latest
     steps:
@@ -23,7 +23,7 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
       - name: 'Test'
-        run: ./mvnw ${MAVEN_ARGS} install -DskipDistribution=true
+        run: ./mvnw ${MAVEN_ARGS} -Djacoco.skip=true install -DskipDistribution=true
   linux:
     name: 'Linux JDK 8'
     runs-on: ubuntu-latest
diff --git a/parent/pom.xml b/parent/pom.xml
index 8ce94764e..f4edccfc8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -25,7 +25,7 @@
         <org.apache.maven.plugins.enforcer.version>3.0.0-M3</org.apache.maven.plugins.enforcer.version>
         <org.apache.maven.plugins.surefire.version>3.0.0-M5</org.apache.maven.plugins.surefire.version>
         <org.apache.maven.plugins.javadoc.version>3.1.0</org.apache.maven.plugins.javadoc.version>
-        <org.springframework.version>5.3.3</org.springframework.version>
+        <org.springframework.version>5.3.10</org.springframework.version>
         <org.eclipse.tycho.compiler-jdt.version>1.6.0</org.eclipse.tycho.compiler-jdt.version>
         <com.puppycrawl.tools.checkstyle.version>8.36.1</com.puppycrawl.tools.checkstyle.version>
         <org.junit.jupiter.version>5.8.0-M1</org.junit.jupiter.version>