Rename master branch to main (#683)

akka · Sep 9, 2022 · a8953b1 · a8953b1
1 parent 9434a2c
commit a8953b1
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
     tags-ignore: [ v.* ]
 
 jobs:

diff --git a/.github/workflows/integration-tests-cassandra.yml b/.github/workflows/integration-tests-cassandra.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
     tags-ignore: [ v.* ]
 
 jobs:
@@ -44,4 +44,4 @@ jobs:
 
       - name: Print logs on failure
         if: ${{ failure() }}
-        run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \;
+        run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \;
diff --git a/.github/workflows/integration-tests-jdbc.yml b/.github/workflows/integration-tests-jdbc.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
     tags-ignore: [ v.* ]
 
 jobs:
@@ -48,4 +48,4 @@ jobs:
 
       - name: Print logs on failure
         if: ${{ failure() }}
-        run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \;
+        run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \;
diff --git a/.github/workflows/integration-tests-kafka.yml b/.github/workflows/integration-tests-kafka.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
     tags-ignore: [ v.* ]
 
 jobs:
@@ -44,4 +44,4 @@ jobs:
 
       - name: Print logs on failure
         if: ${{ failure() }}
-        run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \;
+        run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \;
diff --git a/.github/workflows/integration-tests-slick.yml b/.github/workflows/integration-tests-slick.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
     tags-ignore: [ v.* ]
 
 jobs:
@@ -48,4 +48,4 @@ jobs:
 
       - name: Print logs on failure
         if: ${{ failure() }}
-        run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \;
+        run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \;
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -4,7 +4,7 @@ on:
   push:
     # branches to consider in the event; optional, defaults to all
     branches:
-      - master
+      - main
 
 jobs:
   update_release_draft:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     branches:
-      - master
+      - main
     tags: ["*"]
 
 jobs:

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
     tags-ignore: [ v.* ]
 
 jobs:
@@ -42,4 +42,4 @@ jobs:
 
       - name: Print logs on failure
         if: ${{ failure() }}
-        run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \;
+        run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \;
diff --git a/docs/src/main/paradox/getting-started/running.md b/docs/src/main/paradox/getting-started/running.md
@@ -4,7 +4,7 @@
 
 This example requires a Cassandra database to run. 
 If you do not have a Cassandra database then you can run one locally as a Docker container.
-To run a Cassandra database locally you can use [`docker-compose`](https://docs.docker.com/compose/) to run the [`docker-compose.yaml`](https://raw.githubusercontent.com/akka/akka-projection/master/docker-compose.yml) found in the Projections project root.
+To run a Cassandra database locally you can use [`docker-compose`](https://docs.docker.com/compose/) to run the [`docker-compose.yaml`](https://raw.githubusercontent.com/akka/akka-projection/main/docker-compose.yml) found in the Projections project root.
 The `docker-compose.yml` file references the latest [Cassandra Docker Image](https://hub.docker.com/_/cassandra).
 
 Change directory to the directory of the `docker-compose.yml` file and manage a Cassandra container with the following commands.

diff --git a/docs/src/main/paradox/overview.md b/docs/src/main/paradox/overview.md
@@ -95,6 +95,6 @@ Actor API.
 
 ## Contributing
 
-Please feel free to contribute to Akka and Akka Projections by reporting issues you identify, or by suggesting changes to the code. Please refer to our [contributing instructions](https://github.com/akka/akka/blob/master/CONTRIBUTING.md) to learn how it can be done.
+Please feel free to contribute to Akka and Akka Projections by reporting issues you identify, or by suggesting changes to the code. Please refer to our [contributing instructions](https://github.com/akka/akka/blob/main/CONTRIBUTING.md) to learn how it can be done.
 
 We want Akka to strive in a welcoming and open atmosphere and expect all contributors to respect our [code of conduct](https://www.lightbend.com/conduct).
diff --git a/docs/src/main/paradox/snapshots.md b/docs/src/main/paradox/snapshots.md
@@ -6,7 +6,7 @@ project.description: Snapshot builds of Akka Projection are provided via the Son
 [snapshots-badge]:  https://img.shields.io/nexus/s/com.lightbend.akka/akka-projection-core_2.13?server=https%3A%2F%2Foss.sonatype.org
 [snapshots]:        https://oss.sonatype.org/content/repositories/snapshots/com/lightbend/akka/akka-projection-core_2.13/
 
-Snapshots are published to the Sonatype Snapshot repository after every successful build on master.
+Snapshots are published to the Sonatype Snapshot repository after every successful build on main.
 Add the following to your project build definition to resolve Akka Projection's snapshots:
 
 ## Configure repository

diff --git a/project/Common.scala b/project/Common.scala
@@ -31,8 +31,8 @@ object Common extends AutoPlugin {
           "https://gitter.im/akka/dev",
           url("https://github.com/akka/akka-projection/graphs/contributors")),
       licenses := Seq(
-          ("BUSL-1.1", url("https://raw.githubusercontent.com/akka/akka-projection/master/LICENSE"))
-        ), // FIXME change s/master/v1.3.0/ when released
+          ("BUSL-1.1", url("https://raw.githubusercontent.com/akka/akka-projection/main/LICENSE"))
+        ), // FIXME change s/main/v1.3.0/ when released
       description := "Akka Projection.")
 
   override lazy val projectSettings = Seq(
@@ -49,7 +49,7 @@ object Common extends AutoPlugin {
         "-sourcepath",
         (baseDirectory in ThisBuild).value.toString,
         "-doc-source-url", {
-          val branch = if (isSnapshot.value) "master" else s"v${version.value}"
+          val branch = if (isSnapshot.value) "main" else s"v${version.value}"
           s"https://github.com/akka/akka-projection/tree/${branch}€{FILE_PATH_EXT}#L€{FILE_LINE}"
         },
         "-skip-packages",
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ on: @@
       pull_request:
       push:
         branches:
-          - master
+          - main
         tags-ignore: [ v.* ]
     jobs:
@@ Expand Down @@