Merge pull request heroku#75 from heroku/spring-2.1.1

jkutner · web-flow · commit 2eb6c133f2ff · 2018-12-17T10:31:15.000-06:00
Upgrade to spring 2.1.1
diff --git a/docs/java-getting-started.md b/docs/java-getting-started.md
@@ -111,6 +111,8 @@ To create a local copy of a sample app that you can deploy to Heroku, execute th
 ```term
 :::>- $ git clone https://github.com/heroku/java-getting-started
 :::>- $ cd java-getting-started
+:::-- $ git fetch
+:::-- $ git merge origin/master
 ```
 
 You now have a functioning Git repository that contains a simple Java application. The application includes a `pom.xml` file, which is used by Java's dependency manager, Maven.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.0.7.RELEASE</version>
+    <version>2.1.1.RELEASE</version>
     <relativePath/>
   </parent>
   <name>java-getting-started</name>
