Skip to content

Commit

Permalink
First fix for Issue #41 and #42 of Vitam
Browse files Browse the repository at this point in the history
This version of Waarp-Vitam is compatible with Vitam 2.15.3 and 3.0.2.

This is a short fix for Change Behavior from Vitam client side. It should
not get any issue for Waarp-Vitam users but we follow this issue with Vitam
Team.

See ProgrammeVitam/vitam#41
and ProgrammeVitam/vitam#42

Note that this module is compiled against Java 8, thus allowing anyone
to use it with Java 8, 9, 10, 11 and follow, so with Vitam 2.15 and Vitam 3.0.

Vitam jar are not include in the all dependencies jar anymore to counter-act
the Java 11 issue from Vitam side, letting final users to choose between
Java 8 and above and V2 of Vitam OR Java 11 and above and V3 of Vitam.

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: Those jars are included by default, even if Vitam V3 does not need them (no issue).*
 * 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
  • Loading branch information
fredericBregier committed Jul 4, 2020
1 parent a5ab587 commit ce974d0
Show file tree
Hide file tree
Showing 6 changed files with 965 additions and 542 deletions.
32 changes: 31 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down
44 changes: 44 additions & 0 deletions maven-version-rules.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ This file is part of Waarp Project (named also Waarp or GG).
~
~ Copyright (c) 2019, Waarp SAS, and individual contributors by the @author
~ tags. See the COPYRIGHT.txt in the distribution for a full listing of
~ individual contributors.
~
~ All Waarp Project is free software: you can redistribute it and/or
~ modify it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Waarp is distributed in the hope that it will be useful, but WITHOUT ANY
~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
~ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License along with
~ Waarp . If not, see <http://www.gnu.org/licenses/>.
-->

<ruleset xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
comparisonMethod="maven"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<ignoreVersions>
<!-- Ignore Alpha's, Beta's, release candidates and milestones -->
<ignoreVersion type="regex">(?i).*Alpha(?:-?\d+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*Beta(?:-?\d+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*-B(?:-?\d+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*RC(?:-?\d+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*CR(?:-?\d+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*M(?:-?\d+)?</ignoreVersion>
</ignoreVersions>
<rules>
<rule groupId="dom4j" artifactId="dom4j">
<ignoreVersions>
<ignoreVersion type="exact">20040902.021138</ignoreVersion>
<ignoreVersion type="exact">1.6.1-jboss</ignoreVersion>
<ignoreVersion type="exact">1.6.1-brew</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleset>
Loading

0 comments on commit ce974d0

Please sign in to comment.