Merge remote-tracking branch 'origin/update-from-template' into develop

Author: AB-xdev

.github/workflows/checkBuild.yml

@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 17, 21]
         java-package: [jdk]
         distribution: [temurin]
         include: 
@@ -30,7 +30,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: ${{ matrix.distribution }}
         java-version: ${{ matrix.java }}

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: '8'
@@ -117,7 +117,7 @@ jobs:
         git pull
     
     - name: Set up JDK OSSRH
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with: # running setup-java again overwrites the settings.xml
         distribution: ${{ matrix.distribution }}
         java-version: ${{ matrix.java }}
@@ -149,7 +149,7 @@ jobs:
         git pull
 
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '11'

.github/workflows/test-deploy.yml

@@ -21,7 +21,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up JDK OSSRH
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with: # running setup-java again overwrites the settings.xml
         distribution: ${{ matrix.distribution }}
         java-version: ${{ matrix.java }}

.github/workflows/update-from-template.yml

@@ -86,9 +86,8 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh_pr_up() { 
-            gh pr create "$@" || gh pr edit "$@" 
+            gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || (git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@")
           }
           gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
-            -H "${{ env.UPDATE_BRANCH }}" \
             --title "Update from template" \
             --body "An automated PR to sync changes from the template into this repo"

pom.xml

@@ -136,7 +136,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.6.3</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>