From 640322dfcc20d78a8e443a6c6b7a638ce767bd29 Mon Sep 17 00:00:00 2001
From: nab <nabila-aazibou-el-gerrab@kereval.com>
Date: Tue, 19 Apr 2022 10:19:00 +0200
Subject: [PATCH] Update eHDSIGeneration.sh FOR DGSANTE & cdabasic version
---
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../adapters/ArchetypeInstantiatorMaven.java | 2 +-
.../src/main/resources/assemble-scripts/eHDSIGeneration.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/archetype/generated-validator/validator-archetype/src/main/resources/archetype-resources/pom.xml b/archetype/generated-validator/validator-archetype/src/main/resources/archetype-resources/pom.xml
index f53c3e6..f1c0952 100644
--- a/archetype/generated-validator/validator-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/generated-validator/validator-archetype/src/main/resources/archetype-resources/pom.xml
@@ -219,7 +219,7 @@
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>cdabasic-validator-jar</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ArchetypeInstantiatorMaven.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ArchetypeInstantiatorMaven.java
index 672e856..d4e14a1 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ArchetypeInstantiatorMaven.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ArchetypeInstantiatorMaven.java
@@ -22,7 +22,7 @@ public class ArchetypeInstantiatorMaven implements ArchetypeInstantiator {
private static org.slf4j.Logger log = LoggerFactory.getLogger(ArchetypeInstantiatorMaven.class);
//this is supposed to be the version of the packager artifact. It is for now used as artifact version. See what we will use
- private static final String gocVersion = "3.0.0";
+ private static final String gocVersion = "3.0.4-SNAPSHOT";
private static final String CD_COMMAND = "cd \"";
private static final String REPOSITORY = "https://gazelle.ihe.net/nexus/content/groups/public/";
diff --git a/hl7templates/hl7templates-packager-jar/src/main/resources/assemble-scripts/eHDSIGeneration.sh b/hl7templates/hl7templates-packager-jar/src/main/resources/assemble-scripts/eHDSIGeneration.sh
index d23e5b5..df06ab6 100755
--- a/hl7templates/hl7templates-packager-jar/src/main/resources/assemble-scripts/eHDSIGeneration.sh
+++ b/hl7templates/hl7templates-packager-jar/src/main/resources/assemble-scripts/eHDSIGeneration.sh
@@ -213,7 +213,7 @@ fi;
echo -e "${GREEN}your validator will be generated in: ${workspaceDir}/${folderName}${NC}"
######## GENERATION COMMAND ########
-$JAVA_HOME/bin/java -jar $jarPath -bbr $bbrPath -out "${workspaceDir}/${folderName}" -mvn $mavenPath -serviceName $validator -HL7TEMP_CDACONFFOLDERNAME cdaepsos
+$JAVA_HOME/bin/java -jar $jarPath -bbr $bbrPath -out "${workspaceDir}/${folderName}" -mvn $mavenPath -serviceName $validator -HL7TEMP_CDACONFFOLDERNAME cdaepsos -ignoreChoicesPredicates
####################################
#Replacing XSD
--
GitLab