Merge pull request #15 from CDOT-CV/sync-cdot-dev-with-usdot-dev

Sync CDOT dev branch with latest USDOT dev changes

.github/workflows/ci.yml

@@ -1,7 +1,9 @@
 name: CI
 on: 
   pull_request:
+    types: [opened, reopened, synchronize]
   push:
+    branches: [develop, master]
 
 jobs:
   jpo-sdw-depositor:
@@ -16,10 +18,6 @@ jobs:
        uses: stCarolas/[email protected]
        with:
         maven-version: 3.9.6
-     - uses: actions/setup-java@v4
-       with:
-         java-version: '21'
-         distribution: 'temurin'               
      - name: Build
        run: |
          cd $GITHUB_WORKSPACE

.github/workflows/docker.yml

@@ -1,11 +1,6 @@
 name: Docker build
 
 on:
-  push:
-    branches-ignore:
-      - "develop"
-      - "master"
-      - "release/*"
   pull_request:
       types: [opened, synchronize, reopened]
 

pom.xml

@@ -71,7 +71,7 @@
       <dependency>
          <groupId>org.json</groupId>
          <artifactId>json</artifactId>
-         <version>20230227</version>
+         <version>20231013</version>
       </dependency>
       <dependency>
          <groupId>org.springframework.boot</groupId>