Adjust caching solution

Instead of a separate cache step, add caching as functionality to the
setup-java step. This will simplify the GitHub Actions.

Author: smcvb

.github/workflows/main.yml

@@ -28,18 +28,11 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
+          cache: "maven"
           server-id: sonatype
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
 
-      - name: Cache .m2
-        uses: actions/cache@v2.1.7
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven
-
       - name: Regular Build
         if: ${{ !matrix.sonar-enabled }}
         run: |

.github/workflows/pullrequest.yml

@@ -25,18 +25,11 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
+          cache: "maven"
           server-id: sonatype
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
 
-      - name: Cache .m2
-        uses: actions/cache@v2.1.7
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven
-
       - name: Regular Build
         if: ${{ !matrix.sonar-enabled }}
         run: |