diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e3d20cab..a4aafbb6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,6 +31,6 @@ This is the process for a contributor (that is, a non Anorm core developer) to c 3. Ensure that your commits are squashed. See [working with git](https://playframework.com/documentation/latest/WorkingWithGit) for more information. 4. Submit a pull request. -If the pull request does not meet the above requirements then the code should **not** be merged into master, or even reviewed - regardless of how good or important it is. No exceptions. +If the pull request does not meet the above requirements then the code should **not** be merged into main, or even reviewed - regardless of how good or important it is. No exceptions. The pull request will be reviewed according to the [implementation decision process](https://playframework.com/community-process#Implementation-decisions). \ No newline at end of file diff --git a/Migration25.md b/Migration25.md index 18bf0de7..b27e1946 100644 --- a/Migration25.md +++ b/Migration25.md @@ -1,6 +1,6 @@ # Anorm 2.5 Migration Guide -This is a guide for migrating from Anorm 2.4 to Anorm 2.5. If you need to migrate from an earlier version of Anorm then you must first follow the [Anorm 2.4 Migration Guide](https://github.com/playframework/anorm/blob/master/Migration24.md#anorm-24-migration-guide). +This is a guide for migrating from Anorm 2.4 to Anorm 2.5. If you need to migrate from an earlier version of Anorm then you must first follow the [Anorm 2.4 Migration Guide](https://github.com/playframework/anorm/blob/main/Migration24.md#anorm-24-migration-guide). ## Type safety diff --git a/Migration26.md b/Migration26.md index ca1ad346..5104cb7e 100644 --- a/Migration26.md +++ b/Migration26.md @@ -1,6 +1,6 @@ # Anorm 2.6 Migration Guide -This is a guide for migrating from Anorm 2.5 to Anorm 2.6. If you need to migrate from an earlier version of Anorm then you must first follow the [Anorm 2.5 Migration Guide](https://github.com/playframework/anorm/blob/master/Migration25.md#anorm-25-migration-guide). +This is a guide for migrating from Anorm 2.5 to Anorm 2.6. If you need to migrate from an earlier version of Anorm then you must first follow the [Anorm 2.5 Migration Guide](https://github.com/playframework/anorm/blob/main/Migration25.md#anorm-25-migration-guide). **Note:** The dependency group has been updated from `com.typesafe.play` to `org.playframework.anorm`. diff --git a/README.md b/README.md index 39ea3ef0..8ca3ca60 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ To run the tests, use: sbt test -[CircleCI](https://circleci.com/gh/playframework/anorm): ![CircleCI build status](https://circleci.com/gh/playframework/anorm.png?branch=master) +[CircleCI](https://circleci.com/gh/playframework/anorm): ![CircleCI build status](https://circleci.com/gh/playframework/anorm.png?branch=main) ## Documentation diff --git a/build.sbt b/build.sbt index b389c89e..5c5bee5c 100644 --- a/build.sbt +++ b/build.sbt @@ -304,4 +304,4 @@ lazy val docs = project.in(file("docs")) Scapegoat.settings -ThisBuild / playBuildRepoName := "anorm" \ No newline at end of file +ThisBuild / playBuildRepoName := "anorm" diff --git a/core/src/main/scala/anorm/Column.scala b/core/src/main/scala/anorm/Column.scala index 0e9134ef..261ef01c 100644 --- a/core/src/main/scala/anorm/Column.scala +++ b/core/src/main/scala/anorm/Column.scala @@ -24,7 +24,7 @@ import resource.managed * @define mapDescription If the column is successfully parsed, then apply the given function on the result. */ @annotation.implicitNotFound( - "No column extractor found for the type ${A}: `anorm.Column[${A}]` required; See https://github.com/playframework/anorm/blob/master/docs/manual/working/scalaGuide/main/sql/ScalaAnorm.md#column-parsers") + "No column extractor found for the type ${A}: `anorm.Column[${A}]` required; See https://github.com/playframework/anorm/blob/main/docs/manual/working/scalaGuide/main/sql/ScalaAnorm.md#column-parsers") trait Column[A] extends ((Any, MetaDataItem) => Either[SqlRequestError, A]) { parent => /** diff --git a/core/src/main/scala/anorm/ParameterMetaData.scala b/core/src/main/scala/anorm/ParameterMetaData.scala index 4e40f80d..0b59a1ec 100644 --- a/core/src/main/scala/anorm/ParameterMetaData.scala +++ b/core/src/main/scala/anorm/ParameterMetaData.scala @@ -17,7 +17,7 @@ import java.lang.{ import java.sql.{ Timestamp, Types } /** Parameter meta data for type `T` */ -@annotation.implicitNotFound("Meta data not found for parameter of type ${T}: `anorm.ParameterMetaData[${T}]` required; See https://github.com/playframework/anorm/blob/master/docs/manual/working/scalaGuide/main/sql/ScalaAnorm.md#parameters") +@annotation.implicitNotFound("Meta data not found for parameter of type ${T}: `anorm.ParameterMetaData[${T}]` required; See https://github.com/playframework/anorm/blob/main/docs/manual/working/scalaGuide/main/sql/ScalaAnorm.md#parameters") trait ParameterMetaData[T] { /** * Name of SQL type (see `java.sql.Types`)