(incubator-pekko-persistence-jdbc) branch 1.0.x updated: Fix references to master branch as main

[md...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mdedetrich pushed a commit to branch 1.0.x
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-persistence-jdbc.git


The following commit(s) were added to refs/heads/1.0.x by this push:
     new 18506e3  Fix references to master branch as main
18506e3 is described below

commit 18506e373d193a1feaa9ae5763b871602ee93e41
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Thu Mar 7 16:56:10 2024 +0100

    Fix references to master branch as main
    
    (cherry picked from commit a6b168b535bc86953c4a2c4d29a71df46a211be9)
---
 CONTRIBUTING.md                 | 4 ++--
 build.sbt                       | 2 +-
 project/ProjectAutoPlugin.scala | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index aeaf434..5e91d10 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 ## General Workflow
 
-This is the process for committing code into master.
+This is the process for committing code into main.
 
 1. For non-trivial changes, you will be asked to sign the [CLA](https://www.apache.org/licenses/contributor-agreements.html) if you have not done so before.
 2. Before starting to work on a feature or a fix, make sure that there is a ticket for your work in the [issue tracker](https://github.com/apache/incubator-pekko-persistence-jdbc/issues). If not, create it first.
@@ -25,7 +25,7 @@ For a Pull Request to be considered at all it has to meet these requirements:
 5. The commit messages must properly describe the changes, see [further below](#creating-commits-and-writing-commit-messages).
 6. Do not use ``@author`` tags since it does not encourage [Collective Code Ownership](http://www.extremeprogramming.org/rules/collective.html). Contributors get the credit they deserve in the release notes.
 
-If these requirements are not met then the code should **not** be merged into master, or even reviewed - regardless of how good or important it is. No exceptions.
+If these requirements are not met then the code should **not** be merged into main, or even reviewed - regardless of how good or important it is. No exceptions.
 
 ## Documentation
 
diff --git a/build.sbt b/build.sbt
index a9f7c3d..ca8cce1 100644
--- a/build.sbt
+++ b/build.sbt
@@ -83,7 +83,7 @@ lazy val docs = project
       "canonical.base_url" -> "https://pekko.apache.org/docs/pekko-persistence-jdbc/current",
       "pekko.version" -> "current",
       "slick.version" -> Dependencies.SlickVersion,
-      "extref.github.base_url" -> s"https://github.com/apache/incubator-pekko-persistence-jdbc/blob/${if (isSnapshot.value) "master"
+      "extref.github.base_url" -> s"https://github.com/apache/incubator-pekko-persistence-jdbc/blob/${if (isSnapshot.value) "main"
         else "v" + version.value}/%s",
       // Slick
       "extref.slick.base_url" -> s"https://scala-slick.org/doc/${Dependencies.SlickVersion}/%s",
diff --git a/project/ProjectAutoPlugin.scala b/project/ProjectAutoPlugin.scala
index 8353145..2e9005d 100644
--- a/project/ProjectAutoPlugin.scala
+++ b/project/ProjectAutoPlugin.scala
@@ -76,7 +76,7 @@ object ProjectAutoPlugin extends AutoPlugin {
       "-skip-packages",
       "pekko.pattern", // for some reason Scaladoc creates this
       "-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/apache/incubator-pekko-persistence-jdbc/tree/${branch}€{FILE_PATH_EXT}#L€{FILE_LINE}"
       },
       "-doc-canonical-base-url",


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org