From e04ecc69f925d5d0927318e8ef12cb90da1595b9 Mon Sep 17 00:00:00 2001 From: Joe Kutner Date: Mon, 18 May 2015 15:39:09 -0500 Subject: [PATCH 1/2] Update Heroku deployment documentation [skip ci] --- .../src/main/asciidoc/deployment.adoc | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-docs/src/main/asciidoc/deployment.adoc index 5ac2493275c7..6a208ccf0c1a 100644 --- a/spring-boot-docs/src/main/asciidoc/deployment.adoc +++ b/spring-boot-docs/src/main/asciidoc/deployment.adoc @@ -172,16 +172,6 @@ Spring Boot makes `-D` arguments available as properties accessible from a Sprin Tomcat, Jetty or Undertow instance which then uses it when it starts up. The `$PORT` environment variable is assigned to us by the Heroku PaaS. -Heroku by default will use Java 1.6. This is fine as long as your Maven or Gradle build -is set to use the same version (Maven users can use the `java.version` property). If you -want to use JDK 1.7, create a new file adjacent to your `pom.xml` and `Procfile`, -called `system.properties`. In this file add the following: - -[source,java] ----- -java.runtime.version=1.7 ----- - This should be everything you need. The most common workflow for Heroku deployments is to `git push` the code to production. @@ -197,13 +187,10 @@ This should be everything you need. The most common workflow for Heroku deployme Total 95 (delta 31), reused 0 (delta 0) -----> Java app detected - -----> Installing OpenJDK 1.7... *done* - -----> Installing Maven 3.2.3... *done* + -----> Installing OpenJDK 1.8... *done* + -----> Installing Maven 3.3.1... *done* -----> Installing settings.xml... *done* - -----> executing /app/tmp/cache/.maven/bin/mvn -B - -Duser.home=/tmp/build_0c35a5d2-a067-4abc-a232-14b1fb7a8229 - -Dmaven.repo.local=/app/tmp/cache/.m2/repository - -s /app/tmp/cache/.m2/settings.xml -DskipTests=true clean install + -----> Executing: mvn -B -DskipTests=true clean install [INFO] Scanning for projects... Downloading: http://repo.spring.io/... From 265328402be574c55d30407849a4aaa2dc29b46b Mon Sep 17 00:00:00 2001 From: Joe Kutner Date: Tue, 19 May 2015 08:12:35 -0500 Subject: [PATCH 2/2] Update deployment.adoc --- spring-boot-docs/src/main/asciidoc/deployment.adoc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-docs/src/main/asciidoc/deployment.adoc index 6a208ccf0c1a..b8f1b283b10b 100644 --- a/spring-boot-docs/src/main/asciidoc/deployment.adoc +++ b/spring-boot-docs/src/main/asciidoc/deployment.adoc @@ -172,6 +172,16 @@ Spring Boot makes `-D` arguments available as properties accessible from a Sprin Tomcat, Jetty or Undertow instance which then uses it when it starts up. The `$PORT` environment variable is assigned to us by the Heroku PaaS. +Heroku by default will use Java 1.8. This is fine as long as your Maven or Gradle build is set to +use the same version (Maven users can use the java.version property). If you want to use JDK 1.7, +create a new file adjacent to your `pom.xml` and `Procfile`, called `system.properties`. In this +file add the following: + +[indent=0] +---- + java.runtime.version=1.7 +---- + This should be everything you need. The most common workflow for Heroku deployments is to `git push` the code to production.