Merge branch 'release/5.3.0' into main

.sdkmanrc

@@ -1,6 +1,6 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=17.0.3-tem
+java=17.0.6-tem
 gradle=7.3.3
-grails=5.1.9
-groovy=3.0.10
+grails=5.3.2
+groovy=3.0.11

NOTICE

@@ -1,4 +1,4 @@
-Copyright 2020-2022 University of Oxford and Health and Social Care Information Centre, also known as NHS Digital
+Copyright 2020-2023 University of Oxford and NHS England
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

gradle.properties

@@ -1,5 +1,5 @@
 # Core Info
-version=5.2.0
+version=5.3.0
 group=uk.ac.ox.softeng.maurodatamapper
 # Gradle
 gradleVersion=7.3.3
@@ -11,17 +11,18 @@ sourceCompatibility=17
 targetCompatibility=17
 # Deployment & Build
 artifactory_contextUrl=https://jenkins.cs.ox.ac.uk/artifactory
-mdmGradlePluginVersion=1.1.0
+mdmGradlePluginVersion=1.3.0
 licenseGradlePluginVersion=0.16.1
 # Grails
-grailsVersion=5.1.9
-grailsGradlePluginVersion=5.1.5
-groovyVersion=3.0.10
-grailsHibernate5Version=7.2.2
-grailsViewsVersion=2.2.0
-assetPipelineVersion=3.4.6
+grailsVersion=5.3.2
+grailsGradlePluginVersion=5.3.0
+groovyVersion=3.0.11
+grailsHibernate5Version=7.3.0
+grailsViewsVersion=2.3.2
+assetPipelineVersion=4.0.0
 jaxbApiVersion=2.3.1
-springBootVersion=2.6.7
+springBootVersion=2.7.8
+micronaut=3.8.4
 
 ## v2.2.1 includes a logback.xml file which needs to be removed before we can update
 #views-json.version=2.2.0

grails-app/conf/application.yml

@@ -120,6 +120,16 @@ grails:
             prettyPrint: false
             autoIndent: false
             autoNewLine: false
+    databinding:
+        dateFormats:
+            - "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"
+            - "yyyy-MM-dd'T'HH:mm:ss.SSXXX"
+            - "yyyy-MM-dd'T'HH:mm:ss.SXXX"
+            - "yyyy-MM-dd'T'HH:mm:ssXXX"
+            - 'yyyy-MM-dd HH:mm:ss.S'
+            - "yyyy-MM-dd'T'HH:mm:ss'Z'"
+            - "yyyy-MM-dd HH:mm:ss.S z"
+            - "yyyy-MM-dd"
 ---
 hibernate:
     cache:

grails-app/i18n/messages.properties

@@ -1,5 +1,5 @@
 #
-# Copyright 2020-2022 University of Oxford and Health and Social Care Information Centre, also known as NHS Digital
+# Copyright 2020-2023 University of Oxford and NHS England
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

grails-app/init/uk/ac/ox/softeng/maurodatamapper/application/Application.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 University of Oxford and Health and Social Care Information Centre, also known as NHS Digital
+ * Copyright 2020-2023 University of Oxford and NHS England
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

grails-app/utils/uk/ac/ox/softeng/maurodatamapper/application/boot/RuntimeGrailsApplicationPostProcessor.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 University of Oxford and Health and Social Care Information Centre, also known as NHS Digital
+ * Copyright 2020-2023 University of Oxford and NHS England
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.