diff --git a/config/components.yml b/config/components.yml index ce1ca296bb..e86ed2b4ef 100644 --- a/config/components.yml +++ b/config/components.yml @@ -47,7 +47,7 @@ frameworks: - "JavaBuildpack::Framework::PlayFrameworkAutoReconfiguration" - "JavaBuildpack::Framework::PlayFrameworkJPAPlugin" - "JavaBuildpack::Framework::PostgresqlJDBC" - - "JavaBuildpack::Framework::SpringAutoReconfiguration" +# - "JavaBuildpack::Framework::SpringAutoReconfiguration" - "JavaBuildpack::Framework::SpringInsight" - "JavaBuildpack::Framework::YourKitProfiler" - "JavaBuildpack::Framework::JavaOpts" diff --git a/config/open_jdk_jre.yml b/config/open_jdk_jre.yml index dafcb25b01..e0b83bd913 100644 --- a/config/open_jdk_jre.yml +++ b/config/open_jdk_jre.yml @@ -17,24 +17,24 @@ # If Java 7 is required, permgen will be used instead of metaspace. Please see the documentation for more detail. --- jre: - version: 1.8.0_+ + version: 1.7.0_+ repository_root: ! '{default.repository.root}/openjdk/{platform}/{architecture}' memory_calculator: version: 2.+ repository_root: ! '{default.repository.root}/memory-calculator/{platform}/{architecture}' stack_threads: memory_sizes: - heap: - metaspace: 64m.. + heap: ..1024m + metaspace: 256m.. native: - permgen: 64m.. + permgen: 128m..256m stack: memory_heuristics: - heap: 75 - metaspace: 10 - native: 10 - permgen: 10 - stack: 5 + heap: 15 + metaspace: 15 + native: 2 + permgen: 5 + stack: 1 memory_initials: heap: 100% metaspace: 100% diff --git a/config/spring_auto_reconfiguration.yml b/config/spring_auto_reconfiguration.yml index 722e472a15..b6ac8b1f67 100644 --- a/config/spring_auto_reconfiguration.yml +++ b/config/spring_auto_reconfiguration.yml @@ -19,4 +19,4 @@ --- version: 1.+ repository_root: ! '{default.repository.root}/auto-reconfiguration' -enabled: true +enabled: false diff --git a/config/tomcat.yml b/config/tomcat.yml index 4623da2289..07abaeb7cd 100644 --- a/config/tomcat.yml +++ b/config/tomcat.yml @@ -16,8 +16,8 @@ # Configuration for the Tomcat container --- tomcat: - version: 8.0.+ - repository_root: ! '{default.repository.root}/tomcat' + version: 7.0.+ + repository_root: ! 'https://s3.amazonaws.com/jm-liferay-tomcat' context_path: lifecycle_support: version: 2.+