Migrate to main.

Author: gregturn

build_yarn_application.adoc

@@ -1,6 +1,6 @@
 :link_attrs:
 
-ifndef::yarn_base_appmaster[:yarn_base_appmaster: appmaster]
+ifndef::yarn_base_appmain[:yarn_base_appmain: appmain]
 ifndef::yarn_base_container[:yarn_base_container: container]
 ifndef::yarn_base_client[:yarn_base_client: client]
 ifndef::yarn_base_dist[:yarn_base_dist: dist]
@@ -36,7 +36,7 @@ Below listing shows files after a succesfull gradle build.
 [subs="attributes"]
 ----
 {yarn_base_dist}/target/{yarn_base_dist}/{yarn_base_client}-0.1.0.jar
-{yarn_base_dist}/target/{yarn_base_dist}/{yarn_base_appmaster}-0.1.0.jar
+{yarn_base_dist}/target/{yarn_base_dist}/{yarn_base_appmain}-0.1.0.jar
 {yarn_base_dist}/target/{yarn_base_dist}/{yarn_base_container}-0.1.0.jar
 ----
 

create_both_builds.adoc

@@ -1,2 +1,2 @@
 === Create a Gradle build file
-Below is the https://github.com/spring-guides/{project_id}/blob/master/initial/build.gradle[initial Gradle build file].
+Below is the https://github.com/spring-guides/{project_id}/blob/main/initial/build.gradle[initial Gradle build file].

create_both_builds_multi.adoc

@@ -1,2 +1,2 @@
 === Create the Gradle build files
-Below is the https://github.com/spring-guides/{project_id}/blob/master/initial/build.gradle[initial Gradle build file] and the https://github.com/spring-guides/{project_id}/blob/master/initial/settings.gradle[initial Gradle settings file]. But you can also use Maven. The pom.xml file is included https://github.com/spring-guides/{project_id}/blob/master/initial/pom.xml[right here]. If you are using link:/guides/gs/sts[Spring Tool Suite (STS)], you can import the guide directly.
+Below is the https://github.com/spring-guides/{project_id}/blob/main/initial/build.gradle[initial Gradle build file] and the https://github.com/spring-guides/{project_id}/blob/main/initial/settings.gradle[initial Gradle settings file]. But you can also use Maven. The pom.xml file is included https://github.com/spring-guides/{project_id}/blob/main/initial/pom.xml[right here]. If you are using link:/guides/gs/sts[Spring Tool Suite (STS)], you can import the guide directly.

create_directory_structure_yarn_hello.adoc

@@ -1,6 +1,6 @@
 :link_attrs:
 
-ifndef::yarn_base_appmaster[:yarn_base_appmaster: appmaster]
+ifndef::yarn_base_appmain[:yarn_base_appmain: appmain]
 ifndef::yarn_base_container[:yarn_base_container: container]
 ifndef::yarn_base_client[:yarn_base_client: client]
 ifndef::yarn_base_dist[:yarn_base_dist: dist]
@@ -12,13 +12,13 @@ subdirectory structure:
 
 [subs="attributes"]
 ```
-├── {yarn_base_appmaster}
+├── {yarn_base_appmain}
 │   └── src
 │       └── main
 │           ├── resources
 │           └── java
 │               └── hello
-│                   └── appmaster
+│                   └── appmain
 ├── {yarn_base_container}
 │   └── src
 │       └── main
@@ -40,8 +40,8 @@ for example, on *nix systems, with:
 
 [subs="attributes"]
 ```
-mkdir -p {yarn_base_appmaster}/src/main/resources
-mkdir -p {yarn_base_appmaster}/src/main/java/hello/appmaster
+mkdir -p {yarn_base_appmain}/src/main/resources
+mkdir -p {yarn_base_appmain}/src/main/java/hello/appmain
 mkdir -p {yarn_base_container}/src/main/resources
 mkdir -p {yarn_base_container}/src/main/java/hello/container
 mkdir -p {yarn_base_client}/src/main/resources

create_directory_structure_yarn_test_hello.adoc

@@ -1,6 +1,6 @@
 :link_attrs:
 
-ifndef::yarn_base_appmaster[:yarn_base_appmaster: appmaster]
+ifndef::yarn_base_appmain[:yarn_base_appmain: appmain]
 ifndef::yarn_base_container[:yarn_base_container: container]
 ifndef::yarn_base_client[:yarn_base_client: client]
 ifndef::yarn_base_dist[:yarn_base_dist: dist]
