diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 9ae5a4e6..0102128f 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -21,19 +21,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache Docker Register uses: actions/cache@v3 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }} - - name: Cache Maven packages - uses: actions/cache@v3 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - name: Set up Docker Buildx id: buildx @@ -43,6 +37,7 @@ jobs: with: distribution: 'zulu' java-version: '17' + cache: 'maven' - name: Create custom Maven Settings.xml uses: whelk-io/maven-settings-xml-action@v21 diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index 7b2d3c3e..a8422e7e 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -16,19 +16,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache Docker Register uses: actions/cache@v3 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }} - - name: Cache Maven packages - uses: actions/cache@v3 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - name: Extract tag name id: extract_tagname @@ -41,11 +35,12 @@ jobs: with: distribution: 'zulu' java-version: '17' + cache: 'maven' - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_TOKEN }} diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index aff58480..b89fda98 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -11,6 +11,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: REUSE Compliance Check uses: fsfe/reuse-action@v2 diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index c0364192..a2141b7f 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -40,7 +40,7 @@ jobs: full_name: ${{ github.event.repository.full_name }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: ${{ github.event.workflow_run.head_repository.full_name }} ref: ${{ github.event.workflow_run.head_branch }} @@ -59,6 +59,7 @@ jobs: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar + - name: Cache Maven packages uses: actions/cache@v3 with: @@ -71,7 +72,6 @@ jobs: with: distribution: 'zulu' java-version: '17' - - name: Set Common Sonar Variables id: sonar_env run: | diff --git a/.github/workflows/sonarcloud-build.yml b/.github/workflows/sonarcloud-build.yml index 58e78fcd..7228a740 100644 --- a/.github/workflows/sonarcloud-build.yml +++ b/.github/workflows/sonarcloud-build.yml @@ -26,7 +26,7 @@ jobs: if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/app/src/main/docker/Dockerfile-postgresql.jvm b/app/src/main/docker/Dockerfile-postgresql.jvm index 5c3b583f..d2a9a900 100644 --- a/app/src/main/docker/Dockerfile-postgresql.jvm +++ b/app/src/main/docker/Dockerfile-postgresql.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072.1697626218 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile-postgresql.native b/app/src/main/docker/Dockerfile-postgresql.native index b58255e4..b65e7384 100644 --- a/app/src/main/docker/Dockerfile-postgresql.native +++ b/app/src/main/docker/Dockerfile-postgresql.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072.1697626218 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/pom.xml b/pom.xml index 90a04012..a856cc07 100644 --- a/pom.xml +++ b/pom.xml @@ -20,14 +20,14 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 3.11.0 - 3.1.0 + 3.2.1 3.2.0 0.16.0 - 3.4.1 + 3.5.0 - 3.1 - 2.20.0 + 3.1.1 + 2.21.1 0.9.1 @@ -197,7 +197,7 @@ SPDX-License-Identifier: Apache-2.0 java - 0.8.10 + 0.8.11 jacoco target/site/jacoco/jacoco.xml, diff --git a/repository-postgresql/pom.xml b/repository-postgresql/pom.xml index f531369f..47b0a2cf 100644 --- a/repository-postgresql/pom.xml +++ b/repository-postgresql/pom.xml @@ -60,7 +60,7 @@ SPDX-License-Identifier: Apache-2.0 com.opentable.components otj-pg-embedded - 1.0.1 + 1.0.2 test diff --git a/repository/pom.xml b/repository/pom.xml index 73069771..f8873bb6 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -35,7 +35,7 @@ SPDX-License-Identifier: Apache-2.0 org.glassfish.jaxb jaxb-runtime provided - 4.0.2 + 4.0.4