Fix #48 - version 2.0.1

ArchivesNationalesFR · Nov 16, 2023 · 3a53403 · 3a53403
1 parent 5d25ef7
commit 3a53403
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/ricoconverter/pom.xml b/ricoconverter/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>fr.gouv.culture.archives-nationales</groupId>
     <artifactId>ricoconverter-root-pom</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <packaging>pom</packaging>
 
     <name>EAC and EAC RiC-O Root POM</name>

diff --git a/ricoconverter/ricoconverter-cli/pom.xml b/ricoconverter/ricoconverter-cli/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>fr.gouv.culture.archives-nationales</groupId>
 		<artifactId>ricoconverter-root-pom</artifactId>
-	    <version>2.0.0</version>
+	    <version>2.0.1</version>
         <relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/ricoconverter/ricoconverter-convert/pom.xml b/ricoconverter/ricoconverter-convert/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>fr.gouv.culture.archives-nationales</groupId>
 		<artifactId>ricoconverter-root-pom</artifactId>
-	    <version>2.0.0</version>
+	    <version>2.0.1</version>
         <relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/ricoconverter/ricoconverter-convert/src/test/resources/eac2rico/_13entityType/expected.xml b/ricoconverter/ricoconverter-convert/src/test/resources/eac2rico/_13entityType/expected.xml
@@ -4,17 +4,17 @@
          xmlns:rico="https://www.ica.org/standards/RiC/ontology#"
          xmlns:dc="http://purl.org/dc/elements/1.1/">
    <rico:Record rdf:about="record/005205">
-   <rico:hasDocumentaryFormType rdf:resource="https://www.ica.org/standards/RiC/vocabularies/documentaryFormTypes#AuthorityRecord" />
-   <rico:describesOrDescribed rdf:resource="agent/005205"/>
-   <rico:hasInstantiation>
-      <rico:Instantiation rdf:about="instantiation/005205">
-         <rico:isInstantiationOf rdf:resource="record/005205"/>
-         <dc:format xml:lang="en">text/xml</dc:format>
-         <rico:identifier>FRAN_NP_005205</rico:identifier>
-         <rico:hasOrHadHolder rdf:resource="agent/005061"/>
-         <rdfs:seeAlso rdf:resource="https://www.siv.archives-nationales.culture.gouv.fr/siv/NP/FRAN_NP_005205"/> 
-      </rico:Instantiation>
-   </rico:hasInstantiation>
+      <rico:hasDocumentaryFormType rdf:resource="https://www.ica.org/standards/RiC/vocabularies/documentaryFormTypes#AuthorityRecord" />
+      <rico:describesOrDescribed rdf:resource="agent/005205"/>
+      <rico:hasInstantiation>
+         <rico:Instantiation rdf:about="instantiation/005205">
+            <rico:isInstantiationOf rdf:resource="record/005205"/>
+            <dc:format xml:lang="en">text/xml</dc:format>
+            <rico:identifier>FRAN_NP_005205</rico:identifier>
+            <rico:hasOrHadHolder rdf:resource="agent/005061"/>
+            <rdfs:seeAlso rdf:resource="https://www.siv.archives-nationales.culture.gouv.fr/siv/NP/FRAN_NP_005205"/> 
+         </rico:Instantiation>
+      </rico:hasInstantiation>
    </rico:Record>
    <rico:Agent rdf:about="agent/005205">
       <rdf:type rdf:resource="https://www.ica.org/standards/RiC/ontology#CorporateBody"/>

diff --git a/ricoconverter/ricoconverter-release/pom.xml b/ricoconverter/ricoconverter-release/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>fr.gouv.culture.archives-nationales</groupId>
         <artifactId>ricoconverter-root-pom</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/ricoconverter/ricoconverter-release/src/main/resources/ricoconverter.bat b/ricoconverter/ricoconverter-release/src/main/resources/ricoconverter.bat
@@ -1,7 +1,7 @@
 @echo off
 PATH %PATH%;%JAVA_HOME%\bin\
 
-ECHO :: Welcome to Ric-O Converter 2.0.0-beta ::
+ECHO :: Welcome to Ric-O Converter ${project.version} ::
 ECHO.
 
 REM Test if java is installed
@@ -33,7 +33,7 @@ if NOT !%parameterFile% == ! (
 	set parameterFileOption=@%parameterFile%
 )
 
-SET fullCommandLine=java -Xmx1200M -Xms1200M -jar ricoconverter-cli-2.0.0-beta-onejar.jar %command% %parameterFileOption%
+SET fullCommandLine=java -Xmx1200M -Xms1200M -jar ricoconverter-cli-${project.version}-onejar.jar %command% %parameterFileOption%
 ECHO %fullCommandLine%
 %fullCommandLine%
 pause