diff --git a/.sdkmanrc b/.sdkmanrc index ac9cb65..71cfc9c 100644 --- a/.sdkmanrc +++ b/.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 diff --git a/NOTICE b/NOTICE index 928d729..0195d56 100644 --- a/NOTICE +++ b/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. diff --git a/gradle.properties b/gradle.properties index c5610c2..c048159 100644 --- a/gradle.properties +++ b/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 diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml index 069766e..30771bf 100644 --- a/grails-app/conf/application.yml +++ b/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: diff --git a/grails-app/i18n/messages.properties b/grails-app/i18n/messages.properties index 4155d37..2c925ee 100644 --- a/grails-app/i18n/messages.properties +++ b/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. diff --git a/grails-app/init/uk/ac/ox/softeng/maurodatamapper/application/Application.groovy b/grails-app/init/uk/ac/ox/softeng/maurodatamapper/application/Application.groovy index 48cac5e..a45f5af 100644 --- a/grails-app/init/uk/ac/ox/softeng/maurodatamapper/application/Application.groovy +++ b/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. diff --git a/grails-app/utils/uk/ac/ox/softeng/maurodatamapper/application/boot/RuntimeGrailsApplicationPostProcessor.groovy b/grails-app/utils/uk/ac/ox/softeng/maurodatamapper/application/boot/RuntimeGrailsApplicationPostProcessor.groovy index d409e1b..5498d40 100644 --- a/grails-app/utils/uk/ac/ox/softeng/maurodatamapper/application/boot/RuntimeGrailsApplicationPostProcessor.groovy +++ b/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.