diff --git a/fhir-bulkimportexport-webapp/pom.xml b/fhir-bulkimportexport-webapp/pom.xml index 6afc0b4f4ff..9837188de9c 100644 --- a/fhir-bulkimportexport-webapp/pom.xml +++ b/fhir-bulkimportexport-webapp/pom.xml @@ -79,7 +79,7 @@ ${project.groupId} fhir-core - + ${project.groupId} diff --git a/fhir-config/src/test/resources/fhirConfig.json b/fhir-config/src/test/resources/fhirConfig.json index a8cef150524..c35b62f0a51 100644 --- a/fhir-config/src/test/resources/fhirConfig.json +++ b/fhir-config/src/test/resources/fhirConfig.json @@ -6,9 +6,6 @@ "truststoreLocation":"resources/security/fhirTruststore.jks", "truststorePassword":"change-password" }, - "validation":{ - "userDefinedSchematronEnabled":true - }, "virtualResources":{ "enabled":true, "allowableResourceTypes":[ diff --git a/fhir-server/liberty-config-tenants/config/tenant1/fhir-server-config.json b/fhir-server/liberty-config-tenants/config/tenant1/fhir-server-config.json index 3550f86ccaa..71be64889bf 100644 --- a/fhir-server/liberty-config-tenants/config/tenant1/fhir-server-config.json +++ b/fhir-server/liberty-config-tenants/config/tenant1/fhir-server-config.json @@ -1,9 +1,6 @@ { "__comment": "FHIR Server configuration for mythical tenant id 'tenant1'", "fhirServer": { - "core": { - "userDefinedSchematronEnabled": true - }, "searchParameterFilter": { "Observation": ["subject", "patient", diff --git a/fhir-server/liberty-config-tenants/config/tenant1/schematron/patient.sch b/fhir-server/liberty-config-tenants/config/tenant1/schematron/patient.sch deleted file mode 100644 index c373aa7a445..00000000000 --- a/fhir-server/liberty-config-tenants/config/tenant1/schematron/patient.sch +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - acme-sample-1: Patient must have a study ID specified. - - - diff --git a/fhir-server/liberty-config-tenants/config/tenant2/fhir-server-config.json b/fhir-server/liberty-config-tenants/config/tenant2/fhir-server-config.json deleted file mode 100644 index 44e043d5505..00000000000 --- a/fhir-server/liberty-config-tenants/config/tenant2/fhir-server-config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "__comment":"FHIR Server configuration for mythical tenant id 'tenant2'", - "fhirServer":{ - "core":{ - "userDefinedSchematronEnabled":false - } - } -} diff --git a/fhir-server/liberty-config-tenants/config/tenant2/schematron/.empty b/fhir-server/liberty-config-tenants/config/tenant2/schematron/.empty deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/fhir-server/liberty-config/config/default/fhir-server-config.json b/fhir-server/liberty-config/config/default/fhir-server-config.json index 20190f31b90..1074a3a78a2 100644 --- a/fhir-server/liberty-config/config/default/fhir-server-config.json +++ b/fhir-server/liberty-config/config/default/fhir-server-config.json @@ -4,7 +4,6 @@ "core": { "truststoreLocation": "resources/security/fhirTruststore.jks", "truststorePassword": "change-password", - "userDefinedSchematronEnabled": false, "tenantIdHeaderName": "X-FHIR-TENANT-ID", "datastoreIdHeaderName": "X-FHIR-DSID", "jsonParserLenient": false, diff --git a/fhir-server/liberty-config/config/default/schematron/.empty b/fhir-server/liberty-config/config/default/schematron/.empty deleted file mode 100644 index e69de29bb2d..00000000000