Update eHDSIGeneration.sh FOR DGSANTE & cdabasic version

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>

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/";
 

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