Update dependencies (#84)

* update dependencies including raise SpringBoot 3 * change openapi dependency * update version * Update Jackson Dependencies * Update org.json.json lib Add CVE-2023-35116 to Exclusion * Update org.json.json lib Add CVE-2023-35116 to Exclusion * Update Guava * update ci to java 17 * Update src/test/java/eu/europa/ec/dgc/verifier/restapi/controller/TrustedIssuerIntegrationTest.java --------- Co-authored-by: Felix Dittrich <[email protected]> Co-authored-by: Felix Dittrich <[email protected]>
WorldHealthOrganization · Jun 21, 2023 · b0b1e1c · b0b1e1c
1 parent 6cb207b
commit b0b1e1c
Show file tree

Hide file tree

Showing 23 changed files with 421 additions and 388 deletions.
diff --git a/.github/workflows/ci-dependency-check.yml b/.github/workflows/ci-dependency-check.yml
@@ -1,42 +1,42 @@
 name: ci-dependency-check
 on:
   schedule:
-    - cron: '0 1 * * 0' # Each Sunday at 01:00 UTC
+    - cron: "0 1 * * 0" # Each Sunday at 01:00 UTC
   pull_request:
     types:
-    - opened
-    - synchronize
-    - reopened
+      - opened
+      - synchronize
+      - reopened
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/setup-java@v2
-      with:
-        java-version: 11
-        distribution: adopt
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - uses: actions/cache@v2
-      with:
-        path: |
-          ~/.m2/repository
-        key: ${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
-    - name: version
-      run: |-
-        APP_SHA=$(git rev-parse --short ${GITHUB_SHA})
-        APP_LATEST_REV=$(git rev-list --tags --max-count=1)
-        APP_LATEST_TAG=$(git describe --tags ${APP_LATEST_REV} 2> /dev/null || echo 0.0.0)
-        echo "APP_VERSION=${APP_LATEST_TAG}-${APP_SHA}" >> ${GITHUB_ENV}
-    - name: mvn
-      run: |-
-        mvn dependency-check:check \
-        --batch-mode \
-        --file ./pom.xml \
-        --settings ./settings.xml \
-        --define app.packages.username="${APP_PACKAGES_USERNAME}" \
-        --define app.packages.password="${APP_PACKAGES_PASSWORD}" \
-      env:
-        APP_PACKAGES_USERNAME: ${{ github.actor }}
-        APP_PACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/setup-java@v2
+        with:
+          java-version: 17
+          distribution: adopt
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.m2/repository
+          key: ${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+      - name: version
+        run: |-
+          APP_SHA=$(git rev-parse --short ${GITHUB_SHA})
+          APP_LATEST_REV=$(git rev-list --tags --max-count=1)
+          APP_LATEST_TAG=$(git describe --tags ${APP_LATEST_REV} 2> /dev/null || echo 0.0.0)
+          echo "APP_VERSION=${APP_LATEST_TAG}-${APP_SHA}" >> ${GITHUB_ENV}
+      - name: mvn
+        run: |-
+          mvn dependency-check:check \
+          --batch-mode \
+          --file ./pom.xml \
+          --settings ./settings.xml \
+          --define app.packages.username="${APP_PACKAGES_USERNAME}" \
+          --define app.packages.password="${APP_PACKAGES_PASSWORD}" \
+        env:
+          APP_PACKAGES_USERNAME: ${{ github.actor }}
+          APP_PACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml
@@ -7,31 +7,31 @@ on:
         description: Version to deploy
 jobs:
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
     env:
       APP_VERSION: ${{ github.event.inputs.version }}
     steps:
-    - name: cf setup
-      run: |-
-        curl -sL "https://packages.cloudfoundry.org/stable?release=${CF_RELEASE}&version=${CF_VERSION}" | \
-        sudo tar -zx -C /usr/local/bin
-      env:
-        CF_VERSION: 7.2.0
-        CF_RELEASE: linux64-binary
-    - name: cf push
-      run: |-
-        cf api ${CF_API}
-        cf auth
-        cf target -o ${CF_ORG} -s ${CF_SPACE}
-        cf push ${APP_NAME} --docker-image ${APP_IMAGE}:${APP_VERSION} --docker-username ${CF_DOCKER_USERNAME}
-      env:
-        APP_NAME: dgca-verifier-service-eu-test
-        APP_IMAGE: docker.pkg.github.com/${{ github.repository }}/dgca-verifier-service
-        CF_API: ${{ secrets.CF_API }}
-        CF_ORG: ${{ secrets.CF_ORG }}
-        CF_SPACE: ${{ secrets.CF_SPACE }}
-        CF_USERNAME: ${{ secrets.CF_USERNAME }}
-        CF_PASSWORD: ${{ secrets.CF_PASSWORD }}
-        CF_DOCKER_USERNAME: ${{ secrets.CF_DOCKER_USERNAME }}
-        CF_DOCKER_PASSWORD: ${{ secrets.CF_DOCKER_PASSWORD }}
+      - name: cf setup
+        run: |-
+          curl -sL "https://packages.cloudfoundry.org/stable?release=${CF_RELEASE}&version=${CF_VERSION}" | \
+          sudo tar -zx -C /usr/local/bin
+        env:
+          CF_VERSION: 7.2.0
+          CF_RELEASE: linux64-binary
+      - name: cf push
+        run: |-
+          cf api ${CF_API}
+          cf auth
+          cf target -o ${CF_ORG} -s ${CF_SPACE}
+          cf push ${APP_NAME} --docker-image ${APP_IMAGE}:${APP_VERSION} --docker-username ${CF_DOCKER_USERNAME}
+        env:
+          APP_NAME: dgca-verifier-service-eu-test
+          APP_IMAGE: docker.pkg.github.com/${{ github.repository }}/dgca-verifier-service
+          CF_API: ${{ secrets.CF_API }}
+          CF_ORG: ${{ secrets.CF_ORG }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
+          CF_USERNAME: ${{ secrets.CF_USERNAME }}
+          CF_PASSWORD: ${{ secrets.CF_PASSWORD }}
+          CF_DOCKER_USERNAME: ${{ secrets.CF_DOCKER_USERNAME }}
+          CF_DOCKER_PASSWORD: ${{ secrets.CF_DOCKER_PASSWORD }}
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
@@ -2,59 +2,59 @@ name: ci-main
 on:
   push:
     branches:
-    - main
+      - main
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/setup-java@v2
-      with:
-        java-version: 11
-        distribution: adopt
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - uses: actions/cache@v2
-      with:
-        path: |
-          ~/.m2/repository
-        key: ${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
-    - name: version
-      run: |-
-        APP_SHA=$(git rev-parse --short ${GITHUB_SHA})
-        APP_LATEST_REV=$(git rev-list --tags --max-count=1)
-        APP_LATEST_TAG=$(git describe --tags ${APP_LATEST_REV} 2> /dev/null || echo 0.0.0)
-        echo "APP_VERSION=${APP_LATEST_TAG}-${APP_SHA}" >> ${GITHUB_ENV}
-    - name: copyContext
-      run: |-
-        rm ./src/main/resources/static/context.json
-        echo '${{ secrets.CONTEXT_FILE }}' > ./src/main/resources/static/context.json
-    - name: mvn
-      run: |-
-        mvn versions:set \
-        --batch-mode \
-        --file ./pom.xml \
-        --settings ./settings.xml \
-        --define newVersion="${APP_VERSION}"
-        mvn clean verify \
-        --batch-mode \
-        --file ./pom.xml \
-        --settings ./settings.xml \
-        --define app.packages.username="${APP_PACKAGES_USERNAME}" \
-        --define app.packages.password="${APP_PACKAGES_PASSWORD}"
-      env:
-        APP_PACKAGES_USERNAME: ${{ github.actor }}
-        APP_PACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-    - name: docker
-      run: |-
-        echo "${APP_PACKAGES_PASSWORD}" | docker login "${APP_PACKAGES_URL}" \
-        --username "${APP_PACKAGES_USERNAME}" \
-        --password-stdin
-        docker build . \
-        --file ./Dockerfile \
-        --tag "${APP_PACKAGES_URL}:${APP_VERSION}"
-        docker push "${APP_PACKAGES_URL}:${APP_VERSION}"
-      env:
-        APP_PACKAGES_URL: docker.pkg.github.com/${{ github.repository }}/dgca-verifier-service
-        APP_PACKAGES_USERNAME: ${{ github.actor }}
-        APP_PACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/setup-java@v2
+        with:
+          java-version: 17
+          distribution: adopt
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.m2/repository
+          key: ${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+      - name: version
+        run: |-
+          APP_SHA=$(git rev-parse --short ${GITHUB_SHA})
+          APP_LATEST_REV=$(git rev-list --tags --max-count=1)
+          APP_LATEST_TAG=$(git describe --tags ${APP_LATEST_REV} 2> /dev/null || echo 0.0.0)
+          echo "APP_VERSION=${APP_LATEST_TAG}-${APP_SHA}" >> ${GITHUB_ENV}
+      - name: copyContext
+        run: |-
+          rm ./src/main/resources/static/context.json
+          echo '${{ secrets.CONTEXT_FILE }}' > ./src/main/resources/static/context.json
+      - name: mvn
+        run: |-
+          mvn versions:set \
+          --batch-mode \
+          --file ./pom.xml \
+          --settings ./settings.xml \
+          --define newVersion="${APP_VERSION}"
+          mvn clean verify \
+          --batch-mode \
+          --file ./pom.xml \
+          --settings ./settings.xml \
+          --define app.packages.username="${APP_PACKAGES_USERNAME}" \
+          --define app.packages.password="${APP_PACKAGES_PASSWORD}"
+        env:
+          APP_PACKAGES_USERNAME: ${{ github.actor }}
+          APP_PACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+      - name: docker
+        run: |-
+          echo "${APP_PACKAGES_PASSWORD}" | docker login "${APP_PACKAGES_URL}" \
+          --username "${APP_PACKAGES_USERNAME}" \
+          --password-stdin
+          docker build . \
+          --file ./Dockerfile \
+          --tag "${APP_PACKAGES_URL}:${APP_VERSION}"
+          docker push "${APP_PACKAGES_URL}:${APP_VERSION}"
+        env:
+          APP_PACKAGES_URL: docker.pkg.github.com/${{ github.repository }}/dgca-verifier-service
+          APP_PACKAGES_USERNAME: ${{ github.actor }}
+          APP_PACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ci-openapi.yml b/.github/workflows/ci-openapi.yml
@@ -6,11 +6,11 @@ on:
       - created
 jobs:
   release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/setup-java@v2
         with:
-          java-version: 11
+          java-version: 17
           distribution: adopt
       - uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/ci-pull-request.yml b/.github/workflows/ci-pull-request.yml
@@ -2,37 +2,37 @@ name: ci-pull-request
 on:
   pull_request:
     types:
-    - opened
-    - synchronize
-    - reopened
+      - opened
+      - synchronize
+      - reopened
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/setup-java@v2
-      with:
-        java-version: 11
-        distribution: adopt
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - uses: actions/cache@v2
-      with:
-        path: |
-          ~/.m2/repository
-        key: ${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
-    - name: mvn
-      run: |-
-        mvn clean package \
-        --batch-mode \
-        --file ./pom.xml \
-        --settings ./settings.xml \
-        --define app.packages.username="${APP_PACKAGES_USERNAME}" \
-        --define app.packages.password="${APP_PACKAGES_PASSWORD}"
-      env:
-        APP_PACKAGES_USERNAME: ${{ github.actor }}
-        APP_PACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-    - name: docker
-      run: |-
-        docker build . \
-        --file ./Dockerfile
+      - uses: actions/setup-java@v2
+        with:
+          java-version: 17
+          distribution: adopt
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.m2/repository
+          key: ${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+      - name: mvn
+        run: |-
+          mvn clean package \
+          --batch-mode \
+          --file ./pom.xml \
+          --settings ./settings.xml \
+          --define app.packages.username="${APP_PACKAGES_USERNAME}" \
+          --define app.packages.password="${APP_PACKAGES_PASSWORD}"
+        env:
+          APP_PACKAGES_USERNAME: ${{ github.actor }}
+          APP_PACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+      - name: docker
+        run: |-
+          docker build . \
+          --file ./Dockerfile
diff --git a/.github/workflows/ci-release-notes.yml b/.github/workflows/ci-release-notes.yml
@@ -2,18 +2,18 @@ name: ci-release-notes
 on:
   release:
     types:
-    - created
+      - created
 jobs:
   release-notes:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       APP_VERSION: ${{ github.event.release.tag_name }}
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - name: release-notes
-      run: npx github-release-notes release --override --tags ${APP_VERSION}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        GREN_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: release-notes
+        run: npx github-release-notes release --override --tags ${APP_VERSION}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GREN_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}