diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml index 55f081e02..c56a25ec0 100644 --- a/.github/pr-labeler.yml +++ b/.github/pr-labeler.yml @@ -1,23 +1,37 @@ +# Directory pattern cicd: - - .github/**/* + - changed-files: + - any-glob-to-any-file: .github/**/* docs: - - docs/**/* - - "**/*.md" + - changed-files: + - any-glob-to-any-file: + - docs/**/* + - "**/*.md" github-action: - - .github/**/* + - changed-files: + - any-glob-to-any-file: .github/**/* java: - - application/**/* - - "**/*.java" + - changed-files: + - any-glob-to-any-file: + - application/**/* + - "**/*.java" javascript: - - application/**/*.js - - "**/*.js" + - changed-files: + - any-glob-to-any-file: + - application/**/*.js + - "**/*.js" kubernetes: - - kubernetes/**/* + - changed-files: + - any-glob-to-any-file: kubernetes/**/* quarkus: - - application/*-quarkus/* + - changed-files: + - any-glob-to-any-file: application/*-quarkus/* docker: - - "**/Dockerfile" + - changed-files: + - any-glob-to-any-file: "**/Dockerfile" kind: - - "**/kind-*" + - changed-files: + - any-glob-to-any-file: "**/kind-*" minikube: - - "**/minikube-*" + - changed-files: + - any-glob-to-any-file: "**/minikube-*" diff --git a/.github/workflows/cancel-workflow.yml b/.github/workflows/cancel-workflow.yml index 850a2ab6f..74ebf1b28 100644 --- a/.github/workflows/cancel-workflow.yml +++ b/.github/workflows/cancel-workflow.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.11.0 + uses: styfle/cancel-workflow-action@0.12.1 with: access_token: ${{ secrets.GITHUB_TOKEN }} - name: cancel running workflows diff --git a/.github/workflows/check-for-update.yml b/.github/workflows/check-for-update.yml index e26ffbc27..4b550c134 100644 --- a/.github/workflows/check-for-update.yml +++ b/.github/workflows/check-for-update.yml @@ -9,7 +9,7 @@ jobs: minikube-version: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 - name: check minikube version working-directory: ./.github/workflows run: | @@ -55,7 +55,7 @@ jobs: sed -i -e "s/$SOURCE_DOC_VERSION/$TARGET_MINIKUBE_VERSION/g" ../../README.md - name: Add, commit, push, and create PR if: env.UNMATCH_VERSION == 'true' && env.BRANCH_IS_EXISTING == 'false' - uses: peter-evans/create-pull-request@v5.0.2 + uses: peter-evans/create-pull-request@v5.0.3 with: token: ${{ secrets.PAT_GITHUB_ACTION_WORKFLOW }} branch: actions/check-for-update-minikube @@ -67,7 +67,7 @@ jobs: kubernetes-version: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 - name: check kubernetes version working-directory: ./.github/workflows run: | @@ -113,7 +113,7 @@ jobs: sed -i -e "s/$SOURCE_DOC_VERSION/$TARGET_KUBERNETES_VERSION/g" ../../README.md - name: Add, commit, push, and create PR if: env.UNMATCH_VERSION == 'true' && env.BRANCH_IS_EXISTING == 'false' - uses: peter-evans/create-pull-request@v5.0.2 + uses: peter-evans/create-pull-request@v5.0.3 with: token: ${{ secrets.PAT_GITHUB_ACTION_WORKFLOW }} branch: actions/check-for-update-kubernetes @@ -125,7 +125,7 @@ jobs: chaos-mesh-version: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 - name: check current chaos-mesh version working-directory: ./.github/workflows run: | @@ -163,7 +163,7 @@ jobs: sed -i -e "s/$SOURCE_DOC_VERSION/$TARGET_VERSION/g" ../../README.md - name: Add, commit, push, and create PR if: env.UNMATCH_VERSION == 'true' && env.BRANCH_IS_EXISTING == 'false' - uses: peter-evans/create-pull-request@v5.0.2 + uses: peter-evans/create-pull-request@v5.0.3 with: token: ${{ secrets.PAT_GITHUB_ACTION_WORKFLOW }} branch: actions/check-for-update-chaos-mesh @@ -175,7 +175,7 @@ jobs: quarkus-version: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 - name: check current quarkus version run: | echo "SOURCE_VERSION=$(grep "Quarkus Version" README.md | cut -d '-' -f 2)" >> $GITHUB_ENV @@ -208,7 +208,7 @@ jobs: sed -i -e "s/$SOURCE_VERSION/$TARGET_VERSION/g" README.md - name: Add, commit, push, and create PR if: env.UNMATCH_VERSION == 'true' && env.BRANCH_IS_EXISTING == 'false' - uses: peter-evans/create-pull-request@v5.0.2 + uses: peter-evans/create-pull-request@v5.0.3 with: token: ${{ secrets.PAT_GITHUB_ACTION_WORKFLOW }} branch: actions/check-for-update-quarkus diff --git a/.github/workflows/cis-dockerfile-benchmark.yml b/.github/workflows/cis-dockerfile-benchmark.yml index d29d211c3..acc66162f 100644 --- a/.github/workflows/cis-dockerfile-benchmark.yml +++ b/.github/workflows/cis-dockerfile-benchmark.yml @@ -11,7 +11,7 @@ jobs: validation: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 - name: Sysdig CIS Dockerfile Benchmark uses: sysdiglabs/benchmark-dockerfile@v1.0.0 with: diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml index e24cb7246..d7383e6fd 100644 --- a/.github/workflows/codacy.yml +++ b/.github/workflows/codacy.yml @@ -34,11 +34,11 @@ jobs: steps: # Checkout the repository to the GitHub Actions runner - name: Checkout code - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.7 # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis - name: Run Codacy Analysis CLI - uses: codacy/codacy-analysis-cli-action@240c610b1b65402cda39c6355968ef50aa2c07ba + uses: codacy/codacy-analysis-cli-action@09916000460adeeedc96b9704f86deba53e2ad5d with: # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository # You can also omit the token and run the tools that support default configurations diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index cdc179635..6375d055d 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -40,7 +40,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.7 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/cypress-ci.yml b/.github/workflows/cypress-ci.yml index e1626837c..462e72347 100644 --- a/.github/workflows/cypress-ci.yml +++ b/.github/workflows/cypress-ci.yml @@ -13,8 +13,8 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v3.5.3 - - uses: bahmutov/npm-install@v1.8.34 + uses: actions/checkout@v4.1.7 + - uses: bahmutov/npm-install@v1.10.2 with: working-directory: kubernetes/monitoring/test/cypress - name: Cypress run diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 43572e9cc..ccf09da3a 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -15,6 +15,6 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Checkout Repository' - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.7 - name: 'Dependency Review' - uses: actions/dependency-review-action@v3.1.4 + uses: actions/dependency-review-action@v4.3.4 diff --git a/.github/workflows/devskim.yml b/.github/workflows/devskim.yml index d3974db1b..d08a8e7b2 100644 --- a/.github/workflows/devskim.yml +++ b/.github/workflows/devskim.yml @@ -21,10 +21,10 @@ jobs: security-events: write steps: - name: Checkout code - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.7 - name: Run DevSkim scanner - uses: microsoft/DevSkim-Action@v1.0.10 + uses: microsoft/DevSkim-Action@v1.0.14 - name: Upload DevSkim scan results to GitHub Security tab uses: github/codeql-action/upload-sarif@v2 diff --git a/.github/workflows/docker-image-ci.yml b/.github/workflows/docker-image-ci.yml index a724c0d1b..f3b238fa6 100644 --- a/.github/workflows/docker-image-ci.yml +++ b/.github/workflows/docker-image-ci.yml @@ -21,13 +21,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out Git repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.7 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2.9.1 + uses: docker/setup-buildx-action@v2.10.0 - name: Cache Docker layers - uses: actions/cache@v3.3.1 + uses: actions/cache@v4.0.2 with: path: /tmp/.buildx-cache key: ${{ github.ref }}-${{ github.sha }} @@ -59,7 +59,7 @@ jobs: run: docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASS - name: Build and push - nginx - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v4.2.1 with: context: ./kubernetes/nginx push: ${{ env.PUSH }} @@ -72,7 +72,7 @@ jobs: - name: Run Snyk to check Docker image for vulnerabilities - nginx continue-on-error: true - uses: snyk/actions/docker@299cde98a08ff8b1c2bfde1e5a067bce67a6d2b8 + uses: snyk/actions/docker@cdb760004ba9ea4d525f2e043745dfe85bb9077e env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} with: @@ -82,7 +82,7 @@ jobs: run: mv snyk.sarif nginx.sarif - name: Build and push - mysql - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v4.2.1 with: context: ./kubernetes/mysql push: ${{ env.PUSH }} @@ -95,7 +95,7 @@ jobs: - name: Run Snyk to check Docker image for vulnerabilities - mysql continue-on-error: true - uses: snyk/actions/docker@299cde98a08ff8b1c2bfde1e5a067bce67a6d2b8 + uses: snyk/actions/docker@cdb760004ba9ea4d525f2e043745dfe85bb9077e env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} with: @@ -105,7 +105,7 @@ jobs: run: mv snyk.sarif mysql.sarif - name: Build and push - postgres - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v4.2.1 with: context: ./kubernetes/postgres push: ${{ env.PUSH }} @@ -118,7 +118,7 @@ jobs: - name: Run Snyk to check Docker image for vulnerabilities - postgres continue-on-error: true - uses: snyk/actions/docker@299cde98a08ff8b1c2bfde1e5a067bce67a6d2b8 + uses: snyk/actions/docker@cdb760004ba9ea4d525f2e043745dfe85bb9077e env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} with: @@ -128,7 +128,7 @@ jobs: run: mv snyk.sarif postgres.sarif - name: Build and push - mongodb - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v4.2.1 with: context: ./kubernetes/mongodb push: ${{ env.PUSH }} @@ -141,7 +141,7 @@ jobs: - name: Run Snyk to check Docker image for vulnerabilities - mongodb continue-on-error: true - uses: snyk/actions/docker@299cde98a08ff8b1c2bfde1e5a067bce67a6d2b8 + uses: snyk/actions/docker@cdb760004ba9ea4d525f2e043745dfe85bb9077e env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} with: @@ -151,7 +151,7 @@ jobs: run: mv snyk.sarif mongodb.sarif - name: Build and push - cassandra - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v4.2.1 with: context: ./kubernetes/cassandra push: ${{ env.PUSH }} @@ -164,7 +164,7 @@ jobs: - name: Run Snyk to check Docker image for vulnerabilities - cassandra continue-on-error: true - uses: snyk/actions/docker@299cde98a08ff8b1c2bfde1e5a067bce67a6d2b8 + uses: snyk/actions/docker@cdb760004ba9ea4d525f2e043745dfe85bb9077e env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} with: @@ -174,7 +174,7 @@ jobs: run: mv snyk.sarif cassandra.sarif - name: Build and push - rabbitmq - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v4.2.1 with: context: ./kubernetes/rabbitmq push: ${{ env.PUSH }} @@ -187,7 +187,7 @@ jobs: - name: Run Snyk to check Docker image for vulnerabilities - rabbitmq continue-on-error: true - uses: snyk/actions/docker@299cde98a08ff8b1c2bfde1e5a067bce67a6d2b8 + uses: snyk/actions/docker@cdb760004ba9ea4d525f2e043745dfe85bb9077e env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} with: @@ -197,7 +197,7 @@ jobs: run: mv snyk.sarif rabbitmq.sarif - name: Build and push - jenkins - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v4.2.1 with: context: ./kubernetes/monitoring/jenkins push: ${{ env.PUSH }} @@ -209,7 +209,7 @@ jobs: cache-to: type=local,dest=/tmp/.buildx-cache - name: Build and push - ab - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v4.2.1 with: context: ./kubernetes/monitoring/test/ab push: ${{ env.PUSH }} @@ -222,7 +222,7 @@ jobs: - name: Run Snyk to check Docker image for vulnerabilities - ab continue-on-error: true - uses: snyk/actions/docker@299cde98a08ff8b1c2bfde1e5a067bce67a6d2b8 + uses: snyk/actions/docker@cdb760004ba9ea4d525f2e043745dfe85bb9077e env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} with: @@ -232,7 +232,7 @@ jobs: run: mv snyk.sarif ab.sarif - name: Build and push - postmannewman-quarkus - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v4.2.1 with: context: ./kubernetes/monitoring/test/postmannewman/quarkus push: ${{ env.PUSH }} @@ -245,7 +245,7 @@ jobs: - name: Run Snyk to check Docker image for vulnerabilities - postmannewman-quarkus continue-on-error: true - uses: snyk/actions/docker@299cde98a08ff8b1c2bfde1e5a067bce67a6d2b8 + uses: snyk/actions/docker@cdb760004ba9ea4d525f2e043745dfe85bb9077e env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} with: diff --git a/.github/workflows/dockerfile-lint.yml b/.github/workflows/dockerfile-lint.yml index 22ff655d7..98ffb6187 100644 --- a/.github/workflows/dockerfile-lint.yml +++ b/.github/workflows/dockerfile-lint.yml @@ -22,7 +22,7 @@ jobs: dockerfile_default: [mysql, postgres, mongodb, rabbitmq, nginx, cassandra] steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 - name: lint ${{ matrix.dockerfile_default }} uses: hadolint/hadolint-action@v3.1.0 with: @@ -59,7 +59,7 @@ jobs: server-grpc-quarkus, ] steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 - name: lint ${{ matrix.dockerfile_application }} uses: hadolint/hadolint-action@v3.1.0 with: @@ -73,7 +73,7 @@ jobs: matrix: dockerfile_monitoring: [jenkins] steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 - name: lint ${{ matrix.dockerfile_monitoring }} uses: hadolint/hadolint-action@v3.1.0 with: @@ -86,7 +86,7 @@ jobs: matrix: dockerfile_ab: [ab] steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 - name: lint ${{ matrix.dockerfile_ab }} uses: hadolint/hadolint-action@v3.1.0 with: @@ -96,7 +96,7 @@ jobs: dockerfile_postmannewman: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 - name: lint ${{ matrix.dockerfile_postmannewman }} uses: hadolint/hadolint-action@v3.1.0 with: diff --git a/.github/workflows/issue-label.yml b/.github/workflows/issue-label.yml index 7991d919a..45d1ac70b 100644 --- a/.github/workflows/issue-label.yml +++ b/.github/workflows/issue-label.yml @@ -7,7 +7,7 @@ jobs: triage: runs-on: ubuntu-latest steps: - - uses: github/issue-labeler@v3.2 + - uses: github/issue-labeler@v3.4 with: repo-token: "${{ secrets.GITHUB_TOKEN }}" configuration-path: .github/issue-labeler.yml diff --git a/.github/workflows/issue_opened.yml b/.github/workflows/issue_opened.yml index 8fdb50f96..7c5728b0d 100644 --- a/.github/workflows/issue_opened.yml +++ b/.github/workflows/issue_opened.yml @@ -9,10 +9,11 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: - assign: + add-to-project: + name: Add issue to project runs-on: ubuntu-latest steps: - - name: Assign issues to project - uses: srggrs/assign-one-project-github-action@1.3.1 + - uses: actions/add-to-project@v1.0.2 with: - project: 'https://github.com/yurake/k8s-3tier-webapp/projects/1' + project-url: https://github.com/users/yurake/projects/1/views/1 + github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/java-ci.yml b/.github/workflows/java-ci.yml index 3f3ec6396..6d97f33b6 100644 --- a/.github/workflows/java-ci.yml +++ b/.github/workflows/java-ci.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out Git repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.7 with: fetch-depth: 0 - name: Setup GraalVM @@ -37,13 +37,13 @@ jobs: languages: java - name: Cache SonarCloud packages - uses: actions/cache@v3.3.1 + uses: actions/cache@v4.0.2 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar-parent-pom restore-keys: ${{ runner.os }}-sonar-parent-pom - name: Cache local Maven repository - uses: actions/cache@v3.3.1 + uses: actions/cache@v4.0.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-parent-pom-${{ hashFiles('**/parent-pom/pom.xml') }} @@ -56,13 +56,13 @@ jobs: run: ./mvnw -B deploy --settings ../.m2/settings.xml - name: Cache SonarCloud packages - uses: actions/cache@v3.3.1 + uses: actions/cache@v4.0.2 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar-webapp-service restore-keys: ${{ runner.os }}-sonar-webapp-service - name: Cache local Maven repository - uses: actions/cache@v3.3.1 + uses: actions/cache@v4.0.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-webapp-service-${{ hashFiles('**/webapp-service/pom.xml') }} @@ -75,7 +75,7 @@ jobs: run: ./mvnw -B deploy --settings ../.m2/settings.xml - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3.1.4 + uses: codecov/codecov-action@v3.1.6 with: token: ${{ secrets.CODECOV_TOKEN }} - name: Run codacy-coverage-reporter @@ -125,7 +125,7 @@ jobs: fail-fast: false steps: - name: Check out Git repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.7 with: fetch-depth: 0 - name: Setup GraalVM @@ -149,9 +149,9 @@ jobs: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_PASS }} - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2.9.1 + uses: docker/setup-buildx-action@v2.10.0 - name: Cache Docker layers - uses: actions/cache@v3.3.1 + uses: actions/cache@v4.0.2 with: path: /tmp/.buildx-cache key: ${{ github.ref }}-${{ github.sha }} @@ -168,13 +168,13 @@ jobs: fi - name: Cache SonarCloud packages - uses: actions/cache@v3.3.1 + uses: actions/cache@v4.0.2 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar-${{ matrix.application }} restore-keys: ${{ runner.os }}-sonar-${{ matrix.application }} - name: Cache local Maven repository - uses: actions/cache@v3.3.1 + uses: actions/cache@v4.0.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ matrix.application }}-${{ hashFiles('**/${{ matrix.application }}/pom.xml') }} @@ -186,7 +186,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: ./mvnw -B verify --settings ../.m2/settings.xml - name: Build and push - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v4.2.1 with: file: application/${{ matrix.application }}/src/main/docker/Dockerfile.jvm context: application/${{ matrix.application }} @@ -196,7 +196,7 @@ jobs: cache-to: type=local,dest=/tmp/.buildx-cache - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3.1.4 + uses: codecov/codecov-action@v3.1.6 with: token: ${{ secrets.CODECOV_TOKEN }} - name: Run codacy-coverage-reporter @@ -240,7 +240,7 @@ jobs: fail-fast: false steps: - name: Check out Git repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.7 with: fetch-depth: 0 - name: Setup GraalVM @@ -264,9 +264,9 @@ jobs: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_PASS }} - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2.9.1 + uses: docker/setup-buildx-action@v2.10.0 - name: Cache Docker layers - uses: actions/cache@v3.3.1 + uses: actions/cache@v4.0.2 with: path: /tmp/.buildx-cache key: ${{ github.ref }}-${{ github.sha }} @@ -283,13 +283,13 @@ jobs: fi - name: Cache SonarCloud packages - uses: actions/cache@v3.3.1 + uses: actions/cache@v4.0.2 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar-${{ matrix.application }} restore-keys: ${{ runner.os }}-sonar-${{ matrix.application }} - name: Cache local Maven repository - uses: actions/cache@v3.3.1 + uses: actions/cache@v4.0.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ matrix.application }}-${{ hashFiles('**/${{ matrix.application }}/pom.xml') }} @@ -301,7 +301,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: ./mvnw -B verify --settings ../.m2/settings.xml -Pnative - name: Build and push - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v4.2.1 with: file: application/${{ matrix.application }}/src/main/docker/Dockerfile.native context: application/${{ matrix.application }} @@ -311,7 +311,7 @@ jobs: cache-to: type=local,dest=/tmp/.buildx-cache - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3.1.4 + uses: codecov/codecov-action@v3.1.6 with: token: ${{ secrets.CODECOV_TOKEN }} - name: Run codacy-coverage-reporter diff --git a/.github/workflows/k8s-security-config-watch.yml b/.github/workflows/k8s-security-config-watch.yml index bf9c60844..6a82932e2 100644 --- a/.github/workflows/k8s-security-config-watch.yml +++ b/.github/workflows/k8s-security-config-watch.yml @@ -12,12 +12,12 @@ jobs: runs-on: ubuntu-latest steps: # checkout Master branch - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 with: ref: master path: master # checkout PR branch - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 with: path: candidate ref: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/kind-chaos-mesh-ci.yml b/.github/workflows/kind-chaos-mesh-ci.yml index 72b19f331..658e4a96f 100644 --- a/.github/workflows/kind-chaos-mesh-ci.yml +++ b/.github/workflows/kind-chaos-mesh-ci.yml @@ -13,16 +13,16 @@ on: - ".github/workflows/kind-chaos-mesh-ci.yml" env: - CHAOS_MESH_VERSION: 2.6.1 + CHAOS_MESH_VERSION: 2.6.4 jobs: chaos-mesh-ci: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.7 - name: Kind Cluster - uses: helm/kind-action@v1.8.0 + uses: helm/kind-action@v1.10.0 - name: Print cluster information run: | diff --git a/.github/workflows/kind-quarkus-ci.yml b/.github/workflows/kind-quarkus-ci.yml index 4d230780e..540d574d5 100644 --- a/.github/workflows/kind-quarkus-ci.yml +++ b/.github/workflows/kind-quarkus-ci.yml @@ -17,9 +17,9 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.7 - name: Kind Cluster - uses: helm/kind-action@v1.8.0 + uses: helm/kind-action@v1.10.0 - name: apply minimal service run: | sh ./kubernetes/bin/apply-default-quarkus.sh diff --git a/.github/workflows/kind-yaml-ci.yml b/.github/workflows/kind-yaml-ci.yml index 7998dd400..b8f88c3e3 100644 --- a/.github/workflows/kind-yaml-ci.yml +++ b/.github/workflows/kind-yaml-ci.yml @@ -17,9 +17,9 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.7 - name: Kind Cluster - uses: helm/kind-action@v1.8.0 + uses: helm/kind-action@v1.10.0 - name: apply all service run: | sh ./kubernetes/bin/apply.sh diff --git a/.github/workflows/minikube-quarkus-ci.yml b/.github/workflows/minikube-quarkus-ci.yml index aa618891a..d63bf5dce 100644 --- a/.github/workflows/minikube-quarkus-ci.yml +++ b/.github/workflows/minikube-quarkus-ci.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.7 - name: delete installed software not use run: | df -h / @@ -29,7 +29,7 @@ jobs: sudo rm -rf /opt/hostedtoolcache/Ruby df -h / - name: start minikube - uses: medyagh/setup-minikube@v0.0.14 + uses: medyagh/setup-minikube@v0.0.18 with: minikube-version: 1.30.1 kubernetes-version: 1.27.3 diff --git a/.github/workflows/minikube-security-ci.yml b/.github/workflows/minikube-security-ci.yml index 4d607874d..ebb7dd996 100644 --- a/.github/workflows/minikube-security-ci.yml +++ b/.github/workflows/minikube-security-ci.yml @@ -17,9 +17,9 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.7 - name: start minikube - uses: medyagh/setup-minikube@v0.0.14 + uses: medyagh/setup-minikube@v0.0.18 with: minikube-version: 1.30.1 kubernetes-version: 1.27.3 @@ -47,7 +47,7 @@ jobs: kubectl apply -f kubernetes/nginx/nginx-service.yaml sleep 10 - name: ZAP Scan - uses: zaproxy/action-baseline@v0.9.0 + uses: zaproxy/action-baseline@v0.12.0 with: token: ${{ secrets.GITHUB_TOKEN }} target: "http://k8s.3tier.webapp/" diff --git a/.github/workflows/minikube-stress-ci.yml b/.github/workflows/minikube-stress-ci.yml index ea59cc382..2cebb2cc9 100644 --- a/.github/workflows/minikube-stress-ci.yml +++ b/.github/workflows/minikube-stress-ci.yml @@ -21,9 +21,9 @@ jobs: fail-fast: false steps: - name: checkout - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.7 - name: start minikube - uses: medyagh/setup-minikube@v0.0.14 + uses: medyagh/setup-minikube@v0.0.18 with: minikube-version: 1.30.1 kubernetes-version: 1.27.3 diff --git a/.github/workflows/minikube-yaml-ci.yml b/.github/workflows/minikube-yaml-ci.yml index 2b0bd91e3..7f5af2bca 100644 --- a/.github/workflows/minikube-yaml-ci.yml +++ b/.github/workflows/minikube-yaml-ci.yml @@ -17,9 +17,9 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.7 - name: start minikube - uses: medyagh/setup-minikube@v0.0.14 + uses: medyagh/setup-minikube@v0.0.18 with: minikube-version: 1.30.1 kubernetes-version: 1.27.3 diff --git a/.github/workflows/pmd.yml b/.github/workflows/pmd.yml index 717501920..c163bf004 100644 --- a/.github/workflows/pmd.yml +++ b/.github/workflows/pmd.yml @@ -61,9 +61,9 @@ jobs: server-grpc-quarkus, ] steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 - name: Set up JDK - uses: actions/setup-java@v3.12.0 + uses: actions/setup-java@v4.3.0 with: java-version: "17" distribution: "temurin" diff --git a/.github/workflows/pr-label.yml b/.github/workflows/pr-label.yml index c891aed48..0f58e8908 100644 --- a/.github/workflows/pr-label.yml +++ b/.github/workflows/pr-label.yml @@ -16,7 +16,7 @@ jobs: pull-requests: write steps: - - uses: actions/labeler@v4.3.0 + - uses: actions/labeler@v5.0.0 with: repo-token: "${{ secrets.GITHUB_TOKEN }}" configuration-path: .github/pr-labeler.yml diff --git a/.github/workflows/shell-validator.yml b/.github/workflows/shell-validator.yml index bb9ec999d..a32c6e560 100644 --- a/.github/workflows/shell-validator.yml +++ b/.github/workflows/shell-validator.yml @@ -14,11 +14,11 @@ jobs: validation: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 - name: Run shellcheck uses: ludeeus/action-shellcheck@2.0.0 - name: Run sh-checker - uses: luizm/action-sh-checker@v0.7.0 + uses: luizm/action-sh-checker@v0.8.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/.github/workflows/snyk-infrastructure.yml b/.github/workflows/snyk-infrastructure.yml index ec9a8f12a..7956341cb 100644 --- a/.github/workflows/snyk-infrastructure.yml +++ b/.github/workflows/snyk-infrastructure.yml @@ -30,9 +30,9 @@ jobs: actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 - name: Run Snyk to check for vulnerabilities - uses: snyk/actions/iac@299cde98a08ff8b1c2bfde1e5a067bce67a6d2b8 + uses: snyk/actions/iac@cdb760004ba9ea4d525f2e043745dfe85bb9077e continue-on-error: true env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} @@ -51,7 +51,7 @@ jobs: steps: - uses: actions/checkout@master - name: Run Snyk to check for vulnerabilities - uses: snyk/actions/iac@299cde98a08ff8b1c2bfde1e5a067bce67a6d2b8 + uses: snyk/actions/iac@cdb760004ba9ea4d525f2e043745dfe85bb9077e continue-on-error: true env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} diff --git a/.github/workflows/yaml-validator.yml b/.github/workflows/yaml-validator.yml index 7f3c1e923..26cba31ed 100644 --- a/.github/workflows/yaml-validator.yml +++ b/.github/workflows/yaml-validator.yml @@ -16,7 +16,7 @@ jobs: validation: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.7 - name: validate yaml manifests uses: instrumenta/kubeval-action@master with: diff --git a/README.md b/README.md index e72e9ba7b..c4c265b2d 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,6 @@ Sample web application based on k8s. Focus on connecting components, setting k8s [![CodeFactor](https://www.codefactor.io/repository/github/yurake/k8s-3tier-webapp/badge)](https://www.codefactor.io/repository/github/yurake/k8s-3tier-webapp) [![Maintainability](https://api.codeclimate.com/v1/badges/64a1de96c5eb777b9db1/maintainability)](https://codeclimate.com/github/yurake/k8s-3tier-webapp/maintainability) [![codebeat badge](https://codebeat.co/badges/e0bfc464-3370-467d-910f-ade9d83265b1)](https://codebeat.co/projects/github-com-yurake-k8s-3tier-webapp-master) [![codecov](https://codecov.io/gh/yurake/k8s-3tier-webapp/branch/master/graph/badge.svg)](https://codecov.io/gh/yurake/k8s-3tier-webapp) -[![Codiga Code Quality Score](https://api.codiga.io/project/34687/score/svg)](https://app.codiga.io) -[![Codiga Code Grade](https://api.codiga.io/project/34687/status/svg)](https://app.codiga.io) [![DeepSource Active Issues](https://deepsource.io/gh/yurake/k8s-3tier-webapp.svg/?label=active+issues\&show_trend=true\&token=Y64jIS9a54isgV4hi4_uuerZ)](https://deepsource.io/gh/yurake/k8s-3tier-webapp/?ref=repository-badge) [![DeepSource Resluved Issues](https://deepsource.io/gh/yurake/k8s-3tier-webapp.svg/?label=resolved+issues\&show_trend=true\&token=Y64jIS9a54isgV4hi4_uuerZ)](https://deepsource.io/gh/yurake/k8s-3tier-webapp/?ref=repository-badge) [![Cypress](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/detailed/7rgxn6/master\&style=flat\&logo=cypress)](https://dashboard.cypress.io/projects/7rgxn6/runs) @@ -41,7 +39,7 @@ Sample web application based on k8s. Focus on connecting components, setting k8s [![Support Quarkus Version](https://img.shields.io/badge/Quarkus-2.16.8-yellow.svg?style=flat\&logo=Quarkus)](https://github.com/yurake/k8s-3tier-webapp/actions?query=workflow%3A%22Java+CI%22) [![Support Kubernetes Version](https://img.shields.io/badge/Kubernetes-1.27.3-yellow.svg?style=flat\&logo=Kubernetes)](https://github.com/yurake/k8s-3tier-webapp/actions?query=workflow%3A%22Minikube+CI%22) [![Support Minikube Version](https://img.shields.io/badge/Minikube-1.30.1-yellow.svg?style=flat\&logo=Kubernetes)](https://github.com/yurake/k8s-3tier-webapp/actions?query=workflow%3A%22Minikube+CI%22) -[![Support kind Version](https://img.shields.io/badge/kind-2.6.1-yellow.svg?style=flat\&logo=Kubernetes)](https://github.com/yurake/k8s-3tier-webapp/actions?query=workflow%3A%22kind+CI%22) +[![Support kind Version](https://img.shields.io/badge/kind-2.6.4-yellow.svg?style=flat\&logo=Kubernetes)](https://github.com/yurake/k8s-3tier-webapp/actions?query=workflow%3A%22kind+CI%22) [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE/) [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fyurake%2Fk8s-3tier-webapp.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fyurake%2Fk8s-3tier-webapp?ref=badge_shield) diff --git a/application/consumer-activemq-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/consumer-activemq-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/consumer-activemq-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/consumer-activemq-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/consumer-activemq-quarkus/pom.xml b/application/consumer-activemq-quarkus/pom.xml index 5d207a7ce..47003b066 100644 --- a/application/consumer-activemq-quarkus/pom.xml +++ b/application/consumer-activemq-quarkus/pom.xml @@ -9,7 +9,7 @@ webapp.3tier.k8s consumer-activemq-quarkus - 2.1.1 + 3.1.6 diff --git a/application/consumer-activemq-quarkus/src/main/docker/Dockerfile.jvm b/application/consumer-activemq-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/consumer-activemq-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/consumer-activemq-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/consumer-activemq-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/consumer-activemq-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/consumer-activemq-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/consumer-activemq-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/consumer-activemq-quarkus/src/main/docker/Dockerfile.native b/application/consumer-activemq-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/consumer-activemq-quarkus/src/main/docker/Dockerfile.native +++ b/application/consumer-activemq-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/consumer-hazelcast-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/consumer-hazelcast-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/consumer-hazelcast-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/consumer-hazelcast-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/consumer-hazelcast-quarkus/pom.xml b/application/consumer-hazelcast-quarkus/pom.xml index 5f13c7c8f..b5918049a 100644 --- a/application/consumer-hazelcast-quarkus/pom.xml +++ b/application/consumer-hazelcast-quarkus/pom.xml @@ -9,7 +9,7 @@ webapp.3tier.k8s consumer-hazelcast-quarkus - 5.3.1 + 5.4.0 4.0.0 diff --git a/application/consumer-hazelcast-quarkus/src/main/docker/Dockerfile.jvm b/application/consumer-hazelcast-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/consumer-hazelcast-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/consumer-hazelcast-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/consumer-hazelcast-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/consumer-hazelcast-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/consumer-hazelcast-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/consumer-hazelcast-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/consumer-hazelcast-quarkus/src/main/docker/Dockerfile.native b/application/consumer-hazelcast-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/consumer-hazelcast-quarkus/src/main/docker/Dockerfile.native +++ b/application/consumer-hazelcast-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/consumer-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/consumer-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/consumer-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/consumer-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/consumer-kafka-quarkus/src/main/docker/Dockerfile.jvm b/application/consumer-kafka-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/consumer-kafka-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/consumer-kafka-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/consumer-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/consumer-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/consumer-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/consumer-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/consumer-kafka-quarkus/src/main/docker/Dockerfile.native b/application/consumer-kafka-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/consumer-kafka-quarkus/src/main/docker/Dockerfile.native +++ b/application/consumer-kafka-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/consumer-rabbitmq-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/consumer-rabbitmq-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/consumer-rabbitmq-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/consumer-rabbitmq-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/consumer-rabbitmq-quarkus/src/main/docker/Dockerfile.jvm b/application/consumer-rabbitmq-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/consumer-rabbitmq-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/consumer-rabbitmq-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/consumer-rabbitmq-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/consumer-rabbitmq-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/consumer-rabbitmq-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/consumer-rabbitmq-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/consumer-rabbitmq-quarkus/src/main/docker/Dockerfile.native b/application/consumer-rabbitmq-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/consumer-rabbitmq-quarkus/src/main/docker/Dockerfile.native +++ b/application/consumer-rabbitmq-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/consumer-redis-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/consumer-redis-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/consumer-redis-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/consumer-redis-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/consumer-redis-quarkus/src/main/docker/Dockerfile.jvm b/application/consumer-redis-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/consumer-redis-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/consumer-redis-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/consumer-redis-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/consumer-redis-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/consumer-redis-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/consumer-redis-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/consumer-redis-quarkus/src/main/docker/Dockerfile.native b/application/consumer-redis-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/consumer-redis-quarkus/src/main/docker/Dockerfile.native +++ b/application/consumer-redis-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/converter-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/converter-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/converter-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/converter-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/converter-kafka-quarkus/src/main/docker/Dockerfile.jvm b/application/converter-kafka-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/converter-kafka-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/converter-kafka-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/converter-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/converter-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/converter-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/converter-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/converter-kafka-quarkus/src/main/docker/Dockerfile.native b/application/converter-kafka-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/converter-kafka-quarkus/src/main/docker/Dockerfile.native +++ b/application/converter-kafka-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/converter-rabbitmq-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/converter-rabbitmq-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/converter-rabbitmq-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/converter-rabbitmq-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/converter-rabbitmq-quarkus/src/main/docker/Dockerfile.jvm b/application/converter-rabbitmq-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/converter-rabbitmq-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/converter-rabbitmq-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/converter-rabbitmq-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/converter-rabbitmq-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/converter-rabbitmq-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/converter-rabbitmq-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/converter-rabbitmq-quarkus/src/main/docker/Dockerfile.native b/application/converter-rabbitmq-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/converter-rabbitmq-quarkus/src/main/docker/Dockerfile.native +++ b/application/converter-rabbitmq-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/jaxrs-activemq-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/jaxrs-activemq-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/jaxrs-activemq-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/jaxrs-activemq-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/jaxrs-activemq-quarkus/pom.xml b/application/jaxrs-activemq-quarkus/pom.xml index fc06bfc79..e8c87f24c 100644 --- a/application/jaxrs-activemq-quarkus/pom.xml +++ b/application/jaxrs-activemq-quarkus/pom.xml @@ -9,7 +9,7 @@ webapp.3tier.k8s jaxrs-activemq-quarkus - 2.1.1 + 3.1.6 diff --git a/application/jaxrs-activemq-quarkus/src/main/docker/Dockerfile.jvm b/application/jaxrs-activemq-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/jaxrs-activemq-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/jaxrs-activemq-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-activemq-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/jaxrs-activemq-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/jaxrs-activemq-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/jaxrs-activemq-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-activemq-quarkus/src/main/docker/Dockerfile.native b/application/jaxrs-activemq-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/jaxrs-activemq-quarkus/src/main/docker/Dockerfile.native +++ b/application/jaxrs-activemq-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/jaxrs-cassandra-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/jaxrs-cassandra-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/jaxrs-cassandra-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/jaxrs-cassandra-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/jaxrs-cassandra-quarkus/src/main/docker/Dockerfile.jvm b/application/jaxrs-cassandra-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/jaxrs-cassandra-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/jaxrs-cassandra-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-cassandra-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/jaxrs-cassandra-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/jaxrs-cassandra-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/jaxrs-cassandra-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-cassandra-quarkus/src/main/docker/Dockerfile.native b/application/jaxrs-cassandra-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/jaxrs-cassandra-quarkus/src/main/docker/Dockerfile.native +++ b/application/jaxrs-cassandra-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/jaxrs-grpc-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/jaxrs-grpc-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/jaxrs-grpc-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/jaxrs-grpc-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/jaxrs-grpc-quarkus/src/main/docker/Dockerfile.jvm b/application/jaxrs-grpc-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/jaxrs-grpc-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/jaxrs-grpc-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-grpc-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/jaxrs-grpc-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/jaxrs-grpc-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/jaxrs-grpc-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-grpc-quarkus/src/main/docker/Dockerfile.native b/application/jaxrs-grpc-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/jaxrs-grpc-quarkus/src/main/docker/Dockerfile.native +++ b/application/jaxrs-grpc-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/jaxrs-hazelcast-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/jaxrs-hazelcast-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/jaxrs-hazelcast-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/jaxrs-hazelcast-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/jaxrs-hazelcast-quarkus/pom.xml b/application/jaxrs-hazelcast-quarkus/pom.xml index 76140b482..e919f4ef6 100644 --- a/application/jaxrs-hazelcast-quarkus/pom.xml +++ b/application/jaxrs-hazelcast-quarkus/pom.xml @@ -9,8 +9,8 @@ webapp.3tier.k8s jaxrs-hazelcast-quarkus - 5.3.1 - 2.0.7 + 5.4.0 + 2.0.13 diff --git a/application/jaxrs-hazelcast-quarkus/src/main/docker/Dockerfile.jvm b/application/jaxrs-hazelcast-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/jaxrs-hazelcast-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/jaxrs-hazelcast-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-hazelcast-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/jaxrs-hazelcast-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/jaxrs-hazelcast-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/jaxrs-hazelcast-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-hazelcast-quarkus/src/main/docker/Dockerfile.native b/application/jaxrs-hazelcast-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/jaxrs-hazelcast-quarkus/src/main/docker/Dockerfile.native +++ b/application/jaxrs-hazelcast-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/jaxrs-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/jaxrs-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/jaxrs-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/jaxrs-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/jaxrs-kafka-quarkus/src/main/docker/Dockerfile.jvm b/application/jaxrs-kafka-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/jaxrs-kafka-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/jaxrs-kafka-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/jaxrs-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/jaxrs-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/jaxrs-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-kafka-quarkus/src/main/docker/Dockerfile.native b/application/jaxrs-kafka-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/jaxrs-kafka-quarkus/src/main/docker/Dockerfile.native +++ b/application/jaxrs-kafka-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/jaxrs-memcached-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/jaxrs-memcached-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/jaxrs-memcached-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/jaxrs-memcached-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/jaxrs-memcached-quarkus/src/main/docker/Dockerfile.jvm b/application/jaxrs-memcached-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/jaxrs-memcached-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/jaxrs-memcached-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-memcached-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/jaxrs-memcached-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/jaxrs-memcached-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/jaxrs-memcached-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-memcached-quarkus/src/main/docker/Dockerfile.native b/application/jaxrs-memcached-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/jaxrs-memcached-quarkus/src/main/docker/Dockerfile.native +++ b/application/jaxrs-memcached-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/jaxrs-mongodb-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/jaxrs-mongodb-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/jaxrs-mongodb-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/jaxrs-mongodb-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/jaxrs-mongodb-quarkus/src/main/docker/Dockerfile.jvm b/application/jaxrs-mongodb-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/jaxrs-mongodb-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/jaxrs-mongodb-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-mongodb-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/jaxrs-mongodb-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/jaxrs-mongodb-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/jaxrs-mongodb-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-mongodb-quarkus/src/main/docker/Dockerfile.native b/application/jaxrs-mongodb-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/jaxrs-mongodb-quarkus/src/main/docker/Dockerfile.native +++ b/application/jaxrs-mongodb-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/jaxrs-mysql-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/jaxrs-mysql-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/jaxrs-mysql-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/jaxrs-mysql-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/jaxrs-mysql-quarkus/src/main/docker/Dockerfile.jvm b/application/jaxrs-mysql-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/jaxrs-mysql-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/jaxrs-mysql-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-mysql-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/jaxrs-mysql-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/jaxrs-mysql-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/jaxrs-mysql-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-mysql-quarkus/src/main/docker/Dockerfile.native b/application/jaxrs-mysql-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/jaxrs-mysql-quarkus/src/main/docker/Dockerfile.native +++ b/application/jaxrs-mysql-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/jaxrs-postgres-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/jaxrs-postgres-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/jaxrs-postgres-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/jaxrs-postgres-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/jaxrs-postgres-quarkus/src/main/docker/Dockerfile.jvm b/application/jaxrs-postgres-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/jaxrs-postgres-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/jaxrs-postgres-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-postgres-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/jaxrs-postgres-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/jaxrs-postgres-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/jaxrs-postgres-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-postgres-quarkus/src/main/docker/Dockerfile.native b/application/jaxrs-postgres-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/jaxrs-postgres-quarkus/src/main/docker/Dockerfile.native +++ b/application/jaxrs-postgres-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/jaxrs-rabbitmq-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/jaxrs-rabbitmq-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/jaxrs-rabbitmq-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/jaxrs-rabbitmq-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/jaxrs-rabbitmq-quarkus/src/main/docker/Dockerfile.jvm b/application/jaxrs-rabbitmq-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/jaxrs-rabbitmq-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/jaxrs-rabbitmq-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-rabbitmq-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/jaxrs-rabbitmq-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/jaxrs-rabbitmq-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/jaxrs-rabbitmq-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-rabbitmq-quarkus/src/main/docker/Dockerfile.native b/application/jaxrs-rabbitmq-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/jaxrs-rabbitmq-quarkus/src/main/docker/Dockerfile.native +++ b/application/jaxrs-rabbitmq-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/jaxrs-redis-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/jaxrs-redis-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/jaxrs-redis-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/jaxrs-redis-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/jaxrs-redis-quarkus/src/main/docker/Dockerfile.jvm b/application/jaxrs-redis-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/jaxrs-redis-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/jaxrs-redis-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-redis-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/jaxrs-redis-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/jaxrs-redis-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/jaxrs-redis-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/jaxrs-redis-quarkus/src/main/docker/Dockerfile.native b/application/jaxrs-redis-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/jaxrs-redis-quarkus/src/main/docker/Dockerfile.native +++ b/application/jaxrs-redis-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/parent-pom/.mvn/wrapper/maven-wrapper.properties b/application/parent-pom/.mvn/wrapper/maven-wrapper.properties index 6d3a56651..d58dfb70b 100644 --- a/application/parent-pom/.mvn/wrapper/maven-wrapper.properties +++ b/application/parent-pom/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/application/parent-pom/mvnw b/application/parent-pom/mvnw index 8d937f4c1..19529ddf8 100755 --- a/application/parent-pom/mvnw +++ b/application/parent-pom/mvnw @@ -19,290 +19,241 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.2.0 -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir +# Apache Maven Wrapper startup batch script, version 3.3.2 # # Optional ENV vars # ----------------- -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output # ---------------------------------------------------------------------------- -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false +# OS specific support. +native_path() { printf %s\\n "$1"; } case "$(uname)" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME - else - JAVA_HOME="/Library/Java/Home"; export JAVA_HOME - fi - fi - ;; +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; esac -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=$(java-config --jre-home) - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --unix "$CLASSPATH") -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && - JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=$(which readlink) - if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then - if $darwin ; then - javaHome="$(dirname "\"$javaExecutable\"")" - javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" - else - javaExecutable="$(readlink -f "\"$javaExecutable\"")" - fi - javaHome="$(dirname "\"$javaExecutable\"")" - javaHome=$(expr "$javaHome" : '\(.*\)/bin') - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then # IBM's JDK on AIX uses strange locations for the executables JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" else JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi fi else - JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi fi +} - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=$(cd "$wdir/.." || exit 1; pwd) - fi - # end of workaround +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" done - printf '%s' "$(cd "$basedir" || exit 1; pwd)" + printf %x\\n $h } -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - # Remove \r in case we run on Windows within Git Bash - # and check out the repository with auto CRLF management - # enabled. Otherwise, we may read lines that are delimited with - # \r\n and produce $'-Xarg\r' rather than -Xarg due to word - # splitting rules. - tr -s '\r\n' ' ' < "$1" - fi +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 } -log() { - if [ "$MVNW_VERBOSE" = true ]; then - printf '%s\n' "$1" - fi +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" } -BASE_DIR=$(find_maven_basedir "$(dirname "$0")") -if [ -z "$BASE_DIR" ]; then - exit 1; +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" fi -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR -log "$MAVEN_PROJECTBASEDIR" +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" -if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT else - log "Couldn't find $wrapperJarPath, downloading it ..." + die "cannot create temp dir" +fi - if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - fi - while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; - esac - done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" +mkdir -p -- "${MAVEN_HOME%/*}" - if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") - fi +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" - if command -v wget > /dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - fi - else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") - fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") - fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" - fi - fi - fi +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" fi -########################################################################################## -# End of extension -########################################################################################## -# If specified, validate the SHA-256 sum of the Maven wrapper jar file -wrapperSha256Sum="" -while IFS="=" read -r key value; do - case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; - esac -done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" -if [ -n "$wrapperSha256Sum" ]; then - wrapperSha256Result=false - if command -v sha256sum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then - wrapperSha256Result=true +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true fi - elif command -v shasum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then - wrapperSha256Result=true + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true fi else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 exit 1 fi - if [ $wrapperSha256Result = false ]; then - echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 - echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 - echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 exit 1 fi fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -# shellcheck disable=SC2086 # safe args -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" +clean || : +exec_maven "$@" diff --git a/application/parent-pom/pom.xml b/application/parent-pom/pom.xml index b3bd5beef..f5164d073 100644 --- a/application/parent-pom/pom.xml +++ b/application/parent-pom/pom.xml @@ -7,7 +7,7 @@ 5.0.0-SNAPSHOT pom - 3.11.0 + 3.13.0 true 17 17 @@ -15,10 +15,10 @@ UTF-8 quarkus-bom io.quarkus - 2.16.9.Final - 3.1.2 + 2.16.12.Final + 3.3.1 true - 0.8.10 + 0.8.12 yurak https://sonarcloud.io diff --git a/application/producer-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/producer-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/producer-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/producer-kafka-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/producer-kafka-quarkus/src/main/docker/Dockerfile.jvm b/application/producer-kafka-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/producer-kafka-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/producer-kafka-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/producer-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/producer-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/producer-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/producer-kafka-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/producer-kafka-quarkus/src/main/docker/Dockerfile.native b/application/producer-kafka-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/producer-kafka-quarkus/src/main/docker/Dockerfile.native +++ b/application/producer-kafka-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/randompublish-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/randompublish-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/randompublish-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/randompublish-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/randompublish-quarkus/src/main/docker/Dockerfile.jvm b/application/randompublish-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/randompublish-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/randompublish-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/randompublish-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/randompublish-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/randompublish-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/randompublish-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/randompublish-quarkus/src/main/docker/Dockerfile.native b/application/randompublish-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/randompublish-quarkus/src/main/docker/Dockerfile.native +++ b/application/randompublish-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/scheduled-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/scheduled-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/scheduled-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/scheduled-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/scheduled-quarkus/src/main/docker/Dockerfile.jvm b/application/scheduled-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/scheduled-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/scheduled-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/scheduled-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/scheduled-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/scheduled-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/scheduled-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/scheduled-quarkus/src/main/docker/Dockerfile.native b/application/scheduled-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/scheduled-quarkus/src/main/docker/Dockerfile.native +++ b/application/scheduled-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/server-grpc-quarkus/.mvn/wrapper/maven-wrapper.properties b/application/server-grpc-quarkus/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/server-grpc-quarkus/.mvn/wrapper/maven-wrapper.properties +++ b/application/server-grpc-quarkus/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/server-grpc-quarkus/src/main/docker/Dockerfile.jvm b/application/server-grpc-quarkus/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/server-grpc-quarkus/src/main/docker/Dockerfile.jvm +++ b/application/server-grpc-quarkus/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/server-grpc-quarkus/src/main/docker/Dockerfile.legacy-jar b/application/server-grpc-quarkus/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/server-grpc-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/application/server-grpc-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/server-grpc-quarkus/src/main/docker/Dockerfile.native b/application/server-grpc-quarkus/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/server-grpc-quarkus/src/main/docker/Dockerfile.native +++ b/application/server-grpc-quarkus/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/application/webapp-service/.mvn/wrapper/maven-wrapper.properties b/application/webapp-service/.mvn/wrapper/maven-wrapper.properties index 5366408e6..b9b1153ae 100644 --- a/application/webapp-service/.mvn/wrapper/maven-wrapper.properties +++ b/application/webapp-service/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/application/webapp-service/src/main/docker/Dockerfile.jvm b/application/webapp-service/src/main/docker/Dockerfile.jvm index a286dd4c6..9855fea96 100644 --- a/application/webapp-service/src/main/docker/Dockerfile.jvm +++ b/application/webapp-service/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/webapp-service/src/main/docker/Dockerfile.legacy-jar b/application/webapp-service/src/main/docker/Dockerfile.legacy-jar index ef4ee6781..13ef11819 100644 --- a/application/webapp-service/src/main/docker/Dockerfile.legacy-jar +++ b/application/webapp-service/src/main/docker/Dockerfile.legacy-jar @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/application/webapp-service/src/main/docker/Dockerfile.native b/application/webapp-service/src/main/docker/Dockerfile.native index 353b08f5b..9a5c8b59d 100644 --- a/application/webapp-service/src/main/docker/Dockerfile.native +++ b/application/webapp-service/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/getting-started # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1018 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/kubernetes/cassandra/Dockerfile b/kubernetes/cassandra/Dockerfile index 1633b49cc..ea9a352f1 100644 --- a/kubernetes/cassandra/Dockerfile +++ b/kubernetes/cassandra/Dockerfile @@ -1,4 +1,4 @@ -FROM cassandra:4.1 +FROM cassandra:5.0 ARG BUILD_DATE ARG VCS_REF LABEL org.label-schema.build-date=$BUILD_DATE org.label-schema.vcs-ref=$VCS_REF \ diff --git a/kubernetes/hazelcast/hazelcast-statefulset.yaml b/kubernetes/hazelcast/hazelcast-statefulset.yaml index caf52d667..1950cf9ff 100644 --- a/kubernetes/hazelcast/hazelcast-statefulset.yaml +++ b/kubernetes/hazelcast/hazelcast-statefulset.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: hazelcast - image: hazelcast/hazelcast:5.3.1 + image: hazelcast/hazelcast:5.4.0 imagePullPolicy: Always livenessProbe: httpGet: diff --git a/kubernetes/kafka/kafka-statefulset.yaml b/kubernetes/kafka/kafka-statefulset.yaml index 9dd0dd110..58a9d1730 100644 --- a/kubernetes/kafka/kafka-statefulset.yaml +++ b/kubernetes/kafka/kafka-statefulset.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: kafka - image: bitnami/kafka:3-debian-10 + image: bitnami/kafka:3.7.1-debian-12-r1 imagePullPolicy: Always ports: - containerPort: 9092 diff --git a/kubernetes/memcached/memcached-deployment.yaml b/kubernetes/memcached/memcached-deployment.yaml index 3852eaca2..8f461192c 100644 --- a/kubernetes/memcached/memcached-deployment.yaml +++ b/kubernetes/memcached/memcached-deployment.yaml @@ -30,7 +30,7 @@ spec: tcpSocket: port: 11211 - name: memcached-exporter - image: prom/memcached-exporter:v0.13.0 + image: prom/memcached-exporter:v0.14.4 ports: - containerPort: 9150 livenessProbe: diff --git a/kubernetes/monitoring/grafana/grafana-deployment.yaml b/kubernetes/monitoring/grafana/grafana-deployment.yaml index 1a5b5f7ae..ecf749599 100644 --- a/kubernetes/monitoring/grafana/grafana-deployment.yaml +++ b/kubernetes/monitoring/grafana/grafana-deployment.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: grafana - image: grafana/grafana:10.0.3 + image: grafana/grafana:10.4.8 imagePullPolicy: Always ports: - containerPort: 3000 diff --git a/kubernetes/monitoring/jenkins/Dockerfile b/kubernetes/monitoring/jenkins/Dockerfile index 861f1d01b..1cb6643e5 100644 --- a/kubernetes/monitoring/jenkins/Dockerfile +++ b/kubernetes/monitoring/jenkins/Dockerfile @@ -1,4 +1,4 @@ -FROM jenkins/jenkins:2.418-alpine +FROM jenkins/jenkins:2.468-alpine ARG BUILD_DATE ARG VCS_REF diff --git a/kubernetes/monitoring/node-exporter/node-exporter-daemonset.yaml b/kubernetes/monitoring/node-exporter/node-exporter-daemonset.yaml index de95ae14d..a45e93982 100644 --- a/kubernetes/monitoring/node-exporter/node-exporter-daemonset.yaml +++ b/kubernetes/monitoring/node-exporter/node-exporter-daemonset.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: prometheus-node-exporter - image: prom/node-exporter:v1.6.1 + image: prom/node-exporter:v1.8.2 imagePullPolicy: Always args: - --path.procfs=/proc diff --git a/kubernetes/monitoring/optional/argo/install.yaml b/kubernetes/monitoring/optional/argo/install.yaml index 3cb82aef0..9bd352d47 100644 --- a/kubernetes/monitoring/optional/argo/install.yaml +++ b/kubernetes/monitoring/optional/argo/install.yaml @@ -1257,7 +1257,7 @@ spec: - server - --tls-certificate-secret-name=argo-server-tls env: [] - image: quay.io/argoproj/argocli:v3.4.9 + image: quay.io/argoproj/argocli:v3.5.10 name: argo-server ports: - containerPort: 2746 @@ -1319,7 +1319,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.name - image: quay.io/argoproj/workflow-controller:v3.4.9 + image: quay.io/argoproj/workflow-controller:v3.5.10 livenessProbe: failureThreshold: 3 httpGet: diff --git a/kubernetes/monitoring/prometheus/prometheus-statefulset.yaml b/kubernetes/monitoring/prometheus/prometheus-statefulset.yaml index 17abac406..b1209d3fb 100644 --- a/kubernetes/monitoring/prometheus/prometheus-statefulset.yaml +++ b/kubernetes/monitoring/prometheus/prometheus-statefulset.yaml @@ -36,7 +36,7 @@ spec: subPath: "" containers: - name: prometheus-server - image: prom/prometheus:v2.46.0 + image: prom/prometheus:v2.53.1 imagePullPolicy: Always args: - --config.file=/etc/config/prometheus.yml diff --git a/kubernetes/monitoring/test/cypress/package-lock.json b/kubernetes/monitoring/test/cypress/package-lock.json index c3b9ac15a..4f14cc8fb 100644 --- a/kubernetes/monitoring/test/cypress/package-lock.json +++ b/kubernetes/monitoring/test/cypress/package-lock.json @@ -4,40 +4,16 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@cypress/listr-verbose-renderer": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz", - "integrity": "sha1-p3SS9LEdzHxEajSz4ochr9M8ZCo=", - "requires": { - "chalk": "^1.1.3", - "cli-cursor": "^1.0.2", - "date-fns": "^1.27.2", - "figures": "^1.7.0" - }, - "dependencies": { - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" - } - } + "@colors/colors": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", + "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", + "optional": true }, "@cypress/request": { - "version": "2.88.5", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.5.tgz", - "integrity": "sha512-TzEC1XMi1hJkywWpRfD2clreTa/Z+lOrXDCxxBTBPEcY5azdPi56A6Xw+O4tWJnaJH3iIE7G5aDXZC6JgRZLcA==", + "version": "2.88.12", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", + "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", "requires": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -46,19 +22,17 @@ "extend": "~3.0.2", "forever-agent": "~0.6.1", "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", + "http-signature": "~1.3.6", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", "performance-now": "^2.1.0", - "qs": "~6.5.2", + "qs": "~6.10.3", "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", + "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" + "uuid": "^8.3.2" } }, "@cypress/xvfb": { @@ -80,64 +54,74 @@ } } }, - "@samverschueren/stream-to-observable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz", - "integrity": "sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==", - "requires": { - "any-observable": "^0.3.0" - } + "@types/node": { + "version": "16.18.108", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.108.tgz", + "integrity": "sha512-fj42LD82fSv6yN9C6Q4dzS+hujHj+pTv0IpRR3kI20fnYeS0ytBpjFO9OjmDowSPPt4lNKN46JLaKbCyP+BW2A==" }, "@types/sinonjs__fake-timers": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.1.tgz", - "integrity": "sha512-yYezQwGWty8ziyYLdZjwxyMb0CZR49h8JALHGrxjQHWlqGgc8kLdHEgWrgL0uZ29DMvEVBDnHU2Wg36zKSIUtA==" + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz", + "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==" }, "@types/sizzle": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz", "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==" }, - "ajv": { - "version": "6.12.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", - "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", + "@types/yauzl": { + "version": "2.10.3", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", + "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", + "optional": true, + "requires": { + "@types/node": "*" + } + }, + "aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" } }, + "ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==" + }, "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==" + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "requires": { + "type-fest": "^0.21.3" + } }, "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" }, "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" - }, - "any-observable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz", - "integrity": "sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==" + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } }, "arch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.2.tgz", - "integrity": "sha512-NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz", + "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==" }, "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", + "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", "requires": { "safer-buffer": "~2.1.0" } @@ -145,7 +129,12 @@ "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==" + }, + "astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==" }, "async": { "version": "3.2.3", @@ -155,89 +144,97 @@ "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==" }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==" }, "aws4": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz", - "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==" + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz", + "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==" }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, "bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", "requires": { "tweetnacl": "^0.14.3" } }, + "blob-util": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz", + "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==" + }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" } }, "buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" - }, - "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" + "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==" }, "cachedir": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==" }, + "call-bind": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "requires": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + } + }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==" }, "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "requires": { - "has-flag": "^3.0.0" + "has-flag": "^4.0.0" } } } @@ -248,80 +245,58 @@ "integrity": "sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA=" }, "ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==" + }, + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" }, "cli-cursor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", - "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "requires": { - "restore-cursor": "^1.0.1" + "restore-cursor": "^3.1.0" } }, "cli-table3": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz", - "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz", + "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==", "requires": { - "colors": "^1.1.2", - "object-assign": "^4.1.0", - "string-width": "^2.1.1" + "@colors/colors": "1.5.0", + "string-width": "^4.2.0" } }, "cli-truncate": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz", - "integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", + "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", "requires": { - "slice-ansi": "0.0.4", - "string-width": "^1.0.1" - }, - "dependencies": { - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - } + "slice-ansi": "^3.0.0", + "string-width": "^4.2.0" } }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" - }, "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "requires": { - "color-name": "1.1.3" + "color-name": "~1.1.4" } }, "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "optional": true + "colorette": { + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==" }, "combined-stream": { "version": "1.0.8", @@ -332,131 +307,129 @@ } }, "commander": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==" + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==" }, "common-tags": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz", "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==" }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - } - }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" }, "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" } }, "cypress": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-4.12.1.tgz", - "integrity": "sha512-9SGIPEmqU8vuRA6xst2CMTYd9sCFCxKSzrHt0wr+w2iAQMCIIsXsQ5Gplns1sT6LDbZcmLv6uehabAOl3fhc9Q==", + "version": "12.17.4", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz", + "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==", "requires": { - "@cypress/listr-verbose-renderer": "^0.4.1", - "@cypress/request": "^2.88.5", + "@cypress/request": "2.88.12", "@cypress/xvfb": "^1.2.4", - "@types/sinonjs__fake-timers": "^6.0.1", + "@types/node": "^16.18.39", + "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", - "arch": "^2.1.2", + "arch": "^2.2.0", + "blob-util": "^2.0.2", "bluebird": "^3.7.2", + "buffer": "^5.6.0", "cachedir": "^2.3.0", - "chalk": "^2.4.2", + "chalk": "^4.1.0", "check-more-types": "^2.24.0", - "cli-table3": "~0.5.1", - "commander": "^4.1.1", + "cli-cursor": "^3.1.0", + "cli-table3": "~0.6.1", + "commander": "^6.2.1", "common-tags": "^1.8.0", - "debug": "^4.1.1", - "eventemitter2": "^6.4.2", - "execa": "^1.0.0", + "dayjs": "^1.10.4", + "debug": "^4.3.4", + "enquirer": "^2.3.6", + "eventemitter2": "6.4.7", + "execa": "4.1.0", "executable": "^4.1.1", - "extract-zip": "^1.7.0", - "fs-extra": "^8.1.0", + "extract-zip": "2.0.1", + "figures": "^3.2.0", + "fs-extra": "^9.1.0", "getos": "^3.2.1", - "is-ci": "^2.0.0", - "is-installed-globally": "^0.3.2", + "is-ci": "^3.0.0", + "is-installed-globally": "~0.4.0", "lazy-ass": "^1.6.0", - "listr": "^0.14.3", - "lodash": "^4.17.19", - "log-symbols": "^3.0.0", - "minimist": "^1.2.5", - "moment": "^2.27.0", + "listr2": "^3.8.3", + "lodash": "^4.17.21", + "log-symbols": "^4.0.0", + "minimist": "^1.2.8", "ospath": "^1.2.2", - "pretty-bytes": "^5.3.0", - "ramda": "~0.26.1", + "pretty-bytes": "^5.6.0", + "process": "^0.11.10", + "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", - "supports-color": "^7.1.0", - "tmp": "~0.1.0", + "semver": "^7.5.3", + "supports-color": "^8.1.1", + "tmp": "~0.2.1", "untildify": "^4.0.0", - "url": "^0.11.0", "yauzl": "^2.10.0" } }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", "requires": { "assert-plus": "^1.0.0" } }, - "date-fns": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", - "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==" + "dayjs": { + "version": "1.11.13", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz", + "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==" }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "requires": { + "ms": "2.1.2" + } + }, + "define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "requires": { - "ms": "^2.1.1" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" } }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" }, "ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", "requires": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" } }, - "elegant-spinner": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz", - "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=" + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "end-of-stream": { "version": "1.4.4", @@ -466,28 +439,52 @@ "once": "^1.4.0" } }, + "enquirer": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", + "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", + "requires": { + "ansi-colors": "^4.1.1", + "strip-ansi": "^6.0.1" + } + }, + "es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "requires": { + "get-intrinsic": "^1.2.4" + } + }, + "es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==" }, "eventemitter2": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.2.tgz", - "integrity": "sha512-r/Pwupa5RIzxIHbEKCkNXqpEQIIT4uQDxmP4G/Lug/NokVUWj0joz/WzWl3OxRpC5kDrH/WdiUJoR+IrwvXJEw==" + "version": "6.4.7", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz", + "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==" }, "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", + "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" } }, "executable": { @@ -498,78 +495,47 @@ "pify": "^2.2.0" } }, - "exit-hook": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz", - "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=" - }, "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "extract-zip": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", - "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", + "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", "requires": { - "concat-stream": "^1.6.2", - "debug": "^2.6.9", - "mkdirp": "^0.5.4", + "@types/yauzl": "^2.9.1", + "debug": "^4.1.1", + "get-stream": "^5.1.0", "yauzl": "^2.10.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } } }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==" }, "fd-slicer": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", + "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", "requires": { "pend": "~1.2.0" } }, "figures": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", - "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "requires": { - "escape-string-regexp": "^1.0.5", - "object-assign": "^4.1.0" + "escape-string-regexp": "^1.0.5" } }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==" }, "form-data": { "version": "2.3.3", @@ -582,24 +548,37 @@ } }, "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "requires": { + "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" } }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" + }, + "get-intrinsic": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "requires": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + } }, "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "requires": { "pump": "^3.0.0" } @@ -615,195 +594,173 @@ "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", "requires": { "assert-plus": "^1.0.0" } }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "global-dirs": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz", + "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==", "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "ini": "2.0.0" } }, - "global-dirs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz", - "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==", + "gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", "requires": { - "ini": "^1.3.5" + "get-intrinsic": "^1.1.3" } }, "graceful-fs": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, - "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", + "has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" + "es-define-property": "^1.0.0" } }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==" + }, + "has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + }, + "hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", "requires": { - "ansi-regex": "^2.0.0" + "function-bind": "^1.1.2" } }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" - }, "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz", + "integrity": "sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==", "requires": { "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" + "jsprim": "^2.0.2", + "sshpk": "^1.14.1" } }, - "indent-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", - "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=" + "human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==" }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } + "ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" }, "ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", + "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==" }, "is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", + "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", "requires": { - "ci-info": "^2.0.0" + "ci-info": "^3.2.0" } }, "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "is-installed-globally": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz", - "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==", - "requires": { - "global-dirs": "^2.0.1", - "is-path-inside": "^3.0.1" - } - }, - "is-observable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz", - "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", + "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", "requires": { - "symbol-observable": "^1.1.0" + "global-dirs": "^3.0.0", + "is-path-inside": "^3.0.2" } }, "is-path-inside": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz", - "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==" - }, - "is-promise": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", - "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==" + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==" }, "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==" }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==" }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==" }, "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==" }, "json-schema": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" - }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==" }, "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "requires": { - "graceful-fs": "^4.1.6" + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" } }, "jsprim": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", - "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz", + "integrity": "sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==", "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -816,113 +773,19 @@ "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz", "integrity": "sha1-eZllXoZGwX8In90YfRUNMyTVRRM=" }, - "listr": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz", - "integrity": "sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==", + "listr2": { + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz", + "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==", "requires": { - "@samverschueren/stream-to-observable": "^0.3.0", - "is-observable": "^1.1.0", - "is-promise": "^2.1.0", - "is-stream": "^1.1.0", - "listr-silent-renderer": "^1.1.1", - "listr-update-renderer": "^0.5.0", - "listr-verbose-renderer": "^0.5.0", - "p-map": "^2.0.0", - "rxjs": "^6.3.3" - } - }, - "listr-silent-renderer": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz", - "integrity": "sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=" - }, - "listr-update-renderer": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz", - "integrity": "sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==", - "requires": { - "chalk": "^1.1.3", - "cli-truncate": "^0.2.1", - "elegant-spinner": "^1.0.1", - "figures": "^1.7.0", - "indent-string": "^3.0.0", - "log-symbols": "^1.0.2", - "log-update": "^2.3.0", - "strip-ansi": "^3.0.1" - }, - "dependencies": { - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "log-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz", - "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=", - "requires": { - "chalk": "^1.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" - } - } - }, - "listr-verbose-renderer": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz", - "integrity": "sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==", - "requires": { - "chalk": "^2.4.1", - "cli-cursor": "^2.1.0", - "date-fns": "^1.27.2", - "figures": "^2.0.0" - }, - "dependencies": { - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - } + "cli-truncate": "^2.1.0", + "colorette": "^2.0.16", + "log-update": "^4.0.0", + "p-map": "^4.0.0", + "rfdc": "^1.3.0", + "rxjs": "^7.5.1", + "through": "^2.3.8", + "wrap-ansi": "^7.0.0" } }, "lodash": { @@ -936,174 +799,136 @@ "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" }, "log-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", - "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "requires": { - "chalk": "^2.4.2" + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" } }, "log-update": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz", - "integrity": "sha1-iDKP19HOeTiykoN0bwsbwSayRwg=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", + "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", "requires": { - "ansi-escapes": "^3.0.0", - "cli-cursor": "^2.0.0", - "wrap-ansi": "^3.0.1" + "ansi-escapes": "^4.3.0", + "cli-cursor": "^3.1.0", + "slice-ansi": "^4.0.0", + "wrap-ansi": "^6.2.0" }, "dependencies": { - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "requires": { - "mimic-fn": "^1.0.0" + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" } }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" } } } }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + }, "mime-db": { - "version": "1.44.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", - "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==" + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" }, "mime-types": { - "version": "2.1.27", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", - "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "requires": { - "mime-db": "1.44.0" + "mime-db": "1.52.0" } }, "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "requires": { - "brace-expansion": "^1.1.7" - } + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" }, "minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" - }, - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "requires": { - "minimist": "^1.2.5" - } - }, - "moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==" + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==" }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" - }, "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "requires": { - "path-key": "^2.0.0" + "path-key": "^3.0.0" } }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" - }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "object-inspect": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==" }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "requires": { "wrappy": "1" } }, "onetime": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", - "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=" + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "requires": { + "mimic-fn": "^2.1.0" + } }, "ospath": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz", "integrity": "sha1-EnZjl3Sj+O8lcvf+QoDg6kVQwHs=" }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" - }, "p-map": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", - "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==" - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "requires": { + "aggregate-error": "^3.0.0" + } }, "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" }, "pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" + "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" }, "pify": { "version": "2.3.0", @@ -1111,19 +936,24 @@ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" }, "pretty-bytes": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz", - "integrity": "sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==" + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", + "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==" }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==" + }, + "proxy-from-env": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz", + "integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==" }, "psl": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", + "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==" }, "pump": { "version": "3.0.0", @@ -1135,46 +965,23 @@ } }, "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==" }, "qs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", - "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==" - }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" - }, - "ramda": { - "version": "0.26.1", - "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz", - "integrity": "sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==" - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } + "version": "6.10.4", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz", + "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==", + "requires": { + "side-channel": "^1.0.4" } }, + "querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" + }, "request-progress": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz", @@ -1183,29 +990,31 @@ "throttleit": "^1.0.0" } }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==" + }, "restore-cursor": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", - "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", "requires": { - "exit-hook": "^1.0.0", - "onetime": "^1.0.0" + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" } }, - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "requires": { - "glob": "^7.1.3" - } + "rfdc": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", + "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==" }, "rxjs": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz", - "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "requires": { - "tslib": "^1.9.0" + "tslib": "^2.1.0" } }, "safe-buffer": { @@ -1219,37 +1028,66 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==" + }, + "set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "requires": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + } }, "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "^3.0.0" } }, "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "side-channel": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "requires": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + } }, "signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "slice-ansi": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", - "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", + "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", + "requires": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + } }, "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz", + "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==", "requires": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -1263,108 +1101,78 @@ } }, "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", - "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==" - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "requires": { - "safe-buffer": "~5.1.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" } }, "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "^5.0.1" } }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "requires": { "has-flag": "^4.0.0" - }, - "dependencies": { - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - } } }, - "symbol-observable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" - }, "throttleit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz", "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=" }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" + }, "tmp": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz", - "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==", - "requires": { - "rimraf": "^2.6.3" - } + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==" }, "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", + "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", + "requires": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "dependencies": { + "universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==" + } } }, "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", "requires": { "safe-buffer": "^5.0.1" } @@ -1372,61 +1180,41 @@ "tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" + "type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==" }, "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==" }, "untildify": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==" }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", "requires": { - "punycode": "^2.1.0" + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" } }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - }, - "dependencies": { - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" - } - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" }, "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", "requires": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", @@ -1434,46 +1222,32 @@ } }, "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "requires": { "isexe": "^2.0.0" } }, "wrap-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz", - "integrity": "sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", - "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==" - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - } + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" } }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "yauzl": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", + "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", "requires": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" diff --git a/kubernetes/monitoring/test/cypress/package.json b/kubernetes/monitoring/test/cypress/package.json index 638228449..5816ef427 100644 --- a/kubernetes/monitoring/test/cypress/package.json +++ b/kubernetes/monitoring/test/cypress/package.json @@ -4,7 +4,7 @@ "description": "", "main": "index.js", "dependencies": { - "cypress": "^4.11.0" + "cypress": "^12.17.4" }, "devDependencies": {}, "scripts": { diff --git a/kubernetes/mysql/Dockerfile b/kubernetes/mysql/Dockerfile index 28c0e1885..ec833cf6b 100644 --- a/kubernetes/mysql/Dockerfile +++ b/kubernetes/mysql/Dockerfile @@ -1,4 +1,4 @@ -FROM mysql:8.1 +FROM mysql:8.4 ARG BUILD_DATE ARG VCS_REF LABEL org.label-schema.build-date=$BUILD_DATE org.label-schema.vcs-ref=$VCS_REF \ diff --git a/kubernetes/mysql/mysql-deployment.yaml b/kubernetes/mysql/mysql-deployment.yaml index c62bb212c..ceb3a23f8 100644 --- a/kubernetes/mysql/mysql-deployment.yaml +++ b/kubernetes/mysql/mysql-deployment.yaml @@ -52,7 +52,7 @@ spec: - name: mysql-persistent-storage mountPath: /var/lib/mysql - name: mysql-exporter - image: prom/mysqld-exporter:v0.14.0 + image: prom/mysqld-exporter:v0.15.1 ports: - containerPort: 9104 env: diff --git a/kubernetes/nginx/Dockerfile b/kubernetes/nginx/Dockerfile index 0a314d376..8ddc0c125 100644 --- a/kubernetes/nginx/Dockerfile +++ b/kubernetes/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.25.1 +FROM nginx:1.27.1 ENV TZ Asia/Tokyo ARG BUILD_DATE ARG VCS_REF diff --git a/kubernetes/postgres/Dockerfile b/kubernetes/postgres/Dockerfile index b9d54234a..78a30c7b6 100644 --- a/kubernetes/postgres/Dockerfile +++ b/kubernetes/postgres/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:15.3-alpine +FROM postgres:15.8-alpine ARG BUILD_DATE ARG VCS_REF LABEL org.label-schema.build-date=$BUILD_DATE org.label-schema.vcs-ref=$VCS_REF \ diff --git a/kubernetes/rabbitmq/Dockerfile b/kubernetes/rabbitmq/Dockerfile index 428157a35..edc8b9561 100644 --- a/kubernetes/rabbitmq/Dockerfile +++ b/kubernetes/rabbitmq/Dockerfile @@ -1,4 +1,4 @@ -FROM rabbitmq:3.12-management-alpine +FROM rabbitmq:3.13.6-management-alpine ARG BUILD_DATE ARG VCS_REF diff --git a/kubernetes/redis/redis-deployment.yaml b/kubernetes/redis/redis-deployment.yaml index a2ffcd729..cfec7f11c 100644 --- a/kubernetes/redis/redis-deployment.yaml +++ b/kubernetes/redis/redis-deployment.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: redis-master - image: redis:7.0.12 + image: redis:7.2.5 ports: - containerPort: 6379 livenessProbe: @@ -32,7 +32,7 @@ spec: - redis-cli - ping - name: redis-exporter - image: oliver006/redis_exporter:v1.52.0-alpine + image: oliver006/redis_exporter:v1.62.0-alpine ports: - containerPort: 9121 livenessProbe: diff --git a/kubernetes/zookeeper/zookeeper-statefulset.yaml b/kubernetes/zookeeper/zookeeper-statefulset.yaml index 870b78a9d..ee786ea95 100644 --- a/kubernetes/zookeeper/zookeeper-statefulset.yaml +++ b/kubernetes/zookeeper/zookeeper-statefulset.yaml @@ -21,7 +21,7 @@ spec: spec: containers: - name: zookeeper - image: bitnami/zookeeper:3-debian-10 + image: bitnami/zookeeper:3.9.2-debian-12-r14 imagePullPolicy: Always ports: - containerPort: 2181