diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 4c73f8485f5..1f711ba34fb 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -59,7 +59,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: "temurin" - java-version: "17" + java-version: "21" - name: Restore maven cache # We're not using cache feature from actions/setup-java as it's not allowing to fine-tune it (in particular, we can't use restore-keys to load a previous cache if cache name mismatches) uses: actions/cache@v4 with: diff --git a/Jenkinsfile b/Jenkinsfile index 77c25725ce6..b7f330ee79e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ def IMPORTANT_BRANCH_OR_TAG = (env.BRANCH_NAME =~ /(develop|master_.*)/).matches pipeline { agent { - label 'java11' + label 'java21' } environment { @@ -18,7 +18,7 @@ pipeline { PUPPETEER_DOWNLOAD_HOST="${SERVICE_NEXUS_URL}repository/puppeteer-chrome" - JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64" + JAVA_HOME="/usr/lib/jvm/java-21-openjdk-amd64" } options { diff --git a/Jenkinsfile.containers b/Jenkinsfile.containers index 9c055d1b2b5..a6eaa2f7b38 100644 --- a/Jenkinsfile.containers +++ b/Jenkinsfile.containers @@ -1,7 +1,7 @@ /* groovylint-disable LineLength */ pipeline { agent { - label 'java11' + label 'java21' } environment { diff --git a/api/api-iam/iam-internal/src/test/resources/idp-test-metadata.xml b/api/api-iam/iam-internal/src/test/resources/idp-test-metadata.xml index 5ed35665a78..7501e7ffb71 100644 --- a/api/api-iam/iam-internal/src/test/resources/idp-test-metadata.xml +++ b/api/api-iam/iam-internal/src/test/resources/idp-test-metadata.xml @@ -1,5 +1,7 @@ - + localhost diff --git a/api/api-iam/iam-internal/src/test/resources/test-idp/idp-test-metadata.xml b/api/api-iam/iam-internal/src/test/resources/test-idp/idp-test-metadata.xml index 5ed35665a78..7501e7ffb71 100644 --- a/api/api-iam/iam-internal/src/test/resources/test-idp/idp-test-metadata.xml +++ b/api/api-iam/iam-internal/src/test/resources/test-idp/idp-test-metadata.xml @@ -1,5 +1,7 @@ - + localhost diff --git a/cas/cas-server/pom.xml b/cas/cas-server/pom.xml index 9b8cb7100c4..36a3585dfac 100644 --- a/cas/cas-server/pom.xml +++ b/cas/cas-server/pom.xml @@ -13,14 +13,13 @@ 3.11.1 2.17.0 - 1.18.24 - 1.9.3 + 1.18.30 3.12.1 - 2.7.3 - 3.1.1 + 2.7.18 + 3.1.5 5.7.3 - 5.3.22 - 5.3.22 + 5.3.37 + 5.3.37 2.2.2 4.7.1 6.0.3 @@ -31,6 +30,11 @@ + + org.springframework.boot + spring-boot-starter + + fr.gouv.vitamui diff --git a/commons/commons-vitam/src/main/config/seda/seda-2.1-main.xsd b/commons/commons-vitam/src/main/config/seda/seda-2.1-main.xsd index 0a4424a8f9f..edebfd05b09 100644 --- a/commons/commons-vitam/src/main/config/seda/seda-2.1-main.xsd +++ b/commons/commons-vitam/src/main/config/seda/seda-2.1-main.xsd @@ -1,8 +1,8 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns="fr:gouv:culture:archivesdefrance:seda:v2.1" elementFormDefault="qualified" + attributeFormDefault="unqualified" version="1.0"> diff --git a/commons/commons-vitam/src/main/config/seda/seda-2.1-ontology.xsd b/commons/commons-vitam/src/main/config/seda/seda-2.1-ontology.xsd index 2da122faade..413e28f7576 100644 --- a/commons/commons-vitam/src/main/config/seda/seda-2.1-ontology.xsd +++ b/commons/commons-vitam/src/main/config/seda/seda-2.1-ontology.xsd @@ -1,7 +1,7 @@ + xmlns="fr:gouv:culture:archivesdefrance:seda:v2.1" elementFormDefault="qualified" + attributeFormDefault="unqualified" version="1.0"> diff --git a/commons/commons-vitam/src/main/config/seda/seda-2.1-technical.xsd b/commons/commons-vitam/src/main/config/seda/seda-2.1-technical.xsd index 68ca2ef80f2..f237a1e961c 100644 --- a/commons/commons-vitam/src/main/config/seda/seda-2.1-technical.xsd +++ b/commons/commons-vitam/src/main/config/seda/seda-2.1-technical.xsd @@ -1,8 +1,8 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns="fr:gouv:culture:archivesdefrance:seda:v2.1" elementFormDefault="qualified" + attributeFormDefault="unqualified" version="1.0"> 1.16.1 @@ -118,11 +118,11 @@ 9.2.13.0 1.5.0 1.2.13 - 1.18.20 + 1.18.30 1.6.5 1.1.1 1.13.2 - 1.7.3 + 1.9.17 1.3.0.Final 4.11.0 1.1.0 @@ -137,13 +137,13 @@ 3.3.10 3.3.10 1.7.30 - 2.5.15 + 2.7.18 3.4.18 - 5.3.20 - 3.0.3 - 2020.0.6 + 5.3.37 + 3.1.5 + 2021.0.9 5.5.3 - 5.3.18 + 5.3.37 5.1.0 3.0.0 8.0.0-SNAPSHOT @@ -1624,7 +1624,7 @@ - gcr.io/distroless/java17 + gcr.io/distroless/java21 true @@ -2065,7 +2065,7 @@ - DEPENDENCIES=systemd,java-17-openjdk + DEPENDENCIES=systemd,java-21-openjdk diff --git a/tools/docker/vitamui-base/Dockerfile b/tools/docker/vitamui-base/Dockerfile index 01a4ba96845..1e980372cc7 100644 --- a/tools/docker/vitamui-base/Dockerfile +++ b/tools/docker/vitamui-base/Dockerfile @@ -31,7 +31,7 @@ RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == system ################################ Install build tools (rpm / maven / java) ############################### RUN yum install -y \ - java-17-openjdk-devel \ + java-21-openjdk-devel \ rpm-build \ rpmdevtools \ initscripts.x86_64 \