Merge branch 'master' into version-bump-112116018681

.github/mergify.yml

@@ -6,7 +6,7 @@ queue_rules:
 pull_request_rules:
   - name: automatic merge for Scala Steward
     conditions:
-      - author=tna-digital-archiving-jenkins
+      - author=tna-da-bot
       - "check-success=test"
       - "check-success=security/snyk (nationalarchives)"
       - or:

.github/scripts/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-git config --global user.email [email protected]
-git config --global user.name tna-digital-archiving-jenkins
+git config --global [email protected]
+git config --global user.name tna-da-bot
 git checkout -b $BRANCH_NAME
 git push -u origin $BRANCH_NAME
 mkdir -p src/main/resources

build.sbt

@@ -25,9 +25,9 @@ scmInfo := Some(
 
 developers := List(
   Developer(
-    id    = "tna-digital-archiving-jenkins",
+    id    = "tna-da-bot",
     name  = "TNA Digital Archiving",
-    email = "digitalpreservation@nationalarchives.gov.uk",
+    email = "s-GitHubDABot@nationalarchives.gov.uk",
     url   = url("https://github.com/nationalarchives/tdr-generated-grapqhl")
   )
 )