From c0d66969edbfcef46967458d75bcac1dbba47490 Mon Sep 17 00:00:00 2001
From: Scott Kurz <skurz@us.ibm.com>
Date: Tue, 17 Sep 2019 13:56:13 -0400
Subject: [PATCH 1/2] fix IT to use empty ctx root

Signed-off-by: Scott Kurz <skurz@us.ibm.com>
---
 .../system/test/app/AppContainerConfig.java      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/test/java/org/eclipse/microprofile/system/test/app/AppContainerConfig.java b/src/test/java/org/eclipse/microprofile/system/test/app/AppContainerConfig.java
index 646aa70..4457c41 100644
--- a/src/test/java/org/eclipse/microprofile/system/test/app/AppContainerConfig.java
+++ b/src/test/java/org/eclipse/microprofile/system/test/app/AppContainerConfig.java
@@ -25,13 +25,13 @@
 
 public class AppContainerConfig implements SharedContainerConfiguration {
 
-	@Container
-	public static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>()
-					.withNetworkAliases("testpostgres")
-					.withDatabaseName("test")
-					.withExposedPorts(5432)
-					.withInitScript("init.sql");
-	
+    @Container
+    public static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>()
+                    .withNetworkAliases("testpostgres")
+                    .withDatabaseName("test")
+                    .withExposedPorts(5432)
+                    .withInitScript("init.sql");
+    
     @Container
     public static MicroProfileApplication app = new MicroProfileApplication()
                     .withEnv("POSTGRES_HOSTNAME", "testpostgres")
@@ -39,7 +39,7 @@ public class AppContainerConfig implements SharedContainerConfiguration {
                     .withEnv("boost_db_databaseName", "test")
                     .withEnv("boost_db_username", "test")
                     .withEnv("boost_db_password", "test")
-                    .withAppContextRoot("/myservice");
+                    .withAppContextRoot("");
     
     @Override
     public void startContainers() {

From c84614fff879878cbdfa744147a7d69fd6540e4d Mon Sep 17 00:00:00 2001
From: Scott Kurz <skurz@us.ibm.com>
Date: Tue, 17 Sep 2019 18:32:47 -0400
Subject: [PATCH 2/2] Switch to systemPropertyVariables propagated by LMP

Signed-off-by: Scott Kurz <skurz@us.ibm.com>
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0d3e3c4..8a78b0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,11 +176,11 @@
 						</goals>
 						<configuration>
 							<trimStackTrace>false</trimStackTrace>
-							<systemProperties>
+							<systemPropertyVariables>
 								<microshed_hostname>localhost</microshed_hostname>
 								<microshed_http_port>9080</microshed_http_port>
 								<WLP_USR_DIR>${project.build.directory}/liberty/wlp/usr</WLP_USR_DIR>
-							</systemProperties>
+							</systemPropertyVariables>
 						</configuration>
 					</execution>
 					<execution>