Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

issue #46 - fixed pom.xml format and default password for fhiruser #49

Merged
merged 1 commit into from
Sep 12, 2019
Merged

issue #46 - fixed pom.xml format and default password for fhiruser #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/pre-integration-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion fhir-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions fhir-install/src/main/resources/scripts/fhirSmokeTest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion fhir-persistence-jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
</dependency>
</dependencies>

</project>