From 7d637f77fa215e41526201b9ba0ea34ef859eef5 Mon Sep 17 00:00:00 2001 From: Julien Georges Date: Fri, 5 Dec 2025 10:39:16 +0100 Subject: [PATCH 1/3] Story #15509: Update JRE to Adoptium Temurin 11.0.29+7. --- mailextract/assembly.xml | 2 +- mailextract/pom.xml | 31 ++++++++++++++++--------------- resip/assembly.xml | 2 +- resip/pom.xml | 31 ++++++++++++++++--------------- testsipgenerator/pom.xml | 4 ++-- 5 files changed, 36 insertions(+), 34 deletions(-) diff --git a/mailextract/assembly.xml b/mailextract/assembly.xml index 91c63d82..ff6923b4 100644 --- a/mailextract/assembly.xml +++ b/mailextract/assembly.xml @@ -14,7 +14,7 @@ MailExtract.exe MailExtractCmd.exe - jdk-11/** + jdk-11.0.29+7-jre/** diff --git a/mailextract/pom.xml b/mailextract/pom.xml index c2f54480..62b3a8c0 100644 --- a/mailextract/pom.xml +++ b/mailextract/pom.xml @@ -117,7 +117,7 @@ - download-jdk + download-jre package run @@ -125,27 +125,28 @@ + src="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.29+7/OpenJDK11U-jre_x64_windows_hotspot_11.0.29_7.zip" + dest="${project.build.directory}/jre11.zip" + verbose="false" + ignoreerrors="false" + usetimestamp="true"/> - unzip-jdk + unzip-jre package + + run + - + - - run - @@ -167,12 +168,12 @@ windows/VitamIcon.ico ${project.build.directory}/MailExtract.exe true - http://java.com/download + https://adoptium.net/temurin/releases/?version=11 fr.gouv.vitam.tools.mailextract.MailExtractApp - jdk-11 + ./jdk-11.0.29+7-jre 11 @@ -213,7 +214,7 @@ ${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar windows/VitamIcon.ico ${project.build.directory}/MailExtractCmd.exe - http://java.com/download + https://adoptium.net/temurin/releases/?version=11 fr.gouv.vitam.tools.mailextract.MailExtractApp diff --git a/resip/assembly.xml b/resip/assembly.xml index fec50cfc..35d6f350 100644 --- a/resip/assembly.xml +++ b/resip/assembly.xml @@ -13,7 +13,7 @@ / Resip.exe - jdk-11/** + jdk-11.0.29+7-jre/** diff --git a/resip/pom.xml b/resip/pom.xml index 7305769e..15e88b51 100644 --- a/resip/pom.xml +++ b/resip/pom.xml @@ -169,7 +169,7 @@ - download-jdk + download-jre package run @@ -177,27 +177,28 @@ + src="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.29+7/OpenJDK11U-jre_x64_windows_hotspot_11.0.29_7.zip" + dest="${project.build.directory}/jre11.zip" + verbose="false" + ignoreerrors="false" + usetimestamp="true"/> - unzip-jdk + unzip-jre package + + run + - + - - run - @@ -219,7 +220,7 @@ windows/VitamIcon.ico windows/Resip.exe true - http://java.com/download + https://adoptium.net/temurin/releases/?version=11 fr.gouv.vitam.tools.resip.app.ResipApp @@ -265,13 +266,13 @@ windows/VitamIcon.ico ${project.build.directory}/Resip.exe true - http://java.com/download + https://adoptium.net/temurin/releases/?version=11 fr.gouv.vitam.tools.resip.app.ResipApp - jdk-11 + ./jdk-11.0.29+7-jre 11 diff --git a/testsipgenerator/pom.xml b/testsipgenerator/pom.xml index c8da5e5b..b5460eb9 100644 --- a/testsipgenerator/pom.xml +++ b/testsipgenerator/pom.xml @@ -122,12 +122,12 @@ target/${project.artifactId}-${project.version}-shaded.jar windows/VitamIcon.ico windows/TestFileGenerator.exe - http://java.com/download + https://adoptium.net/temurin/releases/?version=11 fr.gouv.vitam.tools.testsipgenerator.TestSipGeneratorApp - .\jre + ./jdk-11.0.29+7-jre 11 From 278e0d67ca96831e68a77ed44ac3e83e73b22df8 Mon Sep 17 00:00:00 2001 From: Julien Georges Date: Fri, 5 Dec 2025 16:47:46 +0100 Subject: [PATCH 2/3] Story #15513: Refactoring sedatools-package to include all provided tools. --- Jenkinsfile | 1 - mailextract/pom.xml | 2 ++ packaging/assembly.xml | 67 ++++++++++++++++++++++------------- packaging/pom.xml | 12 ++----- resip/pom.xml | 53 +++------------------------ testsipgenerator/assembly.xml | 11 +++--- testsipgenerator/pom.xml | 5 +-- 7 files changed, 59 insertions(+), 92 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2bfe1a4e..f3890a74 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,7 +51,6 @@ pipeline { script { // overwrite file content with one more goal writeFile file: 'deploy_goal.txt', text: "${env.DEPLOY_GOAL}" - writeFile file: 'master_branch.txt', text: "${env.MASTER_BRANCH}" } echo "We are on master branch (${env.GIT_BRANCH}) ; deploy goal is \"${env.DEPLOY_GOAL}\"" } diff --git a/mailextract/pom.xml b/mailextract/pom.xml index 62b3a8c0..49875adc 100644 --- a/mailextract/pom.xml +++ b/mailextract/pom.xml @@ -191,6 +191,7 @@ ${project.name} Programme Vitam + Programme Vitam ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 @@ -237,6 +238,7 @@ ${project.name} Programme Vitam + Programme Vitam ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 diff --git a/packaging/assembly.xml b/packaging/assembly.xml index e50d4c45..a4ad48eb 100644 --- a/packaging/assembly.xml +++ b/packaging/assembly.xml @@ -1,43 +1,60 @@ + package - tar.gz + zip false - + + - ../resip/windows - - - VitamIcon.ico - resipIHM.png - + ../resip/target + resip/ + + Resip.exe + resip-${project.version}-shaded.jar + - ../doc - /doc + ../resip/windows + resip/ + + Resip.bat + - ../resip/src/test/resources/PacketSamples/ - config/ + resip/config/ **/ExportContext.config - - - - - - - / - false + + + ../resip/doc + resip/doc + + + + + ../testsipgenerator/target + testsipgenerator/ + + TestFileGenerator.exe + testsipgenerator-${project.version}-shaded.jar + + + + + + ../mailextract/target + mailextract/ - fr.gouv.vitam.tools:resip:* + MailExtract.exe + MailExtractCmd.exe + mailextract-${project.version}-shaded.jar - - + + + diff --git a/packaging/pom.xml b/packaging/pom.xml index 9504aa91..218fde40 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -16,7 +16,7 @@ - + maven-assembly-plugin @@ -35,16 +35,8 @@ + - - - - fr.gouv.vitam.tools - resip - ${project.version} - shaded - - diff --git a/resip/pom.xml b/resip/pom.xml index 15e88b51..e0653eae 100644 --- a/resip/pom.xml +++ b/resip/pom.xml @@ -216,16 +216,16 @@ gui - target/${project.artifactId}-${project.version}-shaded.jar + ${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar windows/VitamIcon.ico - windows/Resip.exe + ${project.build.directory}/Resip.exe true https://adoptium.net/temurin/releases/?version=11 fr.gouv.vitam.tools.resip.app.ResipApp - .\jre + ./jdk-11.0.29+7-jre 11 @@ -242,50 +242,7 @@ ${project.name} Programme Vitam - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - - ${project.name} - ${project.name} - Resip.exe - - - - - l4j-generate-x64 - package - - launch4j - - - gui - ${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar - windows/VitamIcon.ico - ${project.build.directory}/Resip.exe - true - https://adoptium.net/temurin/releases/?version=11 - - fr.gouv.vitam.tools.resip.app.ResipApp - - - - ./jdk-11.0.29+7-jre - 11 - - - - - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - - ${project.name} - Programme Vitam + Programme Vitam ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 @@ -323,7 +280,7 @@ - tar.gz-with-jdk-11-assembly + zip-with-jdk-11-assembly package single diff --git a/testsipgenerator/assembly.xml b/testsipgenerator/assembly.xml index e1b6985c..16eb8a4d 100644 --- a/testsipgenerator/assembly.xml +++ b/testsipgenerator/assembly.xml @@ -1,17 +1,16 @@ - tar.gz + zip false - - windows/ + ${project.build.directory}/ - + + TestFileGenerator.exe + diff --git a/testsipgenerator/pom.xml b/testsipgenerator/pom.xml index b5460eb9..a9abe722 100644 --- a/testsipgenerator/pom.xml +++ b/testsipgenerator/pom.xml @@ -119,9 +119,9 @@ console - target/${project.artifactId}-${project.version}-shaded.jar + ${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar windows/VitamIcon.ico - windows/TestFileGenerator.exe + ${project.build.directory}/TestFileGenerator.exe https://adoptium.net/temurin/releases/?version=11 fr.gouv.vitam.tools.testsipgenerator.TestSipGeneratorApp @@ -143,6 +143,7 @@ ${project.name} Programme Vitam + Programme Vitam ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 From 56e851babbceb7ff3387f49ae16c68bed141f91f Mon Sep 17 00:00:00 2001 From: Julien Georges Date: Mon, 8 Dec 2025 10:38:30 +0100 Subject: [PATCH 3/3] Story #15513: Updating tools to proper version. --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f3890a74..4b8b16af 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,11 @@ pipeline { agent { - label 'slaves' + label 'build' + } + + tools { + jdk 'java11' + maven 'maven-3.9' } environment {