Merge 904c6b0af0 into 4a6938956b

.github/workflows/centos-ci.yml

@@ -20,12 +20,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v2
-        with:
-          java-version: ${{ matrix.java-version }}
-          distribution: 'adopt'
-
       - name: Reset DNF repositories
         run: |
           cd /etc/yum.repos.d/
@@ -35,11 +29,21 @@ jobs:
       - name: Update DNF package index
         run: dnf makecache
 
-      - name: Install Maven with retry
+      - name: Install Java and Maven with retry
         run: |
-          for i in {1..5}; do
-              dnf install -y maven && break || sleep 15
-          done
+          if [ ${{ matrix.java-version }} -eq 8 ]; then
+            for i in {1..5}; do
+              dnf install -y java-1.8.0-openjdk-devel maven && break || sleep 15
+            done
+          elif [ ${{ matrix.java-version }} -eq 11 ]; then
+            for i in {1..5}; do
+              dnf install -y java-11-openjdk-devel maven && break || sleep 15
+            done
+          elif [ ${{ matrix.java-version }} -eq 21 ]; then
+            for i in {1..5}; do
+              dnf install -y java-21-openjdk-devel maven && break || sleep 15
+            done
+          fi
 
       - name: Verify Java and Maven installation
         run: |
@@ -57,5 +61,4 @@ jobs:
         run: mvn -B package --file pom.xml
 
       - name: Test with Maven
-        run: mvn test
-
+        run: mvn test