diff --git a/README.md b/README.md index bb89d5e..826976d 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,37 @@ 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. +However we work with Vitam team to get a Waarp version available for both versions 2 and 3. Note that the "all jar" versions does not include any more the Vitam jar, in order to allow you to use either v2.15.3 or v3.0.1 and following versions. + +You therefore need to ass the following jars with the Waarp-Vitam library: + +**Common Jar for both V2 and V3 versions of Vitam** + +*Vitam jars:* + * fr.gouv.vitam:ingest-external-client + * fr.gouv.vitam:common-public-client + * fr.gouv.vitam:ingest-external-api + * fr.gouv.vitam:access-external-client + * fr.gouv.vitam:common-public + * fr.gouv.vitam:common-http-interface + * fr.gouv.vitam:access-external-api + * fr.gouv.vitam:common-database-public + +**Specific to V2 version of Vitam** + +*Vitam jars:* + * fr.gouv.vitam:access-external-common:jar:2.15.3 + * fr.gouv.vitam:logbook-common-client:jar:2.15.3 + * fr.gouv.vitam:logbook-common:jar:2.15.3 + +*Other jars:* + * com.github.fge:json-schema-validator:jar:2.2.6 + * com.googlecode.libphonenumber:libphonenumber:jar:6.2 + * com.github.fge:json-schema-core:jar:1.2.5 + * com.github.fge:uri-template:jar:0.9 + * org.mozilla:rhino:jar:1.7R4 + * javax.mail:mailapi:jar:1.4.3 + * net.sf.jopt-simple:jopt-simple:jar:4.6 diff --git a/maven-version-rules.xml b/maven-version-rules.xml new file mode 100644 index 0000000..56a2ba9 --- /dev/null +++ b/maven-version-rules.xml @@ -0,0 +1,44 @@ + + + + + + + (?i).*Alpha(?:-?\d+)? + (?i).*Beta(?:-?\d+)? + (?i).*-B(?:-?\d+)? + (?i).*RC(?:-?\d+)? + (?i).*CR(?:-?\d+)? + (?i).*M(?:-?\d+)? + + + + + 20040902.021138 + 1.6.1-jboss + 1.6.1-brew + + + + diff --git a/pom.xml b/pom.xml index d54e971..16cf1de 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,9 @@ Waarp Vitam Module 2019 - Waarp integration for Vitam, for Ingest (upload) of SIP and for export of DIP + Waarp integration for Vitam, for Ingest (upload) of SIP and for + export of DIP + Waarp http://www.waarp.fr @@ -175,6 +177,8 @@ false false 1.8 + 1.8 + 1.8 UTF-8 UTF-8 false @@ -182,23 +186,19 @@ jacoco - 0.8.4 - 3.6.1.1688 - src/main/java + UTF-8 + jacoco + 0.8.5 + 3.7.0.1746 src/test/java reuseReports java true - ${root.directory}/target/jacoco - jacoco-ut.exec - - ${jacoco.outputDir}/${jacoco.out.ut.file} - - - jacoco-it.exec - - ${jacoco.outputDir}/${jacoco.out.it.file} - + src/main/java + reuseReports + + ${root.directory}/target/site/jacoco/jacoco.xml,${root.directory}/target/site/jacoco-aggregate/jacoco.xml + file:**/test/java/**/*, file:**/generated-sources/**/*, @@ -208,6 +208,7 @@ **/src/test/**/* + ${root.directory}/target/classes target/surefire-reports @@ -220,75 +221,97 @@ test test - 3.3.2 - 1.0.2 + 3.4.0 + 1.0.3 ${waarp-vitam.version} - 3.0.1 + 3.0.2 + - 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.3.1 + 1.7.30 + 1.2.3 + 29.0-jre + 1.20 + 1.2.2 + 2.7 + 1.4 + 2.8.0 + 1.3 + 1.2 + 3.6 + 1.14 + 1.9.4 + 1.4 + 1.4.200 + 2.6.1 + 8.0.20 + 42.2.14 + 6 + 2.11.0 + 2.11.0 + 1.2.0 + 2.1.3 + 0.3.6 + 2.8.6 + 3.12.1.Final + 3.12.1.Final + 2.0.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 + 1.7.2 + 2.10.6 + 2.30.1 + 5.5.0 + 3.0.57 + 4.13 + 3.26.0-GA + 3.16.1 + 4.2 + 3.3.0 + 3.3.3 + 2.0.3 + 1.13.0 + 1.10.8 + 0.4.11 + 2.13.3 + 3.141.59 + 3.9.2 + 1.13 + 1.13 + 1.26 + 2.0.1.Final + 3.0.2 + 2.8.6 + 1.1.1 + 1.10.12 + 2.0.1.Final + 2.1.6 + + + 2.2.14 + 1.2.14 + 0.9 + 8.12.6 + 1.7.12 + 1.4.3 + 5.0.4 2.1.5 @@ -297,15 +320,15 @@ 3.0.0-M3 3.1.0 3.8.1 - 2.8.2 + 3.0.0-M1 3.1.0 - 3.1.0 - 3.1.1 - 3.7.1 - 3.1.1 - 3.1.1 + 3.2.1 + 3.1.2 + 3.9.0 + 3.3.0 + 3.2.0 1.6.0 - 5.2.1 + 5.3.2 3.0.0 3.0.0 @@ -313,25 +336,25 @@ 2.3 2.4 3.0.5 - 3.12.0 - 3.1.2 + 3.13.0 + 3.2.0 1.8 1.0b3 - 3.0.0 + 3.1.0 - 1.16 + 2.0.0 3.0.0-M2 2.7 1.18 - 1.10.6 + 1.10.8 1.3.4 - 3.2.1 + 3.2.3 1.3 2.7 - 1.1.0 - 3.1.12.2 + 1.2.2 + 4.0.0 1.8 2.2.0 r66 @@ -503,24 +526,13 @@ org.jacoco jacoco-maven-plugin ${jacoco-maven-plugin.version} - - true - - com.gargoylesoftware.* - - - pre-unit-test + prepare-agent + initialize prepare-agent - - true - ${sonar.jacoco.reportPaths} - file - - post-unit-test @@ -534,12 +546,6 @@ prepare-agent-integration - - true - ${sonar.jacoco.itReportPath} - file - - post-integration-test @@ -547,53 +553,12 @@ report-integration - - merge-results - verify - - merge - - - - - ${jacoco.outputDir} - - *.exec - - - aggregate.exec - - - - ${jacoco.outputDir}/aggregate.exec - - report-aggregate - prepare-package report-aggregate - - - ${jacoco.outputDir}/aggregate.exec - - - ${jacoco.outputDir}/jacoco-aggregate - - - - - post-merge-report verify - - report - - - ${jacoco.outputDir}/aggregate.exec - ${jacoco.outputDir}/jacoco-aggregate - - @@ -676,6 +641,7 @@ org.apache.ant Oracle com.oracle.jdbc + fr.gouv.vitam @@ -690,7 +656,8 @@ org.vafer ${jdeb.vafer.version} - ${project.build.directory}/waarp-vitam-${project.version}.deb + ${project.build.directory}/waarp-vitam-${project.version}.deb + true false ${project.build.directory}/control @@ -698,7 +665,9 @@ - ${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar + + ${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar + file perm @@ -763,7 +732,9 @@ - ${package.dir}/conf/${unix.name}/systemd/system/waarp-vitam-dip.service + + ${package.dir}/conf/${unix.name}/systemd/system/waarp-vitam-dip.service + file perm @@ -774,7 +745,9 @@ - ${package.dir}/conf/${unix.name}/systemd/system/waarp-vitam-ingest.service + + ${package.dir}/conf/${unix.name}/systemd/system/waarp-vitam-ingest.service + file perm @@ -785,7 +758,9 @@ - ${package.dir}/conf/${unix.name}/systemd/system/waarp-vitam-r66.service + + ${package.dir}/conf/${unix.name}/systemd/system/waarp-vitam-r66.service + file perm @@ -891,7 +866,8 @@ false - ${package.dir}/conf/${unix.name}/systemd/system + ${package.dir}/conf/${unix.name}/systemd/system + @@ -950,6 +926,7 @@ false false false + false @@ -972,6 +949,18 @@ maven-enforcer-plugin ${maven-enforcer-plugin.version} + + + org.codehaus.mojo + extra-enforcer-rules + 1.3 + + + org.codehaus.mojo + animal-sniffer-enforcer-rule + 1.18 + + enforce-tools @@ -986,7 +975,7 @@ [1.8.0,) - [2.2.1,),[3.2,) + [3.5.4,) @@ -1003,6 +992,23 @@ enforce + + enforce-bytecode-version + + enforce + + + + + 1.8 + + fr.gouv.vitam + + + + true + + @@ -1016,7 +1022,7 @@ ${java.version} 1.8 1.8 - + 11 true true true @@ -1034,9 +1040,10 @@ 2048m + + org.codehaus.mojo animal-sniffer-maven-plugin ${animal-sniffer-maven-plugin.version} @@ -1059,7 +1066,7 @@ - + --> maven-source-plugin ${maven.source.version} @@ -1128,7 +1135,7 @@ com.github.spotbugs spotbugs - 4.0.0-beta3 + 4.0.6 org.beiter.michael.util @@ -1203,7 +1210,8 @@ copy-resources - ${project.build.directory}/control + ${project.build.directory}/control + true @@ -1260,7 +1268,8 @@ username="${unix.user}" group="${unix.group}" fullpath="/waarp/lib/${unix.name}/${project.build.finalName}-jar-with-dependencies.jar" preserveLeadingSlashes="true"> - + - + @@ -1336,7 +1346,7 @@ true org.apache.maven.plugins maven-deploy-plugin - 3.0.0-M1 + ${maven.deploy.version} true @@ -1354,6 +1364,7 @@ dependency-check-maven ${maven.dependencycheck.version} + false true true true @@ -1401,6 +1412,7 @@ true true + false @@ -1548,12 +1560,6 @@ false - org.jboss.apiviz.APIviz - - com.grahamedgecombe.apiviz - apiviz - ${apiviz.version} - true UTF-8 UTF-8 @@ -1566,14 +1572,13 @@ ${project.name} ${project.version} - - - api_1.6 - http://docs.oracle.com/javaee/6/api/ - - + false + 1.8 + + http://docs.oracle.com/javase/8/docs/api/ + - http://docs.oracle.com/javaee/6/api/ + http://docs.oracle.com/javase/8/docs/api http://www.slf4j.org/apidocs/ UTF-8 @@ -1626,13 +1631,13 @@ - - Waarp - Waarp-All-Jdk8 - ${waarp.version} - pom - import - + + Waarp + Waarp-All-Jdk8 + ${waarp.version} + pom + import + io.netty @@ -1660,6 +1665,10 @@ xml-apis xml-apis + + commons-pool + commons-pool + @@ -1693,50 +1702,90 @@ + + Waarp + WaarpExec + ${waarp.version} + + + Waarp + WaarpFtpClient + ${waarp.version} + + + Waarp + WaarpGatewayKernel + ${waarp.version} + + + Waarp + WaarpHttp + ${waarp.version} + + + Waarp + WaarpIcap + ${waarp.version} + + + Waarp + WaarpPassword + ${waarp.version} + + + Waarp + WaarpSnmp + ${waarp.version} + + + Waarp + WaarpThrift + ${waarp.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 - + + + 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} - + + + commons-dbcp + commons-dbcp + ${commons.dbcp.version} + + + org.apache.commons + commons-pool2 + ${commons.pool.version} + @@ -1761,6 +1810,66 @@ ${vitam.version} + + fr.gouv.vitam + common-public + ${vitam.version} + + + com.google.guava + guava + + + org.jboss.resteasy + resteasy-jackson2-provider + + + org.jboss.resteasy + resteasy-client + + + + + fr.gouv.vitam + common-database-public + ${vitam.version} + + + com.google.guava + guava + + + + + fr.gouv.vitam + common-public-client + ${vitam.version} + + + com.google.guava + guava + + + org.jboss.resteasy + resteasy-client + + + org.jboss.resteasy + resteasy-jaxrs + + + + + fr.gouv.vitam + ingest-external-api + ${vitam.version} + + + com.google.guava + guava + + + fr.gouv.vitam @@ -1790,6 +1899,10 @@ org.apache.commons commons-compress + + org.jboss.resteasy + resteasy-jaxrs + ${vitam.version} test @@ -1836,6 +1949,18 @@ org.elasticsearch metrics-elasticsearch-reporter + + commons-beanutils + commons-beanutils + + + com.github.fge + json-schema-validator + + + org.slf4j + slf4j-api + @@ -1868,115 +1993,115 @@ 1.4.01 test - - - 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.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.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.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.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 @@ -1985,198 +2110,204 @@ com.github.fge json-patch - 1.9 + ${json-patch.version} org.apache.xmlgraphics batik-css - 1.8 + ${batik-css.version} org.yaml snakeyaml - 1.23 + ${snakeyaml.version} javax.validation validation-api - 2.0.1.Final - - - 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 - + ${validation-api.version} + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + org.apache.httpcomponents + httpcore + ${httpcore.version} + + + joda-time + joda-time + ${joda-time.version} + + + com.google.code.findbugs + jsr305 + ${jsr305.version} + com.google.code.gson gson - 2.5 + ${gson.version} javax.activation activation - 1.1.1 + ${activation.version} + + + org.dom4j + dom4j + ${dom4j.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} - + + + 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} - - + + 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} - + + 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} + @@ -2208,7 +2339,7 @@ net.bytebuddy byte-buddy - 1.9.10 + ${byte-buddy.version} test @@ -2237,10 +2368,10 @@ test - org.apache.httpcomponents - httpcore-nio - 4.4.12 - test + org.apache.httpcomponents + httpcore-nio + ${httpcore.version} + test @@ -2254,12 +2385,28 @@ fr.gouv.vitam access-external-client - - org.slf4j - slf4j-api - + + org.slf4j + slf4j-api + + + fr.gouv.vitam + common-public + + + fr.gouv.vitam + common-database-public + + + fr.gouv.vitam + common-public-client + + + fr.gouv.vitam + ingest-external-api + commons-cli commons-cli @@ -2268,16 +2415,121 @@ Waarp WaarpR66 - - org.slf4j - slf4j-api - + + org.slf4j + slf4j-api + + + Waarp + WaarpCommon + + + Waarp + WaarpDigest + + + Waarp + WaarpExec + + + Waarp + WaarpFtpClient + + + Waarp + WaarpGatewayKernel + + + Waarp + WaarpHttp + + + Waarp + WaarpIcap + + + Waarp + WaarpPassword + + + Waarp + WaarpSnmp + + + Waarp + WaarpThrift + + + io.netty + netty-all + + + com.google.guava + guava + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-databind + org.apache.commons commons-exec + + org.slf4j + slf4j-api + + + commons-io + commons-io + + + + org.jboss.resteasy + resteasy-jaxrs + ${resteasy.jaxrs.version} + + + org.jboss.resteasy + resteasy-client + ${resteasy.client.version} + + + org.jboss.resteasy + resteasy-jackson2-provider + ${resteasy.client.version} + + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.rs.version} + + + commons-beanutils + commons-beanutils + ${commons-beanutils.version} + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + ${jboss-jaxrs-api_2.1_spec.version} + + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-api.version} + + junit @@ -2305,14 +2557,14 @@ ingest-external-rest test - - com.google.errorprone - error_prone_annotations - - - org.slf4j - slf4j-api - + + com.google.errorprone + error_prone_annotations + + + org.slf4j + slf4j-api + @@ -2329,12 +2581,6 @@ fr.gouv.vitam common-private test - - - org.slf4j - slf4j-api - - fr.gouv.vitam @@ -2354,16 +2600,64 @@ ${waarp.version} test - - org.slf4j - slf4j-api - + + org.slf4j + slf4j-api + + + + + + com.github.fge + json-schema-validator + ${json-schema-validator.version} + + + com.googlecode.libphonenumber + libphonenumber + + + org.mozilla + rhino + - - org.slf4j - slf4j-api - + + com.github.fge + json-schema-core + ${json-schema-core.version} + + + org.mozilla + rhino + + + + + com.github.fge + uri-template + ${uri-template.version} + + + com.googlecode.libphonenumber + libphonenumber + ${libphonenumber.version} + + + org.mozilla + rhino + ${rhino.version} + + + javax.mail + mailapi + ${mailapi.version} + + + net.sf.jopt-simple + jopt-simple + ${jopt-simple.version} + \ No newline at end of file diff --git a/src/main/java/org/waarp/vitam/dip/DipManager.java b/src/main/java/org/waarp/vitam/dip/DipManager.java index 1770374..9e2b602 100644 --- a/src/main/java/org/waarp/vitam/dip/DipManager.java +++ b/src/main/java/org/waarp/vitam/dip/DipManager.java @@ -276,7 +276,10 @@ int select(final DipRequestFactory dipRequestFactory, logger.error(ISSUE_SINCE_SELECT_PRODUCES_AN_ERROR, e); // Should retry select from the beginning try { - dipRequest.setStep(DIPStep.RETRY_SELECT, 0, dipRequestFactory); + // FIXME this does not take into account various cases since Vitam masks the real reason + dipRequest.setStep(DIPStep.ERROR, 500, dipRequestFactory); + // Will inform back of error which could not be fixed when reloaded + // Ignore: dipRequest.setStep(DIPStep.RETRY_SELECT, 0, dipRequestFactory); } catch (InvalidParseOperationException ex) { // very bad logger.error("FATAL: Very bad since cannot save DipRequest", ex); diff --git a/src/main/java/org/waarp/vitam/ingest/IngestManager.java b/src/main/java/org/waarp/vitam/ingest/IngestManager.java index e605f4f..a792d99 100644 --- a/src/main/java/org/waarp/vitam/ingest/IngestManager.java +++ b/src/main/java/org/waarp/vitam/ingest/IngestManager.java @@ -540,6 +540,8 @@ boolean getStatusOfATR(final IngestRequestFactory ingestRequestFactory, } } catch (VitamClientException e) { logger.warn("Issue since ingest client produces an error", e); + // FIXME this does not take into account various cases since Vitam masks the real reason + ingestRequest.setStep(IngestStep.ERROR, 500, ingestRequestFactory); } finally { // Shall read all InputStream StreamUtils.consumeAnyEntityAndClose(response); diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml new file mode 100644 index 0000000..22a8c71 --- /dev/null +++ b/src/test/resources/logback-test.xml @@ -0,0 +1,41 @@ + + + + + /tmp/testJunit.log + true + + /tmp/testJunit.%d{yyyy-MM-dd}.%i.log + .zip + 30 + + 20MB + + + + + + %date{dd/MM/yyyy/HH:mm:ss.SSS} %level [%logger] [%thread] %msg%n + + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n + + + + + + + + + + + + + + + \ No newline at end of file