Merge branch 'java11' into 'master'

Bump to java11 See merge request vitam/vitam-griffins!81
ProgrammeVitam · Feb 28, 2020 · 140a349 · 140a349
2 parents 6b8659b + 50c7a99
commit 140a349
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 24 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,6 +1,6 @@
 pipeline {
     agent {
-        label 'griffins'
+        label 'griffins11'
     }
 
     environment {

diff --git a/ffmpeg/pom.xml b/ffmpeg/pom.xml
@@ -101,7 +101,7 @@
                 <configuration>
                     <disabled>false</disabled>
                     <requires>
-                        <require>${java.version}</require>
+                        <require>${jdk.version.rpm}</require>
                         <require>ffmpeg</require>
                         <require>lame-libs</require>
                         <require>vitam-user-${unix.user}</require>

diff --git 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]]
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
@@ -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/pom.xml b/imagemagick/pom.xml
@@ -102,7 +102,7 @@
                 <configuration>
                     <disabled>false</disabled>
                     <requires>
-                        <require>${java.version}</require>
+                        <require>${jdk.version.rpm}</require>
                         <require>ImageMagick</require>
                         <require>vitam-user-${unix.user}</require>
                     </requires>

diff --git 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]]
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
@@ -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<Entry<String, JsonNode>> image = metadata.get(0).get("image").fields();

diff --git a/jhove/pom.xml b/jhove/pom.xml
@@ -137,7 +137,7 @@
                 <configuration>
                     <disabled>false</disabled>
                     <requires>
-                        <require>${java.version}</require>
+                        <require>${jdk.version.rpm}</require>
                         <require>vitam-user-${unix.user}</require>
                     </requires>
                     <mappings>

diff --git a/libreoffice/pom.xml b/libreoffice/pom.xml
@@ -108,7 +108,7 @@
                 <configuration>
                     <disabled>false</disabled>
                     <requires>
-                        <require>${java.version}</require>
+                        <require>${jdk.version.rpm}</require>
                         <require>vitam-user-${unix.user}</require>
                         <require>cups-libs</require>
                         <require>cairo</require>

diff --git 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]]
diff --git a/odfvalidator/pom.xml b/odfvalidator/pom.xml
@@ -127,7 +127,7 @@
                 <configuration>
                     <disabled>false</disabled>
                     <requires>
-                        <require>${java.version}</require>
+                        <require>${jdk.version.rpm}</require>
                         <require>vitam-user-${unix.user}</require>
                     </requires>
                     <mappings>

diff --git 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]]
diff --git a/pom.xml b/pom.xml
@@ -23,16 +23,19 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- common dependencies for all modules -->
-        <java.compile.version>1.8</java.compile.version>
-        <java.version>java-1.8.0</java.version>
+        <java.compile.version>11</java.compile.version>
+        <java.version>11</java.version>
+        <!-- JDK version -->
+        <jdk.version.rpm>java-11-openjdk-headless</jdk.version.rpm>
+        <jdk.version.debian>openjdk-11-jre-headless</jdk.version.debian>
         <jackson.version>2.9.9</jackson.version>
         <slf4j.version>1.7.25</slf4j.version>
         <junit.version>4.12</junit.version>
         <assertj.version>3.11.1</assertj.version>
         <mockito.version>2.23.4</mockito.version>
         <junit.params.version>1.1.1</junit.params.version>
-        <compiler.plugin.version>3.5.1</compiler.plugin.version>
-        <assembly.plugin.version>3.1.0</assembly.plugin.version>
+        <compiler.plugin.version>3.8.1</compiler.plugin.version>
+        <assembly.plugin.version>3.2.0</assembly.plugin.version>
         <maven.resources.version>3.1.0</maven.resources.version>
         <maven.exec.version>1.6.0</maven.exec.version>
         <maven.dependency.version>3.1.1</maven.dependency.version>

diff --git a/siegfried/pom.xml b/siegfried/pom.xml
@@ -115,7 +115,7 @@
                 <configuration>
                     <disabled>false</disabled>
                     <requires>
-                        <require>${java.version}</require>
+                        <require>${jdk.version.rpm}</require>
                         <require>vitam-user-${unix.user}</require>
                         <require>vitam-siegfried</require>
                     </requires>

diff --git 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]]
diff --git a/tesseract/pom.xml b/tesseract/pom.xml
@@ -103,7 +103,7 @@
                 <configuration>
                     <disabled>false</disabled>
                     <requires>
-                        <require>${java.version}</require>
+                        <require>${jdk.version.rpm}</require>
                         <require>vitam-user-${unix.user}</require>
                         <require>tesseract</require>
                     </requires>

diff --git 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]]
diff --git a/verapdf/pom.xml b/verapdf/pom.xml
@@ -14,7 +14,7 @@
     <name>Vitam griffin verapdf</name>
     <properties>
         <unix.name>verapdf-griffin</unix.name>
-        <verapdf.version>1.12.1</verapdf.version>
+        <verapdf.version>1.14.105</verapdf.version>
     </properties>
 
     <dependencies>
@@ -113,7 +113,7 @@
                 <configuration>
                     <disabled>false</disabled>
                     <requires>
-                        <require>${java.version}</require>
+                        <require>${jdk.version.rpm}</require>
                         <require>vitam-user-${unix.user}</require>
                     </requires>
                     <mappings>

diff --git 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]]