Personal-Twin/hapi-fhir-jpaserver-starter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
# Conflicts:
#	src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
#	src/main/resources/hapi.properties
#	src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
This commit is contained in:
Jessie James Cosare
2019-03-15 23:09:54 +08:00
parent 9fc210eb19
commit 6858c0d799
3 changed files with 1 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -111,12 +111,6 @@
</dependency>
<!-- Used for CORS support -->
<!--<dependency>-->
<!--<groupId>org.eclipse.jetty</groupId>-->
<!--<artifactId>jetty-servlets</artifactId>-->
<!--<version>9.4.12.v20180830</version>-->
<!--</dependency>-->
<!-- Spring Web is used to deploy the server to a web container. -->
<dependency>
<groupId>org.springframework</groupId>