Merge pull request #28 from usdot-jpo-ode/ci-v

CI bug during JDK 21 update

.github/workflows/ci.yml

@@ -1,25 +1,23 @@
 name: CI
-on: 
+on:   
   pull_request:
+    types: [opened, reopened, synchronize]
   push:
+    branches: [develop, master]
 
 jobs:
   jpo-security-svcs:
    runs-on: ubuntu-latest
    container:
-     image: maven:3.8-eclipse-temurin-21-alpine
+     image: openjdk:21-jdk-slim-buster
      options: --user root
    steps:
      - name: Checkout ${{ github.event.repository.name }}
-       uses: actions/checkout@v3    
+       uses: actions/checkout@v4    
      - name: Set up Maven
        uses: stCarolas/[email protected]
        with:
-        maven-version: 3.8.2          
-     - uses: actions/setup-java@v3
-       with:
-         java-version: '21'
-         distribution: 'temurin'               
+        maven-version: 3.8.2              
      - name: Build
        run: |
          cd $GITHUB_WORKSPACE
@@ -63,9 +61,9 @@ jobs:
         run: |
           find "$GITHUB_WORKSPACE" -name "jacoco.xml"                
       - name: Setup SonarScanner
-        uses: warchant/setup-sonar-scanner@v4
+        uses: warchant/setup-sonar-scanner@v7
         with:
-          version: 4.8.0.2856
+          version: 5.0.1.3006
       - name: Generate sonar properties file
         run: |
           cat <<EOF > /tmp/sonar-scanner.properties
@@ -74,7 +72,7 @@ jobs:
           sonar.java.binaries=home/runner/work/jpo-security-svcs/jpo-security-svcs/target
           sonar.projectBaseDir=$GITHUB_WORKSPACE
           sonar.projectKey=usdot-jpo-ode_jpo-security-svcs
-          sonar.organization=usdot-jpo-ode-1
+          sonar.organization=usdot-jpo-ode
           jpo-security-svcs.sonar.projectBaseDir  = home/runner/work/jpo-security-svcs/jpo-security-svcs
           jpo-security-svcs.sonar.sources         = src
           tmca-tester.sonar.projectBaseDir=$GITHUB_WORKSPACE /tmca-tester

.github/workflows/docker.yml

@@ -1,12 +1,8 @@
 name: Docker build
 
 on:
-  push:
-    branches-ignore:
-      - "develop"
-      - "master"
-      - "release/*"
   pull_request:
+    types: [opened, synchronize, reopened]
 
 jobs:
   jpo-security-svcs: