From cb9adecd606c1659ccf11868d1ed914400235b0a Mon Sep 17 00:00:00 2001 From: Olivier MARSOL Date: Fri, 21 Feb 2020 10:12:33 +0100 Subject: [PATCH 1/7] Bump to java11 --- ffmpeg/pom.xml | 2 +- ffmpeg/src/deb/control/control | 2 +- imagemagick/pom.xml | 2 +- imagemagick/src/deb/control/control | 2 +- jhove/pom.xml | 2 +- libreoffice/pom.xml | 2 +- libreoffice/src/deb/control/control | 2 +- odfvalidator/pom.xml | 2 +- odfvalidator/src/deb/control/control | 2 +- pom.xml | 5 ++++- siegfried/pom.xml | 2 +- siegfried/src/deb/control/control | 2 +- tesseract/pom.xml | 2 +- tesseract/src/deb/control/control | 2 +- verapdf/pom.xml | 2 +- verapdf/src/deb/control/control | 2 +- 16 files changed, 19 insertions(+), 16 deletions(-) diff --git a/ffmpeg/pom.xml b/ffmpeg/pom.xml index 672ec22..c0b6670 100644 --- a/ffmpeg/pom.xml +++ b/ffmpeg/pom.xml @@ -101,7 +101,7 @@ false - ${java.version} + ${jdk.version.rpm} ffmpeg lame-libs vitam-user-${unix.user} diff --git a/ffmpeg/src/deb/control/control b/ffmpeg/src/deb/control/control index 1f0ee8d..245a2d7 100644 --- a/ffmpeg/src/deb/control/control +++ b/ffmpeg/src/deb/control/control @@ -3,6 +3,6 @@ Version: [[version]] Section: Application/Archiving Priority: low Architecture: all -Depends: openjdk-8-jre-headless, ffmpeg, vitam-user-vitam +Depends: openjdk-11-jre-headless, ffmpeg, vitam-user-vitam Maintainer: Vitam Package Team Description: [[description]] \ No newline at end of file diff --git a/imagemagick/pom.xml b/imagemagick/pom.xml index 99a9c3b..eaceabd 100644 --- a/imagemagick/pom.xml +++ b/imagemagick/pom.xml @@ -102,7 +102,7 @@ false - ${java.version} + ${jdk.version.rpm} ImageMagick vitam-user-${unix.user} diff --git a/imagemagick/src/deb/control/control b/imagemagick/src/deb/control/control index f17a9b5..0510797 100755 --- a/imagemagick/src/deb/control/control +++ b/imagemagick/src/deb/control/control @@ -3,6 +3,6 @@ Version: [[version]] Section: Application/Archiving Priority: low Architecture: all -Depends: openjdk-8-jre-headless, imagemagick, vitam-user-vitam +Depends: openjdk-11-jre-headless, imagemagick, vitam-user-vitam Maintainer: Vitam Package Team Description: [[description]] \ No newline at end of file diff --git a/jhove/pom.xml b/jhove/pom.xml index f69b365..fd72a18 100755 --- a/jhove/pom.xml +++ b/jhove/pom.xml @@ -137,7 +137,7 @@ false - ${java.version} + ${jdk.version.rpm} vitam-user-${unix.user} diff --git a/libreoffice/pom.xml b/libreoffice/pom.xml index 11979bc..646d715 100755 --- a/libreoffice/pom.xml +++ b/libreoffice/pom.xml @@ -108,7 +108,7 @@ false - ${java.version} + ${jdk.version.rpm} vitam-user-${unix.user} cups-libs cairo diff --git a/libreoffice/src/deb/control/control b/libreoffice/src/deb/control/control index 5466e1a..cf1eb3b 100755 --- a/libreoffice/src/deb/control/control +++ b/libreoffice/src/deb/control/control @@ -3,6 +3,6 @@ Version: [[version]] Section: Application/Archiving Priority: low Architecture: all -Depends: openjdk-8-jre-headless, libxinerama1, libdbus-glib-1-2, libcairomm-1.0-1v5, libcups2, libsm6, libreoffice6.2-base, libreoffice6.2-calc, libreoffice6.2-dict-en, libreoffice6.2-dict-es, libreoffice6.2-dict-fr, libreoffice6.2-draw, libreoffice6.2-en-us, libreoffice6.2-impress, libreoffice6.2-math, vitam-user-vitam, libobasis6.2-base, libobasis6.2-calc, libobasis6.2-core, libobasis6.2-draw, libobasis6.2-en-us, libobasis6.2-extension-beanshell-script-provider, libobasis6.2-extension-javascript-script-provider, libobasis6.2-extension-mediawiki-publisher, libobasis6.2-extension-nlpsolver, libobasis6.2-extension-pdf-import, libobasis6.2-extension-report-builder, libobasis6.2-firebird, libobasis6.2-gnome-integration, libobasis6.2-graphicfilter, libobasis6.2-images, libobasis6.2-impress, libobasis6.2-kde-integration, libobasis6.2-librelogo, libobasis6.2-libreofficekit-data, libobasis6.2-math, libobasis6.2-ogltrans, libobasis6.2-onlineupdate, libobasis6.2-ooofonts, libobasis6.2-ooolinguistic, libobasis6.2-postgresql-sdbc, libobasis6.2-python-script-provider, libobasis6.2-pyuno, libobasis6.2-writer, libobasis6.2-xsltfilter, libreoffice6.2-debian-menus +Depends: openjdk-11-jre-headless, libxinerama1, libdbus-glib-1-2, libcairomm-1.0-1v5, libcups2, libsm6, libreoffice6.2-base, libreoffice6.2-calc, libreoffice6.2-dict-en, libreoffice6.2-dict-es, libreoffice6.2-dict-fr, libreoffice6.2-draw, libreoffice6.2-en-us, libreoffice6.2-impress, libreoffice6.2-math, vitam-user-vitam, libobasis6.2-base, libobasis6.2-calc, libobasis6.2-core, libobasis6.2-draw, libobasis6.2-en-us, libobasis6.2-extension-beanshell-script-provider, libobasis6.2-extension-javascript-script-provider, libobasis6.2-extension-mediawiki-publisher, libobasis6.2-extension-nlpsolver, libobasis6.2-extension-pdf-import, libobasis6.2-extension-report-builder, libobasis6.2-firebird, libobasis6.2-gnome-integration, libobasis6.2-graphicfilter, libobasis6.2-images, libobasis6.2-impress, libobasis6.2-kde-integration, libobasis6.2-librelogo, libobasis6.2-libreofficekit-data, libobasis6.2-math, libobasis6.2-ogltrans, libobasis6.2-onlineupdate, libobasis6.2-ooofonts, libobasis6.2-ooolinguistic, libobasis6.2-postgresql-sdbc, libobasis6.2-python-script-provider, libobasis6.2-pyuno, libobasis6.2-writer, libobasis6.2-xsltfilter, libreoffice6.2-debian-menus Maintainer: Vitam Package Team Description: [[description]] \ No newline at end of file diff --git a/odfvalidator/pom.xml b/odfvalidator/pom.xml index bf493fe..93e0910 100755 --- a/odfvalidator/pom.xml +++ b/odfvalidator/pom.xml @@ -127,7 +127,7 @@ false - ${java.version} + ${jdk.version.rpm} vitam-user-${unix.user} diff --git a/odfvalidator/src/deb/control/control b/odfvalidator/src/deb/control/control index 4ffacbf..2456bc9 100755 --- a/odfvalidator/src/deb/control/control +++ b/odfvalidator/src/deb/control/control @@ -3,6 +3,6 @@ Version: [[version]] Section: Application/Archiving Priority: low Architecture: all -Depends: openjdk-8-jre-headless, vitam-user-vitam +Depends: openjdk-11-jre-headless, vitam-user-vitam Maintainer: Vitam Package Team Description: [[description]] \ No newline at end of file diff --git a/pom.xml b/pom.xml index 993b9a7..cfae495 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,10 @@ UTF-8 1.8 - java-1.8.0 + 11 + + java-11-openjdk-headless + openjdk-11-jre-headless 2.9.9 1.7.25 4.12 diff --git a/siegfried/pom.xml b/siegfried/pom.xml index 5b23bd7..56e8b21 100755 --- a/siegfried/pom.xml +++ b/siegfried/pom.xml @@ -115,7 +115,7 @@ false - ${java.version} + ${jdk.version.rpm} vitam-user-${unix.user} vitam-siegfried diff --git a/siegfried/src/deb/control/control b/siegfried/src/deb/control/control index 5cbad07..da26ea3 100755 --- a/siegfried/src/deb/control/control +++ b/siegfried/src/deb/control/control @@ -3,6 +3,6 @@ Version: [[version]] Section: Application/Archiving Priority: low Architecture: all -Depends: openjdk-8-jre-headless, vitam-user-vitam, vitam-siegfried +Depends: openjdk-11-jre-headless, vitam-user-vitam, vitam-siegfried Maintainer: Vitam Package Team Description: [[description]] \ No newline at end of file diff --git a/tesseract/pom.xml b/tesseract/pom.xml index 4b54ea0..7bcbf5f 100755 --- a/tesseract/pom.xml +++ b/tesseract/pom.xml @@ -103,7 +103,7 @@ false - ${java.version} + ${jdk.version.rpm} vitam-user-${unix.user} tesseract diff --git a/tesseract/src/deb/control/control b/tesseract/src/deb/control/control index 3fffa79..d030fda 100755 --- a/tesseract/src/deb/control/control +++ b/tesseract/src/deb/control/control @@ -3,6 +3,6 @@ Version: [[version]] Section: Application/Archiving Priority: low Architecture: all -Depends: openjdk-8-jre-headless, vitam-user-vitam, tesseract-ocr +Depends: openjdk-11-jre-headless, vitam-user-vitam, tesseract-ocr Maintainer: Vitam Package Team Description: [[description]] \ No newline at end of file diff --git a/verapdf/pom.xml b/verapdf/pom.xml index 887d79f..b453892 100755 --- a/verapdf/pom.xml +++ b/verapdf/pom.xml @@ -113,7 +113,7 @@ false - ${java.version} + ${jdk.version.rpm} vitam-user-${unix.user} diff --git a/verapdf/src/deb/control/control b/verapdf/src/deb/control/control index a9a4ee5..bb8baa0 100755 --- a/verapdf/src/deb/control/control +++ b/verapdf/src/deb/control/control @@ -3,6 +3,6 @@ Version: [[version]] Section: Application/Archiving Priority: low Architecture: all -Depends: openjdk-8-jre-headless, vitam-user-vitam +Depends: openjdk-11-jre-headless, vitam-user-vitam Maintainer: Vitam Package Team Description: [[description]] \ No newline at end of file From 549610c9053479f26653c370b794f5d3ce55fa52 Mon Sep 17 00:00:00 2001 From: Olivier MARSOL Date: Fri, 21 Feb 2020 10:45:03 +0100 Subject: [PATCH 2/7] Using java11-based executor --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b23ab04..593908d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ pipeline { agent { - label 'griffins' + label 'griffins-11' } environment { From e737ba0cf80dcd4398fc59ee8609f7a499448b74 Mon Sep 17 00:00:00 2001 From: Olivier MARSOL Date: Fri, 21 Feb 2020 10:54:12 +0100 Subject: [PATCH 3/7] fix correct label --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 593908d..98d848a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ pipeline { agent { - label 'griffins-11' + label 'griffins11' } environment { From 58227be0efacbede28bf047cccc633e74bc96b74 Mon Sep 17 00:00:00 2001 From: Olivier MARSOL Date: Fri, 21 Feb 2020 11:32:34 +0100 Subject: [PATCH 4/7] force compile in java11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cfae495..fda0c9e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ UTF-8 - 1.8 + 11 11 java-11-openjdk-headless From 22660d6697713449d542193b1d9d2ad522134865 Mon Sep 17 00:00:00 2001 From: Olivier MARSOL Date: Fri, 21 Feb 2020 11:35:59 +0100 Subject: [PATCH 5/7] By the way, upgrade some maven plugins --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fda0c9e..d8700aa 100644 --- a/pom.xml +++ b/pom.xml @@ -34,8 +34,8 @@ 3.11.1 2.23.4 1.1.1 - 3.5.1 - 3.1.0 + 3.8.1 + 3.2.0 3.1.0 1.6.0 3.1.1 From 5158eca1e46e94fb8bfb9dfdf68ccb9a7e817390 Mon Sep 17 00:00:00 2001 From: Jbbouille Date: Fri, 28 Feb 2020 10:40:03 +0100 Subject: [PATCH 6/7] Fix get ressource in tests. --- .../src/test/java/fr/gouv/vitam/griffins/ffmpeg/MainTest.java | 2 +- .../java/fr/gouv/vitam/griffins/imagemagick/MainTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ffmpeg/src/test/java/fr/gouv/vitam/griffins/ffmpeg/MainTest.java b/ffmpeg/src/test/java/fr/gouv/vitam/griffins/ffmpeg/MainTest.java index 725c808..9d60e00 100644 --- a/ffmpeg/src/test/java/fr/gouv/vitam/griffins/ffmpeg/MainTest.java +++ b/ffmpeg/src/test/java/fr/gouv/vitam/griffins/ffmpeg/MainTest.java @@ -128,7 +128,7 @@ private Parameters generateBatch(Action action, Input input) throws Exception { Path batchFolder = tmpGriffinFolder.newFolder(ID, batchName).toPath(); String inputFilesFolder = tmpGriffinFolder.newFolder(ID, batchName, inputFilesDirName).toString(); - Path src = new File(Object.class.getResource(String.format("/%s/batch-reference/%s/%s", ID, inputFilesDirName, input.getName())).toURI()) + Path src = new File(Main.class.getResource(String.format("/%s/batch-reference/%s/%s", ID, inputFilesDirName, input.getName())).toURI()) .toPath(); Path target = Paths.get(inputFilesFolder, input.getName()); Files.copy(src, target, REPLACE_EXISTING); diff --git a/imagemagick/src/test/java/fr/gouv/vitam/griffins/imagemagick/MainTest.java b/imagemagick/src/test/java/fr/gouv/vitam/griffins/imagemagick/MainTest.java index 2fc727a..876297f 100644 --- a/imagemagick/src/test/java/fr/gouv/vitam/griffins/imagemagick/MainTest.java +++ b/imagemagick/src/test/java/fr/gouv/vitam/griffins/imagemagick/MainTest.java @@ -313,7 +313,7 @@ private Parameters generateBatch(Action action, Input input) throws Exception { Path batchFolder = tmpGriffinFolder.newFolder(ID, batchName).toPath(); String inputFilesFolder = tmpGriffinFolder.newFolder(ID, batchName, inputFilesDirName).toString(); - Path src = new File(Object.class.getResource(String.format("/%s/batch-reference/%s/%s", ID, inputFilesDirName, input.getName())).toURI()) + Path src = new File(Main.class.getResource(String.format("/%s/batch-reference/%s/%s", ID, inputFilesDirName, input.getName())).toURI()) .toPath(); Path target = Paths.get(inputFilesFolder, input.getName()); Files.copy(src, target, REPLACE_EXISTING); @@ -340,7 +340,7 @@ private Parameters generateBatch(Action action, Input input) throws Exception { public void should_recursive_parse_json_struct() throws Exception { // Given BatchProcessor for_test = new BatchProcessor(Paths.get("for test")); - InputStream resourceAsStream = getClass().getResourceAsStream("/vitam-imagemagick-griffin/batch-reference/imagemagick_output.json"); + InputStream resourceAsStream = Main.class.getResourceAsStream("/vitam-imagemagick-griffin/batch-reference/imagemagick_output.json"); // When ArrayNode metadata = (ArrayNode) this.mapper.readTree(resourceAsStream); Iterator> image = metadata.get(0).get("image").fields(); From 50c7a9997c93b8efc3f7389d6466f45c2258a202 Mon Sep 17 00:00:00 2001 From: Jbbouille Date: Fri, 28 Feb 2020 14:47:59 +0100 Subject: [PATCH 7/7] Increase veraPDF version. --- verapdf/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/verapdf/pom.xml b/verapdf/pom.xml index b453892..f6df1a0 100755 --- a/verapdf/pom.xml +++ b/verapdf/pom.xml @@ -14,7 +14,7 @@ Vitam griffin verapdf verapdf-griffin - 1.12.1 + 1.14.105