Convert guide to display both Gradle and Maven info

README.ftl.md

@@ -45,9 +45,8 @@ Set up the project
 
 <@create_directory_structure_hello/>
 
-### Create a Gradle build file
 
-    <@snippet path="build.gradle" prefix="initial"/>
+<@create_both_builds/>
 
 <@bootstrap_starter_pom_disclaimer/>
 
@@ -121,9 +120,9 @@ The [`@EnableAutoConfiguration`][] annotation switches on reasonable default beh
 
 <@build_an_executable_jar_subhead/>
 
-<@build_an_executable_jar_with_gradle/>
+<@build_an_executable_jar_with_both/>
 
-<@run_the_application_with_gradle module="service"/>
+<@run_the_application_with_both module="service"/>
 
 Logging output is displayed. The service should be up and running within a few seconds.
 

README.md

@@ -71,7 +71,9 @@ In a project directory of your choosing, create the following subdirectory struc
             └── java
                 └── hello
 
+
 ### Create a Gradle build file
+Below is the [initial Gradle build file](https://github.com/springframework-meta/gs-rest-service/blob/master/initial/build.gradle). But you can also use Maven. The pom.xml file is included [right here](https://github.com/springframework-meta/gs-rest-service/blob/master/initial/pom.xml).
 
 `build.gradle`
 ```gradle
@@ -106,6 +108,8 @@ task wrapper(type: Wrapper) {
     gradleVersion = '1.7'
 }
 ```
+    
+    
 
 This guide is using [Spring Boot's starter POMs](/guides/gs/spring-boot/).
 
@@ -242,6 +246,8 @@ The [`@EnableAutoConfiguration`][] annotation switches on reasonable default beh
 
 Now that your `Application` class is ready, you simply instruct the build system to create a single, executable jar containing everything. This makes it easy to ship, version, and deploy the service as an application throughout the development lifecycle, across different environments, and so forth.
 
+Below are the Gradle steps, but if you are using Maven, you can find the updated pom.xml [right here](https://github.com/springframework-meta/gs-rest-service/blob/master/complete/pom.xml) and build it by typing `mvn clean package`.
+
 Update your Gradle `build.gradle` file's `buildscript` section, so that it looks like this:
 
 ```groovy
@@ -261,6 +267,7 @@ Further down inside `build.gradle`, add the following to the list of applied plu
 ```groovy
 apply plugin: 'spring-boot'
 ```
+You can see the final version of `build.gradle` [right here]((https://github.com/springframework-meta/gs-rest-service/blob/master/complete/build.gradle).
 
 The [Spring Boot gradle plugin][spring-boot-gradle-plugin] collects all the jars on the classpath and builds a single "über-jar", which makes it more convenient to execute and transport your service.
 It also searches for the `public static void main()` method to flag as a runnable class.
@@ -271,24 +278,32 @@ Now run the following command to produce a single executable JAR file containing
 $ ./gradlew build
 ```
 
-Now you can run the JAR by typing:
+If you are using Gradle, you can run the JAR by typing:
 
 ```sh
 $ java -jar build/libs/gs-rest-service-0.1.0.jar
 ```
 
+If you are using Maven, you can run the JAR by typing:
+
+```sh
+$ java -jar target/gs-rest-service-0.1.0.jar
+```
+
 [spring-boot-gradle-plugin]: https://github.com/SpringSource/spring-boot/tree/master/spring-boot-tools/spring-boot-gradle-plugin
 
 > **Note:** The procedure above will create a runnable JAR. You can also opt to [build a classic WAR file](/guides/gs/convert-jar-to-war/) instead.
 
 Run the service
 -------------------
-Run your service at the command line:
+If you are using Gradle, you can run your service at the command line this way:
 
 ```sh
 $ ./gradlew clean build && java -jar build/libs/gs-rest-service-0.1.0.jar
 ```
 
+> **Note:** If you are using Maven, you can run your service by typing `mvn clean package && java -jar target/gs-rest-service-0.1.0.jar`.
+
 
 Logging output is displayed. The service should be up and running within a few seconds.