Merge pull request #75 from hmrc/BDOG-657b

Bdog 657b

LICENSE

@@ -1,4 +1,5 @@
-Apache License
+
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -178,15 +179,15 @@ Apache License
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
+      boilerplate notice, with the fields enclosed by brackets "[]"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2014 HM Revenue & Customs
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -199,4 +200,3 @@ Apache License
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-

project/LibraryDependencies.scala

@@ -8,7 +8,7 @@ object LibraryDependencies {
   val compile: Seq[ModuleID] = PlayCrossCompilation.dependencies(
     shared = Seq(
       "com.github.nscala-time" %% "nscala-time"   % "2.22.0",
-      "org.reactivemongo"      %% "reactivemongo" % "0.18.8",
+      "org.reactivemongo"      %% "reactivemongo" % "0.19.7",
       // force commons-codec to avoid 1.13 and 1.14 until 1.15 is available
       // see JIRA ticket BDOG-612
       "commons-codec"          %  "commons-codec" % "1.12" force()
@@ -17,7 +17,7 @@ object LibraryDependencies {
       "org.slf4j"         % "slf4j-api"                % "1.7.26",
       "org.slf4j"         % "log4j-over-slf4j"         % "1.7.26",
       "com.typesafe.play" %% "play"                    % play25Version,
-      "org.reactivemongo" %% "reactivemongo-play-json" % "0.18.8-play25",
+      "org.reactivemongo" %% "reactivemongo-play-json" % "0.19.7-play25",
       // force dependencies due to security flaws found in jackson-databind < 2.9.x using XRay
       "com.fasterxml.jackson.core"     % "jackson-core"            % "2.9.8",
       "com.fasterxml.jackson.core"     % "jackson-databind"        % "2.9.8",
@@ -32,7 +32,7 @@ object LibraryDependencies {
       "org.slf4j"         % "log4j-over-slf4j"         % "1.7.26",
       "com.typesafe.play" %% "play"                    % play26Version,
       "com.typesafe.play" %% "play-guice"              % play26Version,
-      "org.reactivemongo" %% "reactivemongo-play-json" % "0.18.8-play26"
+      "org.reactivemongo" %% "reactivemongo-play-json" % "0.19.7-play26"
     )
   )
 

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.18
+sbt.version=1.3.8

project/plugins.sbt

@@ -3,10 +3,10 @@ resolvers += Resolver.url("hmrc-sbt-plugin-releases", url("https://dl.bintray.co
 
 resolvers += Resolver.bintrayRepo("hmrc", "releases")
 
-addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "1.13.0")
+addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "2.6.0")
 
-addSbtPlugin("uk.gov.hmrc" % "sbt-git-versioning" % "1.15.0")
+addSbtPlugin("uk.gov.hmrc" % "sbt-git-versioning" % "2.1.0")
 
-addSbtPlugin("uk.gov.hmrc" % "sbt-artifactory" % "0.17.0")
+addSbtPlugin("uk.gov.hmrc" % "sbt-artifactory" % "1.2.0")
 
-addSbtPlugin("uk.gov.hmrc" % "sbt-play-cross-compilation" % "0.15.0")
+addSbtPlugin("uk.gov.hmrc" % "sbt-play-cross-compilation" % "0.19.0")

src/main/play-26/play/modules/reactivemongo/ValueFinder.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 HM Revenue & Customs
+ * Copyright 2020 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.