From 22135eb9212d60588a903f0f5ba262c747fbb59f Mon Sep 17 00:00:00 2001
From: Chanseok Oh <chanseok@google.com>
Date: Fri, 29 Mar 2019 12:33:17 -0400
Subject: [PATCH] Remove container-friendly flags for Java 8

---
 examples/jib-multimodule/project1/pom.xml             | 3 ---
 examples/jib-multimodule/project2/pom.xml             | 3 ---
 examples/jib/pom.xml                                  | 3 ---
 integration/examples/jib-multimodule/project1/pom.xml | 3 ---
 integration/examples/jib-multimodule/project2/pom.xml | 3 ---
 integration/examples/jib/pom.xml                      | 3 ---
 integration/testdata/jib/pom.xml                      | 3 ---
 7 files changed, 21 deletions(-)

diff --git a/examples/jib-multimodule/project1/pom.xml b/examples/jib-multimodule/project1/pom.xml
index d78cdd80d0a..97fd110ffb2 100644
--- a/examples/jib-multimodule/project1/pom.xml
+++ b/examples/jib-multimodule/project1/pom.xml
@@ -33,9 +33,6 @@
                     <container>
                         <jvmFlags>
                             <jvmFlag>-Djava.security.egd=file:/dev/./urandom</jvmFlag>
-                            <!-- specific to Java 8 containers -->
-                            <jvmFlag>-XX:+UnlockExperimentalVMOptions</jvmFlag>
-                            <jvmFlag>-XX:+UseCGroupMemoryLimitForHeap</jvmFlag>
                         </jvmFlags>
                     </container>
                 </configuration>
diff --git a/examples/jib-multimodule/project2/pom.xml b/examples/jib-multimodule/project2/pom.xml
index d08fba19b27..6cabfe871c6 100644
--- a/examples/jib-multimodule/project2/pom.xml
+++ b/examples/jib-multimodule/project2/pom.xml
@@ -33,9 +33,6 @@
                     <container>
                         <jvmFlags>
                             <jvmFlag>-Djava.security.egd=file:/dev/./urandom</jvmFlag>
-                            <!-- specific to Java 8 containers -->
-                            <jvmFlag>-XX:+UnlockExperimentalVMOptions</jvmFlag>
-                            <jvmFlag>-XX:+UseCGroupMemoryLimitForHeap</jvmFlag>
                         </jvmFlags>
                     </container>
                 </configuration>
diff --git a/examples/jib/pom.xml b/examples/jib/pom.xml
index aa3d3170d3a..fa3f3ae381f 100644
--- a/examples/jib/pom.xml
+++ b/examples/jib/pom.xml
@@ -39,9 +39,6 @@
                     <container>
                         <jvmFlags>
                             <jvmFlag>-Djava.security.egd=file:/dev/./urandom</jvmFlag>
-                            <!-- specific to Java 8 containers -->
-                            <jvmFlag>-XX:+UnlockExperimentalVMOptions</jvmFlag>
-                            <jvmFlag>-XX:+UseCGroupMemoryLimitForHeap</jvmFlag>
                         </jvmFlags>
                     </container>
                 </configuration>
diff --git a/integration/examples/jib-multimodule/project1/pom.xml b/integration/examples/jib-multimodule/project1/pom.xml
index d78cdd80d0a..97fd110ffb2 100644
--- a/integration/examples/jib-multimodule/project1/pom.xml
+++ b/integration/examples/jib-multimodule/project1/pom.xml
@@ -33,9 +33,6 @@
                     <container>
                         <jvmFlags>
                             <jvmFlag>-Djava.security.egd=file:/dev/./urandom</jvmFlag>
-                            <!-- specific to Java 8 containers -->
-                            <jvmFlag>-XX:+UnlockExperimentalVMOptions</jvmFlag>
-                            <jvmFlag>-XX:+UseCGroupMemoryLimitForHeap</jvmFlag>
                         </jvmFlags>
                     </container>
                 </configuration>
diff --git a/integration/examples/jib-multimodule/project2/pom.xml b/integration/examples/jib-multimodule/project2/pom.xml
index d08fba19b27..6cabfe871c6 100644
--- a/integration/examples/jib-multimodule/project2/pom.xml
+++ b/integration/examples/jib-multimodule/project2/pom.xml
@@ -33,9 +33,6 @@
                     <container>
                         <jvmFlags>
                             <jvmFlag>-Djava.security.egd=file:/dev/./urandom</jvmFlag>
-                            <!-- specific to Java 8 containers -->
-                            <jvmFlag>-XX:+UnlockExperimentalVMOptions</jvmFlag>
-                            <jvmFlag>-XX:+UseCGroupMemoryLimitForHeap</jvmFlag>
                         </jvmFlags>
                     </container>
                 </configuration>
diff --git a/integration/examples/jib/pom.xml b/integration/examples/jib/pom.xml
index aa3d3170d3a..fa3f3ae381f 100644
--- a/integration/examples/jib/pom.xml
+++ b/integration/examples/jib/pom.xml
@@ -39,9 +39,6 @@
                     <container>
                         <jvmFlags>
                             <jvmFlag>-Djava.security.egd=file:/dev/./urandom</jvmFlag>
-                            <!-- specific to Java 8 containers -->
-                            <jvmFlag>-XX:+UnlockExperimentalVMOptions</jvmFlag>
-                            <jvmFlag>-XX:+UseCGroupMemoryLimitForHeap</jvmFlag>
                         </jvmFlags>
                     </container>
                 </configuration>
diff --git a/integration/testdata/jib/pom.xml b/integration/testdata/jib/pom.xml
index aa3d3170d3a..fa3f3ae381f 100644
--- a/integration/testdata/jib/pom.xml
+++ b/integration/testdata/jib/pom.xml
@@ -39,9 +39,6 @@
                     <container>
                         <jvmFlags>
                             <jvmFlag>-Djava.security.egd=file:/dev/./urandom</jvmFlag>
-                            <!-- specific to Java 8 containers -->
-                            <jvmFlag>-XX:+UnlockExperimentalVMOptions</jvmFlag>
-                            <jvmFlag>-XX:+UseCGroupMemoryLimitForHeap</jvmFlag>
                         </jvmFlags>
                     </container>
                 </configuration>