From a5ab58755abbded4d8d1ceaa92955cf8e198fb3e Mon Sep 17 00:00:00 2001 From: Frederic Bregier Date: Thu, 12 Mar 2020 11:10:51 +0100 Subject: [PATCH] v1.0.2 upgrade dependencies Note that only V2.X of Vitam are supported. V3 of Vitam has broken upgrade path: - Java 11 is mandatory (while a lot of Java 8 are still out there and that community is not moving as much to Java 11 due to performance and bug issues) In Waarp, we decide to stay on Java 8 compatibility path. Even Waarp itself is compatible with Java 6 for old platforms, but we did upgrade dependencies for Vitam up to Java 8 considering Vitam installation implies Java 8 at least. However Java 11 is not a good path right now. - V3 of Vitam clients have broken API usage compared to V2.X (API are the same but behaviors are not): Show stopper! We try to keep as much as possible compatibility in upgrade path. But here, even if we do not include Vitam Jars (preserving choice of Java 8 or Java 11), the result is that the same code using V2 is working while using V3 is no more working while no compilation error appears. Broken upgrade path on Vitam side. Therefore, Waarp-Vitam will not support Vitam V3 until one of the following: - Vitam correct the V3 version - Client ask to support excplicitely V3 of Vitam, implying 2 separate branch of the very same code, therefore more effort --- README.md | 10 + pom.xml | 544 +++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 448 insertions(+), 106 deletions(-) diff --git a/README.md b/README.md index a2c1988..bb89d5e 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,16 @@ several protocols and to enable dynamic pre or post action on transfer or other This project proposes an integration of Waarp and Vitam together. + +*Important notice* +------------------ +Vitam introduces a version V3 that has the following issues: + * Java 11 is now mandatory, despite the large usage of Java 8 out of there. This prevents a lot if final users or co-project as this one to follow easily the path taken by Vitam team. Java 11 is not yet quite a success, considering a huge number of Java projects still using Java 8 as the minimal requirement. + * Several issues were encountered in using Version 3 compares to Version 2.X (last being 2.15.3): while Java API are the same, the behaviors are not, those preventing an clean upgrade from V2 to V3. + +Therefore, except if V3 evolves in Java 8 and fixing those functional issues, or except if clients command to have a compatible version with V3 of Vitam, Waarp-Vitam will stay on V2 versions. + + Support ------- diff --git a/pom.xml b/pom.xml index 7af4290..d54e971 100644 --- a/pom.xml +++ b/pom.xml @@ -220,47 +220,75 @@ test test - 3.2.1 - 1.0.1 + 3.3.2 + 1.0.2 ${waarp-vitam.version} - 2.11.3 - 4.1.43.Final - 2.0.26.Final - 1.7.26 - 1.2.3 - 1.19 - 1.2.2 - 2.6 - 1.4 - 2.5.0 - 1.3 - 1.2 - 3.6 - 1.13 - 1.8.3 - 1.4 - 1.4.191 - 1.7.4 - 5.1.48 - 42.2.8.jre6 - 6 - 2.9.9 - 4.12 - 3.25.0-GA - 3.12.2 - 4.0.2 - 3.3.0 - 2.28.2 - 2.0.1 - 1.12.3 - 1.10.6 - 0.4.9 - 2.12.1 - 3.141.59 - 3.0.50 + 3.0.1 + + + 2.15.3 + 4.1.48.Final + 2.0.30.Final + 1.0.1 + 1.3.1 + 1.7.30 + 1.2.3 + 28.2-jre + 1.20 + 1.2.2 + 2.6 + 1.4 + 2.8.0 + 1.3 + 1.2 + 3.6 + 1.14 + 1.8.3 + 1.4 + 1.4.200 + 2.5.4 + 8.0.19 + 42.2.10 + 6 + 2.10.3 + 2.10.3 + 1.2.0 + 1.6.1 + 0.3.6 + 2.8.6 + 3.11.0.Final + 4.5.2.Final + 2.1.1 + 9.4.27.v20200227 + 2.6.3 + 0.13.0 + 4.5.12 + 4.4.13 + 4.0.1 + 1.7.2 + 2.10.5 + 2.30.1 + 5.5.0 + 3.0.54 + 4.13 + 3.26.0-GA + 3.15.0 + 4.2 + 3.3.0 + 2.28.2 + 2.0.3 + 1.13.0 + 1.10.7 + 0.4.9 + 2.12.1 + 3.141.59 + 3.9.2 2.1.5 @@ -955,7 +983,7 @@ - [1.7.0,) + [1.8.0,) [2.2.1,),[3.2,) @@ -988,6 +1016,7 @@ ${java.version} 1.8 1.8 + true true true @@ -1597,6 +1626,13 @@ + + Waarp + Waarp-All-Jdk8 + ${waarp.version} + pom + import + io.netty @@ -1657,11 +1693,50 @@ - - org.apache.commons - commons-exec - ${commons-exec.version} - + + + + com.h2database + h2 + ${h2.version} + true + + + org.mariadb.jdbc + mariadb-java-client + ${mariadb.version} + + + jna + net.java.dev.jna + + + true + + + mysql + mysql-connector-java + ${mysql.version} + true + + + org.postgresql + postgresql + ${postgresql.version} + true + + + + + commons-dbcp + commons-dbcp + ${commons.dbcp.version} + + + org.apache.commons + commons-pool2 + ${commons.pool.version} + @@ -1793,26 +1868,115 @@ 1.4.01 test - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - 2.9.9 - - - com.fasterxml.jackson.core - jackson-core - 2.9.9 - - - com.fasterxml.jackson.core - jackson-annotations - 2.9.9 - - - com.fasterxml.jackson.core - jackson-databind - 2.9.9.3 - + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-smile + ${jackson.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson.version} + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-smile-provider + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-smile + + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + + + + + com.fasterxml.jackson.module + jackson-module-afterburner + ${jackson.version} + com.github.fge jackson-coreutils @@ -1838,21 +2002,26 @@ validation-api 2.0.1.Final - - org.apache.httpcomponents - httpclient - 4.5.7 - - - joda-time - joda-time - 2.10.3 - - - org.slf4j - slf4j-api - 1.7.26 - + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + org.apache.httpcomponents + httpcore + ${httpcore.version} + + + joda-time + joda-time + ${joda-time.version} + + + com.google.code.findbugs + jsr305 + 3.0.0 + com.google.code.gson gson @@ -1863,32 +2032,151 @@ activation 1.1.1 - - commons-logging - commons-logging - 1.2 - - - commons-io - commons-io - 2.6 - - - com.google.code.findbugs - jsr305 - 3.0.0 - - - commons-codec - commons-codec - 1.11 - - - - commons-cli - commons-cli - ${commons-cli.version} - + + + + commons-daemon + commons-daemon + ${commons.daemon.version} + + + org.apache.commons + commons-exec + ${commons-exec.version} + + + commons-net + commons-net + ${commons-net.version} + ftp + + + commons-cli + commons-cli + ${commons-cli.version} + + + org.apache.commons + commons-compress + ${commons.compress.version} + + + commons-io + commons-io + ${commons.io.version} + + + commons-codec + commons-codec + ${commons-codec.version} + + + + com.google.guava + guava + ${guava.version} + + + + + ch.qos.logback + logback-core + ${logback.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + org.slf4j + slf4j-api + + + + + ch.qos.logback + logback-access + ${logback.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + log4j-over-slf4j + ${slf4j.version} + + + org.slf4j + slf4j-api + + + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + + + org.slf4j + slf4j-api + + + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + + + + org.slf4j + slf4j-api + + + + + + + com.flipkart.zjsonpatch + zjsonpatch + ${zjsonpatch.version} + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + + + org.apache.logging.log4j + log4j-api + ${log4j2.version} + + + org.apache.logging.log4j + log4j-to-slf4j + ${log4j2.version} + + + org.slf4j + slf4j-api + + + + + commons-logging + commons-logging + ${commons-logging.version} + @@ -1948,6 +2236,12 @@ ${selenium.version} test + + org.apache.httpcomponents + httpcore-nio + 4.4.12 + test + @@ -1959,6 +2253,12 @@ fr.gouv.vitam access-external-client + + + org.slf4j + slf4j-api + + commons-cli @@ -1967,6 +2267,12 @@ Waarp WaarpR66 + + + org.slf4j + slf4j-api + + org.apache.commons @@ -1998,6 +2304,16 @@ fr.gouv.vitam ingest-external-rest test + + + com.google.errorprone + error_prone_annotations + + + org.slf4j + slf4j-api + + fr.gouv.vitam @@ -2013,6 +2329,12 @@ fr.gouv.vitam common-private test + + + org.slf4j + slf4j-api + + fr.gouv.vitam @@ -2031,7 +2353,17 @@ test-jar ${waarp.version} test + + + org.slf4j + slf4j-api + + + + org.slf4j + slf4j-api + - + \ No newline at end of file