From ee337296eeb1adbe4faf21e295d55757767009bf Mon Sep 17 00:00:00 2001
From: Jens Kristian Villadsen <46567685+jvitrifork@users.noreply.github.com>
Date: Mon, 21 Sep 2020 19:19:10 +0200
Subject: [PATCH] =?UTF-8?q?Renamed=20deployable=20war=20to=20ROOT=20in=20o?=
 =?UTF-8?q?rder=20to=20homogenize=20urls=20regardless=E2=80=A6=20(#141)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Renamed deployable war to ROOT in order to homogenize urls regardless of deployment method

* Made Maven quite when doing downloading dependencies
---
 Dockerfile                          |  4 ++--
 README.md                           |  4 ++--
 pom.xml                             | 16 ++++++++--------
 src/main/resources/application.yaml |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6ae7213e815..a6699d50cc8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,12 +2,12 @@ FROM maven:3.6.3-jdk-11-slim as build-hapi
 WORKDIR /tmp/hapi-fhir-jpaserver-starter
 
 COPY pom.xml .
-RUN mvn dependency:go-offline
+RUN mvn -ntp dependency:go-offline
 
 COPY src/ /tmp/hapi-fhir-jpaserver-starter/src/
 RUN mvn clean install -DskipTests
 
-FROM tomcat:9.0.37-jdk11-openjdk-slim-buster
+FROM tomcat:9.0.38-jdk11-openjdk-slim-buster
 
 RUN mkdir -p /data/hapi/lucenefiles && chmod 775 /data/hapi/lucenefiles
 COPY --from=build-hapi /tmp/hapi-fhir-jpaserver-starter/target/*.war /usr/local/tomcat/webapps/
diff --git a/README.md b/README.md
index 8a39fbaeab7..b9b2acac873 100644
--- a/README.md
+++ b/README.md
@@ -135,14 +135,14 @@ Server will then be accessible at http://localhost:8080/ and eg. http://localhos
 ```bash
 ./build-docker-image.sh && docker run -p 8080:8080 -e "spring.batch.job.enabled=false" hapi-fhir/hapi-fhir-jpaserver-starter:latest
 ```
-Server will then be accessible at http://localhost:8080/hapi-fhir-jpaserver and eg. http://localhost:8080/hapi-fhir-jpaserver/fhir/metadata. Remember to adjust you overlay configuration in the application.yaml to eg.
+Server will then be accessible at http://localhost:8080/ and eg. http://localhost:8080/fhir/metadata. Remember to adjust you overlay configuration in the application.yaml to eg.
 
 ```yaml
     tester:
       -
           id: home
           name: Local Tester
-          server_address: 'http://localhost:8080/hapi-fhir-jpaserver/fhir'
+          server_address: 'http://localhost:8080/fhir'
           refuse_to_fetch_third_party_urls: false
           fhir_version: R4
 ```
diff --git a/pom.xml b/pom.xml
index 0e66d1c8208..e17c0cc3cee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,11 +21,11 @@
 
     <properties>
         <java.version>8</java.version>
-        <spring.boot>2.3.3.RELEASE</spring.boot>
+        <spring_boot_version>2.3.4.RELEASE</spring_boot_version>
     </properties>
 
     <prerequisites>
-        <maven>3.6.0</maven>
+        <maven>3.6.3</maven>
     </prerequisites>
 
     <packaging>war</packaging>
@@ -269,7 +269,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
-            <version>${spring.boot}</version>
+            <version>${spring_boot_version}</version>
         </dependency>
 
 
@@ -289,7 +289,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring.boot}</version>
+            <version>${spring_boot_version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -298,8 +298,8 @@
 
     <build>
 
-        <!-- Tells Maven to name the generated WAR file as hapi-fhir-jpaserver.war -->
-        <finalName>hapi-fhir-jpaserver</finalName>
+        <!-- Tells Maven to name the generated WAR file as ROOT.war -->
+        <finalName>ROOT</finalName>
 
         <plugins>
             <plugin>
@@ -495,7 +495,7 @@
                 <dependency>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-web</artifactId>
-                    <version>2.3.3.RELEASE</version>
+                    <version>${spring_boot_version}</version>
                 </dependency>
             </dependencies>
         </profile>
@@ -508,7 +508,7 @@
                 <dependency>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-web</artifactId>
-                    <version>2.3.3.RELEASE</version>
+                    <version>${spring_boot_version}</version>
                     <exclusions>
                         <exclusion>
                             <groupId>org.springframework.boot</groupId>
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 7a916838f02..96bb06261b6 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -86,7 +86,7 @@ hapi:
       -
           id: home
           name: Local Tester
-          server_address: 'http://localhost:8080/hapi-fhir-jpaserver/fhir'
+          server_address: 'http://localhost:8080/fhir'
           refuse_to_fetch_third_party_urls: false
           fhir_version: R4
       -