Merge branch 'master' of github.com:spring-guides/getting-started-macros

macros/build_an_executable_jar_with_both.asc

 // For more information see https://github.com/spring-guides/draft-gs-template/wiki/Pull-in-needed-macros
 // to see how this macro is used for writing Getting Started guides.
 //
+
 :linkattrs:
 
 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.

macros/build_system_intro.asc

 // For more information see https://github.com/spring-guides/draft-gs-template/wiki/Pull-in-needed-macros
 // to see how this macro is used for writing Getting Started guides.
 //
+
 :linkattrs:
 
 First you set up a basic build script. You can use any build system you like when building apps with Spring, but the code you need to work with http://gradle.org[Gradle] and https://maven.apache.org[Maven] is included here. If you're not familiar with either, refer to link:/guides/gs/gradle[Building Java Projects with Gradle] or link:/guides/gs/maven[Building Java Projects with Maven].