From 0eeed7ed2dc18626a41c09d640bdd095ed5570bb Mon Sep 17 00:00:00 2001 From: Egor Margineanu Date: Tue, 29 Jul 2014 08:53:17 +0200 Subject: [PATCH 1/4] Update oracle_jre.yml Change Oracle JRE version to 1.8.0_+ --- config/oracle_jre.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/oracle_jre.yml b/config/oracle_jre.yml index 098526bae2..e6bb64ee38 100644 --- a/config/oracle_jre.yml +++ b/config/oracle_jre.yml @@ -20,13 +20,13 @@ # e.g. repository_root: "http://example.com/oracle-jre/{platform}/{architecture}" repository_root: "" -version: 1.7.0_+ +version: 1.8.0_+ memory_sizes: - # metaspace: 64m.. - permgen: 64m.. + metaspace: 64m.. + # permgen: 64m.. memory_heuristics: heap: 75 - # metaspace: 10 - permgen: 10 + metaspace: 10 + # permgen: 10 stack: 5 native: 10 From a51743a301da8695627adbb8dd87c36e9307f07f Mon Sep 17 00:00:00 2001 From: Egor Margineanu Date: Tue, 29 Jul 2014 08:56:22 +0200 Subject: [PATCH 2/4] Update components.yml --- config/components.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/components.yml b/config/components.yml index db5a732ae7..531f125a78 100644 --- a/config/components.yml +++ b/config/components.yml @@ -28,8 +28,8 @@ containers: # In order to use Oracle JREs instead of OpenJDK, you must comment out the OpenJDK line and uncomment the Oracle line. # Please see the documentation for more detail. jres: - - "JavaBuildpack::Jre::OpenJdkJRE" -# - "JavaBuildpack::Jre::OracleJRE" +# - "JavaBuildpack::Jre::OpenJdkJRE" + - "JavaBuildpack::Jre::OracleJRE" frameworks: - "JavaBuildpack::Framework::AppDynamicsAgent" From e4f59f8d468cba125ad018d9d7a82022f2fc07e9 Mon Sep 17 00:00:00 2001 From: Egor Margineanu Date: Tue, 29 Jul 2014 14:10:26 +0200 Subject: [PATCH 3/4] Update open_jdk_jre.yml --- config/open_jdk_jre.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/open_jdk_jre.yml b/config/open_jdk_jre.yml index e129a38832..f7f62fda03 100644 --- a/config/open_jdk_jre.yml +++ b/config/open_jdk_jre.yml @@ -17,13 +17,13 @@ # From Java 1.8 onwards, metaspace should be used instead of permgen. Please see the documentation for more detail. --- repository_root: "{default.repository.root}/openjdk/{platform}/{architecture}" -version: 1.7.0_+ +version: 1.8.0_+ memory_sizes: - # metaspace: 64m.. - permgen: 64m.. + metaspace: 64m.. + # permgen: 64m.. memory_heuristics: heap: 75 - # metaspace: 10 - permgen: 10 + metaspace: 10 + # permgen: 10 stack: 5 native: 10 From 4901f51683b4f98d5f129ffe624baf6c24767199 Mon Sep 17 00:00:00 2001 From: Egor Margineanu Date: Tue, 29 Jul 2014 14:11:08 +0200 Subject: [PATCH 4/4] Update components.yml --- config/components.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/components.yml b/config/components.yml index 531f125a78..db5a732ae7 100644 --- a/config/components.yml +++ b/config/components.yml @@ -28,8 +28,8 @@ containers: # In order to use Oracle JREs instead of OpenJDK, you must comment out the OpenJDK line and uncomment the Oracle line. # Please see the documentation for more detail. jres: -# - "JavaBuildpack::Jre::OpenJdkJRE" - - "JavaBuildpack::Jre::OracleJRE" + - "JavaBuildpack::Jre::OpenJdkJRE" +# - "JavaBuildpack::Jre::OracleJRE" frameworks: - "JavaBuildpack::Framework::AppDynamicsAgent"