@@ -12,13 +12,13 @@ subdirectory structure:
 
 [subs="attributes"]
 ```
-├── {yarn_base_appmaster}
+├── {yarn_base_appmain}
 │   └── src
 │       └── main
 │           ├── resources
 │           └── java
 │               └── hello
-│                   └── appmaster
+│                   └── appmain
 ├── {yarn_base_container}
 │   └── src
 │       └── main
@@ -44,8 +44,8 @@ for example, with
 
 [subs="attributes"]
 ```
-mkdir -p {yarn_base_appmaster}/src/main/resources
-mkdir -p {yarn_base_appmaster}/src/main/java/hello/appmaster
+mkdir -p {yarn_base_appmain}/src/main/resources
+mkdir -p {yarn_base_appmain}/src/main/java/hello/appmain
 mkdir -p {yarn_base_container}/src/main/resources
 mkdir -p {yarn_base_container}/src/main/java/hello/container
 mkdir -p {yarn_base_client}/src/main/resources

hide-show-gradle.adoc

@@ -6,17 +6,17 @@
 [.use-gradle]
 == Build with Gradle
 
-include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/master/build_system_intro.adoc[]
+include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/main/build_system_intro.adoc[]
 
-include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/master/create_directory_structure_hello.adoc[]
+include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/main/create_directory_structure_hello.adoc[]
 
-include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/master/create_both_builds.adoc[]
+include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/main/create_both_builds.adoc[]
 
 `build.gradle`
 // AsciiDoc source formatting doesn't support groovy, so using java instead
 [source,java]
 ----
-include::https://raw.githubusercontent.com/spring-guides/{project_id}/master/initial/build.gradle[]
+include::https://raw.githubusercontent.com/spring-guides/{project_id}/main/initial/build.gradle[]
 ----
 
-include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/master/spring-boot-gradle-plugin.adoc[]
+include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/main/spring-boot-gradle-plugin.adoc[]

hide-show-maven.adoc

@@ -6,14 +6,14 @@
 [.use-maven]
 == Build with Maven
 
-include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/master/build_system_intro_maven.adoc[]
+include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/main/build_system_intro_maven.adoc[]
 
-include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/master/create_directory_structure_hello.adoc[]
+include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/main/create_directory_structure_hello.adoc[]
 
 `pom.xml`
 [source,xml]
 ----
-include::https://raw.githubusercontent.com/spring-guides/{project_id}/master/initial/pom.xml[]
+include::https://raw.githubusercontent.com/spring-guides/{project_id}/main/initial/pom.xml[]
 ----
 
-include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/master/spring-boot-maven-plugin.adoc[]
+include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/main/spring-boot-maven-plugin.adoc[]

how_to_complete_this_guide.adoc

@@ -9,7 +9,7 @@ To **start from scratch**, move on to <<scratch>>.
 
 To **skip the basics**, do the following:
 
- - https://github.com/spring-guides/{project_id}/archive/master.zip[Download] and unzip the source repository for this guide, or clone it using link:/understanding/Git[Git]:
+ - https://github.com/spring-guides/{project_id}/archive/main.zip[Download] and unzip the source repository for this guide, or clone it using link:/understanding/Git[Git]:
 `git clone https://github.com/spring-guides/{project_id}.git`
  - cd into `{project_id}{initial}`
  - Jump ahead to <<initial>>.

spring-boot-gradle-plugin.adoc

@@ -2,5 +2,5 @@ The https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/html
 
 - It collects all the jars on the classpath and builds a single, runnable "über-jar", which makes it more convenient to execute and transport your service.
 - It searches for the `public static void main()` method to flag as a runnable class. 
-- It provides a built-in dependency resolver that sets the version number to match https://github.com/spring-projects/spring-boot/blob/master/spring-boot-project/spring-boot-dependencies/pom.xml[Spring Boot dependencies]. You can override any version you wish, but it will default to Boot's chosen set of versions.
+- It provides a built-in dependency resolver that sets the version number to match https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot-dependencies/pom.xml[Spring Boot dependencies]. You can override any version you wish, but it will default to Boot's chosen set of versions.
 

spring-boot-maven-plugin.adoc

@@ -2,5 +2,5 @@ The https://docs.spring.io/spring-boot/docs/current/maven-plugin[Spring Boot Mav
 
 - It collects all the jars on the classpath and builds a single, runnable "über-jar", which makes it more convenient to execute and transport your service.
 - It searches for the `public static void main()` method to flag as a runnable class. 
-- It provides a built-in dependency resolver that sets the version number to match https://github.com/spring-projects/spring-boot/blob/master/spring-boot-project/spring-boot-dependencies/pom.xml[Spring Boot dependencies]. You can override any version you wish, but it will default to Boot's chosen set of versions.
+- It provides a built-in dependency resolver that sets the version number to match https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot-dependencies/pom.xml[Spring Boot dependencies]. You can override any version you wish, but it will default to Boot's chosen set of versions.