Fixes #298

.github/workflows/on_pull_request_push_run_test_and_coverage.yml

@@ -1,7 +1,7 @@
-name: On pull request push, perform a build with test reports shown and coverage evaluated (and compared with master)
+name: On pull request push, perform a build with test reports shown and coverage evaluated (and compared with main)
 on:
   pull_request:
-    branches-ignore: [ master ]
+    branches-ignore: [ main ]
 
 jobs:
   build:

.github/workflows/on_push_on_master_deploy_build.yml

@@ -1,11 +1,11 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: On master push perform build
+name: On main push perform build
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:

.github/workflows/on_release_update_readme.yml

@@ -22,4 +22,4 @@ jobs:
           commit_prefix: "🤖"
           commit_message: "Updated readme to have version ${{ github.event.release.tag_name }} in"
           force: false
-          target_branch: master
+          target_branch: main

HowTo.md

@@ -28,7 +28,7 @@ Don't forget to replace the value of `version` maven property by ![GitHub versio
 Aadarchi needs a description of your architecture, which is usually done in a workspace.dsl file (but can also be done in pure Java code).
 
 This file is an architecture description of your project in structurizr's domain-specific language. To learn more about how this DSL works, you can find all usefull informations there :
-[workspace.dsl language reference](https://github.com/structurizr/dsl/blob/master/docs/language-reference.md)
+[workspace.dsl language reference](https://github.com/structurizr/dsl/blob/main/docs/language-reference.md)
 
 This "workspace.dsl" should be located in `src/architecture/resources/` (we will see later how to change this default path).
 

README.md

@@ -26,7 +26,7 @@ Finally, don't forget to replace the value of `aadarchi-version` maven property
 
 ## Usage
 
-Once the archetype has been run, you'll have a project with a Structurizr `workspace.dsl` file in `src/architecture/resources` (conform to [Structurizr DSL syntax](https://github.com/structurizr/dsl/blob/master/docs/language-reference.md), which means that file can be viewed using [Structurizr-lite](https://dev.to/simonbrown/getting-started-with-structurizr-lite-27d0))
+Once the archetype has been run, you'll have a project with a Structurizr `workspace.dsl` file in `src/architecture/resources` (conform to [Structurizr DSL syntax](https://github.com/structurizr/dsl/blob/main/docs/language-reference.md), which means that file can be viewed using [Structurizr-lite](https://dev.to/simonbrown/getting-started-with-structurizr-lite-27d0))
 and asciidoc files following Agile architecture documentation template in `src/docs/asciidoc`.
 
 ### Generating architecture documentation

aadarchi-maven-plugin/src/it/2_generate_html_docs/src/docs/asciidoc/10-deployment.adoc

@@ -3,7 +3,7 @@
 include::_notify-bug-admonition.adoc[]
 
 Deployment of the agile-architecture-documentation code is done by pushing code to GitHub.
-On push, there is a https://github.com/Riduidel/agile-architecture-documentation-system/actions?query=workflow%3A%22Java+CI+with+Maven%22[GitHub action] (defined in https://github.com/Riduidel/agile-architecture-documentation-system/blob/master/.github/workflows/build.yml[main module .github folder]) which will compile everything and generate the github pages.
+On push, there is a https://github.com/Riduidel/agile-architecture-documentation-system/actions?query=workflow%3A%22Java+CI+with+Maven%22[GitHub action] (defined in https://github.com/Riduidel/agile-architecture-documentation-system/blob/main/.github/workflows/build.yml[main module .github folder]) which will compile everything and generate the github pages.
 ////
 The deployment section is simply the mapping between the
 <<software architecture>> and the <<infrastructure architecture>>.

aadarchi-maven-plugin/src/it/3_generate_pdf_docs/src/docs/asciidoc/10-deployment.adoc

@@ -3,7 +3,7 @@
 include::_notify-bug-admonition.adoc[]
 
 Deployment of the agile-architecture-documentation code is done by pushing code to GitHub.
-On push, there is a https://github.com/Riduidel/agile-architecture-documentation-system/actions?query=workflow%3A%22Java+CI+with+Maven%22[GitHub action] (defined in https://github.com/Riduidel/agile-architecture-documentation-system/blob/master/.github/workflows/build.yml[main module .github folder]) which will compile everything and generate the github pages.
+On push, there is a https://github.com/Riduidel/agile-architecture-documentation-system/actions?query=workflow%3A%22Java+CI+with+Maven%22[GitHub action] (defined in https://github.com/Riduidel/agile-architecture-documentation-system/blob/main/.github/workflows/build.yml[main module .github folder]) which will compile everything and generate the github pages.
 ////
 The deployment section is simply the mapping between the
 <<software architecture>> and the <<infrastructure architecture>>.

archetype/src/main/resources/archetype-resources/.github/workflows/build.yml

@@ -5,9 +5,9 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

architecture-documentation/src/docs/asciidoc/_10-deployment.adoc

@@ -3,7 +3,7 @@
 include::_notify-bug-admonition.adoc[]
 
 Deployment of the aadarchi-documentation code is done by pushing code to GitHub.
-On push, there is a https://github.com/Riduidel/aadarchi-documentation-system/actions?query=workflow%3A%22Java+CI+with+Maven%22[GitHub action] (defined in https://github.com/Riduidel/aadarchi-documentation-system/blob/master/.github/workflows/build.yml[main module .github folder]) which will compile everything and generate the github pages.
+On push, there is a https://github.com/Riduidel/aadarchi-documentation-system/actions?query=workflow%3A%22Java+CI+with+Maven%22[GitHub action] (defined in https://github.com/Riduidel/aadarchi-documentation-system/blob/main/.github/workflows/build.yml[main module .github folder]) which will compile everything and generate the github pages.
 ////
 The deployment section is simply the mapping between the
 <<software architecture>> and the <<infrastructure architecture>>.

github-scm-handler/src/main/java/org/ndx/aadarchi/github/GitOperator.java

@@ -31,7 +31,7 @@ public class GitOperator {
 	@Inject @ConfigProperty(name=Constants.CONFIG_GITHUB_TOKEN) private String token;
 	private Set<String> branchesToCheckout;
 	@Inject 
-	public void setBranchesToCheckout(@ConfigProperty(name=Constants.CONFIG_GIT_BRANCHES_TO_CHECKOUT, defaultValue = "develop, main, master") String names) {
+	public void setBranchesToCheckout(@ConfigProperty(name=Constants.CONFIG_GIT_BRANCHES_TO_CHECKOUT, defaultValue = "develop, main, main") String names) {
 		this.branchesToCheckout = Arrays.asList(names.split(",")).stream()
 				.map(name -> name.trim())
 				.collect(Collectors.toSet());

github-scm-handler/src/main/java/org/ndx/aadarchi/github/GithubSCMHandler.java

@@ -62,7 +62,7 @@ public Collection<SCMFile> find(String project, String path, Predicate<SCMFile>
 
 	@Override
 	public String linkTo(String project, String path) {
-		return String.format("%s/blob/master/%s", project, path);
+		return String.format("%s/blob/main/%s", project, path);
 	}
 
 	@Override

gitlab-scm-handler/src/main/java/org/ndx/aadarchi/gitlab/GitlabSCMHandler.java

@@ -43,7 +43,7 @@ public Collection<SCMFile> find(String project, String path, Predicate<SCMFile>
 			List<TreeItem> items = gitlab.getApi().getRepositoryApi().getTree(project, path, null);
 			return items.stream()
 					.map(ThrowingFunction.unchecked(item -> {
-						RepositoryFile gitlabFile = repositoryFileApi.getFile(project, item.getPath(), "master");
+						RepositoryFile gitlabFile = repositoryFileApi.getFile(project, item.getPath(), "main");
 						Pager<Blame> blame = repositoryFileApi.getBlame(project, item.getPath(), gitlabFile.getRef(), 1);
 						var commitDate = blame.first().get(0).getCommit().getCommittedDate();
 						return new GitlabFile(
@@ -66,7 +66,7 @@ public Collection<SCMFile> find(String project, String path, Predicate<SCMFile>
 
 	@Override
 	public String linkTo(String project, String path) {
-		return String.format("%s/-/blob/master/%s", project, path);
+		return String.format("%s/-/blob/main/%s", project, path);
 	}
 
 	@Override

spring-components-detector/README.md

@@ -1,6 +1,6 @@
 # Spring component detector
 
-Spring component detector configures [Structurizr-Spring](https://github.com/structurizr/java-extensions/tree/master/structurizr-spring) for optimal component detection and decoration
+Spring component detector configures [Structurizr-Spring](https://github.com/structurizr/java-extensions/tree/main/structurizr-spring) for optimal component detection and decoration
 
 ## Activating