Merge pull request #49 from IBM/issue-46-ra

issue #46 - fixed pom.xml format and default password for fhiruser
LinuxForHealth · Sep 12, 2019 · d3c2011 · d3c2011
2 parents b36a6ce + a35a4e8
commit d3c2011
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/build/pre-integration-test.sh b/build/pre-integration-test.sh
@@ -72,7 +72,7 @@ tries=0
 status=0
 while [ $status -ne 200 -a $tries -lt ${MAX_TRIES} ]; do
     tries=$((tries + 1))
-    cmd="curl -k -o ${WORKSPACE}/metadata.json -I -w "%{http_code}" -u fhiruser:fhiruser $metadata_url"
+    cmd="curl -k -o ${WORKSPACE}/metadata.json -I -w "%{http_code}" -u fhiruser:change-password $metadata_url"
     echo "Executing[$tries]: $cmd"
     status=$($cmd)
     echo "Status code: $status"

diff --git a/fhir-client/pom.xml b/fhir-client/pom.xml
@@ -58,6 +58,6 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-         </dependency>
+        </dependency>
     </dependencies>
 </project>
diff --git a/fhir-install/src/main/resources/scripts/fhirSmokeTest.sh b/fhir-install/src/main/resources/scripts/fhirSmokeTest.sh
@@ -22,14 +22,14 @@ echo -n "Checking if server $SERVER_HOST is accessible on port $SERVER_PORT ...
 echo "OK!"
 
 TMP_DIR=$(mktemp -d)
-curl -k -u fhiruser:fhiruser https://$SERVER_HOST:$SERVER_PORT/fhir-server/api/v4/metadata > $TMP_DIR/meta.json 2> /dev/null
+curl -k -u fhiruser:change-password https://$SERVER_HOST:$SERVER_PORT/fhir-server/api/v4/metadata > $TMP_DIR/meta.json 2> /dev/null
 
 echo -n "Checking FHIR server signature... "
-[ $(cat $TMP_DIR/meta.json | grep '"description" : "IBM Watson Health FHIR Server version ' | wc -l) != "1" ] && echo "Error! Signature not found." && exit 4
+[ $(cat $TMP_DIR/meta.json | grep '"description":"IBM Watson Health FHIR Server version ' | wc -l) != "1" ] && echo "Error! Signature not found." && exit 4
 echo "OK!"
 
 echo -n "Checking FHIR API version... "
-[ $(cat $TMP_DIR/meta.json | grep '"fhirVersion" : "4.0.0 - R4"' | wc -l) != "1" ] && echo "Error! Wrong FHIR version or version absent." && exit 5
+[ $(cat $TMP_DIR/meta.json | grep '"fhirVersion":"4.0.0"' | wc -l) != "1" ] && echo "Error! Wrong FHIR version or version absent." && exit 5
 echo "OK!"
 
 echo

diff --git a/fhir-persistence-jdbc/pom.xml b/fhir-persistence-jdbc/pom.xml
@@ -104,7 +104,7 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-         </dependency>
+        </dependency>
     </dependencies>
 
 </project>