Merge pull request #1894 from chanseokoh/no-more-container-flags

Remove container-friendly flags for Java 8
GoogleContainerTools · Mar 29, 2019 · 6ea8c06 · 6ea8c06
2 parents d88680e + 22135eb
commit 6ea8c06
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>