Merge branch 'master' into tmm/spdx

Author: lhazlewood

.github/workflows/ci.yml

@@ -20,9 +20,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: oracle-actions/setup-java@v1.1.0
+        uses: actions/setup-java@v4.7.0
         with:
-          release: ${{ matrix.java }}
+          distribution: oracle
+          java-version: ${{ matrix.java }}
       - name: Install softhsm2
         run: sudo apt-get install -y softhsm2
       - name: Install opensc