diff --git a/.circleci/ci/src/config.ts b/.circleci/ci/src/config.ts index 70c9a2d9748..f809fe88734 100644 --- a/.circleci/ci/src/config.ts +++ b/.circleci/ci/src/config.ts @@ -59,7 +59,7 @@ const executor = { }, openjdk: { image: 'cimg/openjdk', - version: '17.0.8', // starting with 17.0.9, node version becomes 20.9.0, which breaks the build. + version: '21.0.5', }, node: { image: 'cimg/node', diff --git a/.circleci/ci/src/pipelines/tests/resources/bridge-compatibility-tests/bridge-compatibility-tests.yml b/.circleci/ci/src/pipelines/tests/resources/bridge-compatibility-tests/bridge-compatibility-tests.yml index 9d2a74a73e8..7f596c0e78f 100644 --- a/.circleci/ci/src/pipelines/tests/resources/bridge-compatibility-tests/bridge-compatibility-tests.yml +++ b/.circleci/ci/src/pipelines/tests/resources/bridge-compatibility-tests/bridge-compatibility-tests.yml @@ -126,7 +126,7 @@ jobs: - .gravitee.settings.xml job-validate: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -142,7 +142,7 @@ jobs: jobName: job-validate job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -176,7 +176,7 @@ jobs: - ./gateway-docker-context job-e2e-generate-sdk: docker: - - image: cimg/openjdk:17.0.8-node + - image: cimg/openjdk:21.0.5-node resource_class: small steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-alpha.yml b/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-alpha.yml index 334c66abd7c..3f5dfd7211c 100644 --- a/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-alpha.yml +++ b/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-alpha.yml @@ -324,7 +324,7 @@ jobs: ARTIFACTORY_URL: https://odbxikk7vo-artifactory.services.clever-cloud.com job-backend-build-and-publish-artifactory: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -407,7 +407,7 @@ jobs: git push --tags origin 4.2.x job-package-bundle: docker: - - image: cimg/openjdk:17.0.8-node + - image: cimg/openjdk:21.0.5-node resource_class: medium steps: - keeper/env-export: @@ -633,7 +633,7 @@ jobs: } job-nexus-staging: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: xlarge steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-dry-run.yml b/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-dry-run.yml index a5823983f4a..86cfef1ec47 100644 --- a/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-dry-run.yml +++ b/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-dry-run.yml @@ -324,7 +324,7 @@ jobs: ARTIFACTORY_URL: https://odbxikk7vo-artifactory.services.clever-cloud.com job-backend-build-and-publish-artifactory: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -409,7 +409,7 @@ jobs: git push --tags --dry-run origin 4.2.x job-package-bundle: docker: - - image: cimg/openjdk:17.0.8-node + - image: cimg/openjdk:21.0.5-node resource_class: medium steps: - keeper/env-export: @@ -623,7 +623,7 @@ jobs: working_directory: ./release job-nexus-staging: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: xlarge steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-latest.yml b/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-latest.yml index f5f0049afc2..481b21c4354 100644 --- a/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-latest.yml +++ b/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-latest.yml @@ -324,7 +324,7 @@ jobs: ARTIFACTORY_URL: https://odbxikk7vo-artifactory.services.clever-cloud.com job-backend-build-and-publish-artifactory: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -409,7 +409,7 @@ jobs: git push --tags origin 4.2.x job-package-bundle: docker: - - image: cimg/openjdk:17.0.8-node + - image: cimg/openjdk:21.0.5-node resource_class: medium steps: - keeper/env-export: @@ -635,7 +635,7 @@ jobs: } job-nexus-staging: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: xlarge steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-no-dry-run.yml b/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-no-dry-run.yml index 2bd68677e8e..603eaa3f3c9 100644 --- a/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-no-dry-run.yml +++ b/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-no-dry-run.yml @@ -324,7 +324,7 @@ jobs: ARTIFACTORY_URL: https://odbxikk7vo-artifactory.services.clever-cloud.com job-backend-build-and-publish-artifactory: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -409,7 +409,7 @@ jobs: git push --tags origin 4.2.x job-package-bundle: docker: - - image: cimg/openjdk:17.0.8-node + - image: cimg/openjdk:21.0.5-node resource_class: medium steps: - keeper/env-export: @@ -635,7 +635,7 @@ jobs: } job-nexus-staging: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: xlarge steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/nexus-staging/nexus-staging-no-dry-run.yml b/.circleci/ci/src/pipelines/tests/resources/nexus-staging/nexus-staging-no-dry-run.yml index 4a1f3292441..1b27e7872b3 100644 --- a/.circleci/ci/src/pipelines/tests/resources/nexus-staging/nexus-staging-no-dry-run.yml +++ b/.circleci/ci/src/pipelines/tests/resources/nexus-staging/nexus-staging-no-dry-run.yml @@ -84,7 +84,7 @@ jobs: - .gravitee.settings.xml job-nexus-staging: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: xlarge steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-prerelease-dry-run.yml b/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-prerelease-dry-run.yml index ac21140b399..e57f0390f67 100644 --- a/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-prerelease-dry-run.yml +++ b/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-prerelease-dry-run.yml @@ -34,7 +34,7 @@ commands: jobs: job-package-bundle: docker: - - image: cimg/openjdk:17.0.8-node + - image: cimg/openjdk:21.0.5-node resource_class: medium steps: - keeper/env-export: diff --git a/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-prerelease-no-dry-run.yml b/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-prerelease-no-dry-run.yml index 9c685441e6f..7d650fcabb3 100644 --- a/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-prerelease-no-dry-run.yml +++ b/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-prerelease-no-dry-run.yml @@ -34,7 +34,7 @@ commands: jobs: job-package-bundle: docker: - - image: cimg/openjdk:17.0.8-node + - image: cimg/openjdk:21.0.5-node resource_class: medium steps: - keeper/env-export: diff --git a/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-release-dry-run.yml b/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-release-dry-run.yml index 67f11bce670..c1c26e83012 100644 --- a/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-release-dry-run.yml +++ b/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-release-dry-run.yml @@ -34,7 +34,7 @@ commands: jobs: job-package-bundle: docker: - - image: cimg/openjdk:17.0.8-node + - image: cimg/openjdk:21.0.5-node resource_class: medium steps: - keeper/env-export: diff --git a/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-release-no-dry-run.yml b/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-release-no-dry-run.yml index 5ab97405abe..7c005876cf6 100644 --- a/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-release-no-dry-run.yml +++ b/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-release-no-dry-run.yml @@ -34,7 +34,7 @@ commands: jobs: job-package-bundle: docker: - - image: cimg/openjdk:17.0.8-node + - image: cimg/openjdk:21.0.5-node resource_class: medium steps: - keeper/env-export: diff --git a/.circleci/ci/src/pipelines/tests/resources/publish-docker-images/publish-docker-images-4-1-x.yml b/.circleci/ci/src/pipelines/tests/resources/publish-docker-images/publish-docker-images-4-1-x.yml index a29dbfea9e8..127a463a416 100644 --- a/.circleci/ci/src/pipelines/tests/resources/publish-docker-images/publish-docker-images-4-1-x.yml +++ b/.circleci/ci/src/pipelines/tests/resources/publish-docker-images/publish-docker-images-4-1-x.yml @@ -180,7 +180,7 @@ jobs: - .gravitee.settings.xml job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -214,7 +214,7 @@ jobs: - ./gateway-docker-context job-build-images: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/publish-docker-images/publish-docker-images-dry-run.yml b/.circleci/ci/src/pipelines/tests/resources/publish-docker-images/publish-docker-images-dry-run.yml index 45f09a50c78..cb2c14faa80 100644 --- a/.circleci/ci/src/pipelines/tests/resources/publish-docker-images/publish-docker-images-dry-run.yml +++ b/.circleci/ci/src/pipelines/tests/resources/publish-docker-images/publish-docker-images-dry-run.yml @@ -155,7 +155,7 @@ jobs: - .gravitee.settings.xml job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -189,7 +189,7 @@ jobs: - ./gateway-docker-context job-build-images: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/publish-docker-images/publish-docker-images-master.yml b/.circleci/ci/src/pipelines/tests/resources/publish-docker-images/publish-docker-images-master.yml index 503f0141614..b1551aa1c4e 100644 --- a/.circleci/ci/src/pipelines/tests/resources/publish-docker-images/publish-docker-images-master.yml +++ b/.circleci/ci/src/pipelines/tests/resources/publish-docker-images/publish-docker-images-master.yml @@ -180,7 +180,7 @@ jobs: - .gravitee.settings.xml job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -214,7 +214,7 @@ jobs: - ./gateway-docker-context job-build-images: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-4-1-x.yml b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-4-1-x.yml index 6ceb7615b43..ac2447d6463 100644 --- a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-4-1-x.yml +++ b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-4-1-x.yml @@ -204,7 +204,7 @@ jobs: - .gravitee.settings.xml job-validate: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -232,7 +232,7 @@ jobs: command: cd .circleci/danger && yarn run danger job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -266,7 +266,7 @@ jobs: - ./gateway-docker-context job-test-definition: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -336,7 +336,7 @@ jobs: when: always job-test-gateway: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout @@ -367,7 +367,7 @@ jobs: - gravitee-apim-gateway/gravitee-apim-gateway-coverage/target/site/jacoco-aggregate/ job-test-rest-api: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout @@ -694,7 +694,7 @@ jobs: - gravitee-apim-portal-webui/dist job-build-images: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout @@ -749,7 +749,7 @@ jobs: - cmd-docker-azure-logout job-e2e-generate-sdk: docker: - - image: cimg/openjdk:17.0.8-node + - image: cimg/openjdk:21.0.5-node resource_class: small steps: - checkout @@ -907,7 +907,7 @@ jobs: - cmd-notify-on-failure job-community-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -921,7 +921,7 @@ jobs: jobName: job-community-build job-publish-on-artifactory: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -937,7 +937,7 @@ jobs: jobName: job-publish-on-artifactory job-publish-on-nexus: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-distribution-only.yml b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-distribution-only.yml index 14dbe794a87..e8fb58884a7 100644 --- a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-distribution-only.yml +++ b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-distribution-only.yml @@ -83,7 +83,7 @@ jobs: - .gravitee.settings.xml job-validate: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -111,7 +111,7 @@ jobs: command: cd .circleci/danger && yarn run danger job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-gateway-only.yml b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-gateway-only.yml index 9631ed05504..0eff7f43b8e 100644 --- a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-gateway-only.yml +++ b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-gateway-only.yml @@ -83,7 +83,7 @@ jobs: - .gravitee.settings.xml job-validate: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -111,7 +111,7 @@ jobs: command: cd .circleci/danger && yarn run danger job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -145,7 +145,7 @@ jobs: - ./gateway-docker-context job-test-gateway: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-integration-tests-only.yml b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-integration-tests-only.yml index d5a1174fb5b..34a4ce4aa4e 100644 --- a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-integration-tests-only.yml +++ b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-integration-tests-only.yml @@ -83,7 +83,7 @@ jobs: - .gravitee.settings.xml job-validate: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -111,7 +111,7 @@ jobs: command: cd .circleci/danger && yarn run danger job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-only.yml b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-only.yml index ad9922120ce..17cf5195363 100644 --- a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-only.yml +++ b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-only.yml @@ -83,7 +83,7 @@ jobs: - .gravitee.settings.xml job-validate: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -111,7 +111,7 @@ jobs: command: cd .circleci/danger && yarn run danger job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -145,7 +145,7 @@ jobs: - ./gateway-docker-context job-test-definition: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -215,7 +215,7 @@ jobs: when: always job-test-gateway: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout @@ -246,7 +246,7 @@ jobs: - gravitee-apim-gateway/gravitee-apim-gateway-coverage/target/site/jacoco-aggregate/ job-test-rest-api: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-plugin-only.yml b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-plugin-only.yml index e51e0f6de9b..40bd0966b65 100644 --- a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-plugin-only.yml +++ b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-plugin-only.yml @@ -83,7 +83,7 @@ jobs: - .gravitee.settings.xml job-validate: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -111,7 +111,7 @@ jobs: command: cd .circleci/danger && yarn run danger job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-rest-api-only.yml b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-rest-api-only.yml index 74034a81a6c..38ee639eb9b 100644 --- a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-rest-api-only.yml +++ b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch-backend-rest-api-only.yml @@ -83,7 +83,7 @@ jobs: - .gravitee.settings.xml job-validate: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -111,7 +111,7 @@ jobs: command: cd .circleci/danger && yarn run danger job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -145,7 +145,7 @@ jobs: - ./gateway-docker-context job-test-rest-api: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch.yml b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch.yml index 8f18bc9691e..3add42f65e4 100644 --- a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch.yml +++ b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-custom-branch.yml @@ -179,7 +179,7 @@ jobs: - .gravitee.settings.xml job-validate: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -207,7 +207,7 @@ jobs: command: cd .circleci/danger && yarn run danger job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -241,7 +241,7 @@ jobs: - ./gateway-docker-context job-test-definition: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -311,7 +311,7 @@ jobs: when: always job-test-gateway: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout @@ -342,7 +342,7 @@ jobs: - gravitee-apim-gateway/gravitee-apim-gateway-coverage/target/site/jacoco-aggregate/ job-test-rest-api: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-master.yml b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-master.yml index c8e7f1a388a..a64b3b18ab9 100644 --- a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-master.yml +++ b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-master.yml @@ -204,7 +204,7 @@ jobs: - .gravitee.settings.xml job-validate: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -232,7 +232,7 @@ jobs: command: cd .circleci/danger && yarn run danger job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -266,7 +266,7 @@ jobs: - ./gateway-docker-context job-test-definition: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -336,7 +336,7 @@ jobs: when: always job-test-gateway: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout @@ -367,7 +367,7 @@ jobs: - gravitee-apim-gateway/gravitee-apim-gateway-coverage/target/site/jacoco-aggregate/ job-test-rest-api: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout @@ -694,7 +694,7 @@ jobs: - gravitee-apim-portal-webui/dist job-build-images: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout @@ -749,7 +749,7 @@ jobs: - cmd-docker-azure-logout job-e2e-generate-sdk: docker: - - image: cimg/openjdk:17.0.8-node + - image: cimg/openjdk:21.0.5-node resource_class: small steps: - checkout @@ -907,7 +907,7 @@ jobs: - cmd-notify-on-failure job-community-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -921,7 +921,7 @@ jobs: jobName: job-community-build job-publish-on-artifactory: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -937,7 +937,7 @@ jobs: jobName: job-publish-on-artifactory job-publish-on-nexus: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-mergify.yml b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-mergify.yml index e932d1f6e96..ae09e10600f 100644 --- a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-mergify.yml +++ b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-mergify.yml @@ -179,7 +179,7 @@ jobs: - .gravitee.settings.xml job-validate: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -207,7 +207,7 @@ jobs: command: cd .circleci/danger && yarn run danger job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -241,7 +241,7 @@ jobs: - ./gateway-docker-context job-test-definition: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -311,7 +311,7 @@ jobs: when: always job-test-gateway: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout @@ -342,7 +342,7 @@ jobs: - gravitee-apim-gateway/gravitee-apim-gateway-coverage/target/site/jacoco-aggregate/ job-test-rest-api: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-run-e2e.yml b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-run-e2e.yml index b6c4813aac9..fb03f63b133 100644 --- a/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-run-e2e.yml +++ b/.circleci/ci/src/pipelines/tests/resources/pull-requests/pull-requests-run-e2e.yml @@ -179,7 +179,7 @@ jobs: - .gravitee.settings.xml job-validate: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -207,7 +207,7 @@ jobs: command: cd .circleci/danger && yarn run danger job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -241,7 +241,7 @@ jobs: - ./gateway-docker-context job-test-definition: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: small steps: - checkout @@ -311,7 +311,7 @@ jobs: when: always job-test-gateway: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout @@ -342,7 +342,7 @@ jobs: - gravitee-apim-gateway/gravitee-apim-gateway-coverage/target/site/jacoco-aggregate/ job-test-rest-api: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout @@ -677,7 +677,7 @@ jobs: command: echo "Congratulations! If you can read this, everything is OK" job-build-images: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout @@ -700,7 +700,7 @@ jobs: - cmd-docker-azure-logout job-e2e-generate-sdk: docker: - - image: cimg/openjdk:17.0.8-node + - image: cimg/openjdk:21.0.5-node resource_class: small steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/release/release-4-2-0-alpha.yml b/.circleci/ci/src/pipelines/tests/resources/release/release-4-2-0-alpha.yml index 8cf69205403..ff3c2929747 100644 --- a/.circleci/ci/src/pipelines/tests/resources/release/release-4-2-0-alpha.yml +++ b/.circleci/ci/src/pipelines/tests/resources/release/release-4-2-0-alpha.yml @@ -324,7 +324,7 @@ jobs: ARTIFACTORY_URL: https://odbxikk7vo-artifactory.services.clever-cloud.com job-backend-build-and-publish-artifactory: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/release/release-4-2-0-dry-run.yml b/.circleci/ci/src/pipelines/tests/resources/release/release-4-2-0-dry-run.yml index 59923f6269f..451f2da64d1 100644 --- a/.circleci/ci/src/pipelines/tests/resources/release/release-4-2-0-dry-run.yml +++ b/.circleci/ci/src/pipelines/tests/resources/release/release-4-2-0-dry-run.yml @@ -324,7 +324,7 @@ jobs: ARTIFACTORY_URL: https://odbxikk7vo-artifactory.services.clever-cloud.com job-backend-build-and-publish-artifactory: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/release/release-4-2-0-snapshot.yml b/.circleci/ci/src/pipelines/tests/resources/release/release-4-2-0-snapshot.yml index 0dd51d57027..217e242a1a7 100644 --- a/.circleci/ci/src/pipelines/tests/resources/release/release-4-2-0-snapshot.yml +++ b/.circleci/ci/src/pipelines/tests/resources/release/release-4-2-0-snapshot.yml @@ -324,7 +324,7 @@ jobs: ARTIFACTORY_URL: https://odbxikk7vo-artifactory.services.clever-cloud.com job-backend-build-and-publish-artifactory: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/repositories-tests/repositories-tests.yml b/.circleci/ci/src/pipelines/tests/resources/repositories-tests/repositories-tests.yml index b98c7d0baf5..7588e049d64 100644 --- a/.circleci/ci/src/pipelines/tests/resources/repositories-tests/repositories-tests.yml +++ b/.circleci/ci/src/pipelines/tests/resources/repositories-tests/repositories-tests.yml @@ -82,7 +82,7 @@ jobs: - .gravitee.settings.xml job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout diff --git a/.circleci/ci/src/pipelines/tests/resources/run-e2e-tests/run-e2e-tests.yml b/.circleci/ci/src/pipelines/tests/resources/run-e2e-tests/run-e2e-tests.yml index 4b5d302faae..ef3ad4125f5 100644 --- a/.circleci/ci/src/pipelines/tests/resources/run-e2e-tests/run-e2e-tests.yml +++ b/.circleci/ci/src/pipelines/tests/resources/run-e2e-tests/run-e2e-tests.yml @@ -155,7 +155,7 @@ jobs: - .gravitee.settings.xml job-build: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: large steps: - checkout @@ -189,7 +189,7 @@ jobs: - ./gateway-docker-context job-build-images: docker: - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:21.0.5 resource_class: medium steps: - checkout @@ -283,7 +283,7 @@ jobs: - gravitee-apim-portal-webui/dist job-e2e-generate-sdk: docker: - - image: cimg/openjdk:17.0.8-node + - image: cimg/openjdk:21.0.5-node resource_class: small steps: - checkout diff --git a/gravitee-apim-gateway/docker/Dockerfile b/gravitee-apim-gateway/docker/Dockerfile index ec33e076acb..71085e3bf71 100644 --- a/gravitee-apim-gateway/docker/Dockerfile +++ b/gravitee-apim-gateway/docker/Dockerfile @@ -15,13 +15,14 @@ # # First stage to share environment variable -FROM graviteeio/java:17-alpine-3.18 AS base +FROM graviteeio/java:21 AS base ENV GRAVITEEIO_HOME=/opt/graviteeio-gateway RUN apk update \ && apk add --no-cache libc6-compat \ && apkArch="$(apk --print-arch)" \ - && ln -s /lib/libc.musl-${apkArch}.so.1 /lib/ld-linux-${apkArch/_/-}.so.2 + && if [ $(apk --print-arch) = "aarch64" ]; then ln -s /lib/libc.musl-aarch64.so.1 /lib/ld-linux-aarch64.so.2; fi + RUN addgroup -g 1000 graviteeio \ && adduser -D -H -u 1001 graviteeio --ingroup graviteeio diff --git a/gravitee-apim-gateway/docker/Dockerfile-from-download b/gravitee-apim-gateway/docker/Dockerfile-from-download index 8ba012b5378..d859df322e9 100644 --- a/gravitee-apim-gateway/docker/Dockerfile-from-download +++ b/gravitee-apim-gateway/docker/Dockerfile-from-download @@ -14,7 +14,7 @@ # limitations under the License. # -FROM graviteeio/java:17-alpine-3.18 +FROM graviteeio/java:21 LABEL maintainer="contact@graviteesource.com" ARG GRAVITEEIO_VERSION=0 @@ -34,8 +34,7 @@ RUN apk update \ && rm -rf /tmp/* \ && chgrp -R graviteeio ${GRAVITEEIO_HOME} \ && chmod -R g=u ${GRAVITEEIO_HOME} \ - && apkArch="$(apk --print-arch)" \ - && ln -s /lib/libc.musl-${apkArch}.so.1 /lib/ld-linux-${apkArch/_/-}.so.2 + && if [ $(apk --print-arch) = "aarch64" ]; then ln -s /lib/libc.musl-aarch64.so.1 /lib/ld-linux-aarch64.so.2; fi WORKDIR ${GRAVITEEIO_HOME} EXPOSE 8082 diff --git a/gravitee-apim-gateway/gravitee-apim-gateway-core/src/test/java/io/gravitee/gateway/reactive/core/context/DefaultExecutionContextTest.java b/gravitee-apim-gateway/gravitee-apim-gateway-core/src/test/java/io/gravitee/gateway/reactive/core/context/DefaultExecutionContextTest.java index d78c6127859..411b067607b 100644 --- a/gravitee-apim-gateway/gravitee-apim-gateway-core/src/test/java/io/gravitee/gateway/reactive/core/context/DefaultExecutionContextTest.java +++ b/gravitee-apim-gateway/gravitee-apim-gateway-core/src/test/java/io/gravitee/gateway/reactive/core/context/DefaultExecutionContextTest.java @@ -396,7 +396,7 @@ static Stream listableAttribute() { "[\"a\", 123456789123456789123456789123456789, \"c\"]", List.of("a", "123456789123456789123456789123456789", "c") ), - Arguments.arguments("[\"a\", 123456789123456789.123456789123456789, \"c\"]", List.of("a", "1.23456789123456784E17", "c")), + Arguments.arguments("[\"a\", 123456789123456789.123456789123456789, \"c\"]", List.of("a", "1.2345678912345678E17", "c")), Arguments.arguments("[\"a\", true, \"c\"]", List.of("a", "true", "c")), Arguments.arguments(List.of("a", "b", "c"), List.of("a", "b", "c")), Arguments.arguments(new ArrayList<>(List.of(1, 2, 3)), List.of(1, 2, 3)), diff --git a/gravitee-apim-rest-api/docker/Dockerfile b/gravitee-apim-rest-api/docker/Dockerfile index d879b476739..69d05c68af3 100644 --- a/gravitee-apim-rest-api/docker/Dockerfile +++ b/gravitee-apim-rest-api/docker/Dockerfile @@ -15,7 +15,7 @@ # # First stage to share environment variable -FROM graviteeio/java:17-alpine-3.18 AS base +FROM graviteeio/java:21 AS base ENV GRAVITEEIO_HOME=/opt/graviteeio-management-api RUN addgroup -g 1000 graviteeio \ diff --git a/gravitee-apim-rest-api/docker/Dockerfile-from-download b/gravitee-apim-rest-api/docker/Dockerfile-from-download index 68f0d829a40..e2c2e58d3e7 100644 --- a/gravitee-apim-rest-api/docker/Dockerfile-from-download +++ b/gravitee-apim-rest-api/docker/Dockerfile-from-download @@ -14,7 +14,7 @@ # limitations under the License. # -FROM graviteeio/java:17-alpine-3.18 +FROM graviteeio/java:21 LABEL maintainer="contact@graviteesource.com" ARG GRAVITEEIO_VERSION=0 diff --git a/pom.xml b/pom.xml index 16c7ccf95d4..173db7b3647 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ io.gravitee gravitee-parent - 22.2.4 + 23.0.0-archi-425-SNAPSHOT io.gravitee.apim