@@ -13,18 +13,11 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'zulu'
+        distribution: 'temurin'
         java-version: '8'
-        java-package: jdk+fx
+        java-package: jdk
+        cache: 'maven'
 
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
-      
     - name: Build with Maven
       run: mvn -B clean verify
 
@@ -112,9 +105,9 @@ jobs:
     - name: Set up JDK 8 Apache Maven Central
       uses: actions/setup-java@v2
       with: # running setup-java again overwrites the settings.xml
-        distribution: 'zulu'
+        distribution: 'temurin'
         java-version: '8'
-        java-package: jdk+fx
+        java-package: jdk
         server-id: ossrh
         server-username: MAVEN_CENTRAL_USERNAME
         server-password: MAVEN_CENTRAL_TOKEN
@@ -144,17 +137,9 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'zulu'
+        distribution: 'temurin'
         java-version: '8'
-        java-package: jdk+fx
-
-    - name: Restore - Maven Cache
-      uses: actions/cache@v1
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-:  
+        java-package: jdk
 
     - name: Build dependencies/licenses files
       run: mvn -B project-info-reports:dependencies
 
@@ -9,19 +9,19 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up JDK 8 Apache Maven Central
+    - name: Set up JDK 8 OSSRH
       uses: actions/setup-java@v2
       with: # running setup-java again overwrites the settings.xml
-        distribution: 'zulu'
+        distribution: 'temurin'
         java-version: '8'
-        java-package: jdk+fx
+        java-package: jdk
         server-id: ossrh
         server-username: MAVEN_CENTRAL_USERNAME
         server-password: MAVEN_CENTRAL_TOKEN
         gpg-passphrase: MAVEN_GPG_PASSPHRASE
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
 
-    - name: Publish to Apache Maven Central
+    - name: Publish to OSSRH
       run: mvn -B deploy -Possrh
       env:
         MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}