Merge branch 'release/5.3.0' into main

MauroDataMapper · Feb 23, 2023 · 4368bf0 · 4368bf0
2 parents 615ea4e + b2939ea
commit 4368bf0
Show file tree

Hide file tree

Showing 1,344 changed files with 4,243 additions and 2,069 deletions.
diff --git 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
@@ -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
@@ -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,15 +11,17 @@ sourceCompatibility=17
 targetCompatibility=17
 # Deployment & Build
 artifactory_contextUrl=https://jenkins.cs.ox.ac.uk/artifactory
-mdmGradlePluginVersion=1.2.0
+mdmGradlePluginVersion=1.3.0
 # Explode all plugins
 exploded=true
 # 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
+# Previous mdm-core version for finding mdm-bom if current version not published yet
+fallbackMdmCoreVersion=5.3.0-SNAPSHOT
diff --git a/mdm-bom/build.gradle b/mdm-bom/build.gradle
@@ -106,6 +106,8 @@ dependencies {
         api group: 'com.bertramlabs.plugins', name: 'asset-pipeline-core', version: assetPipeline
         api "org.javassist:javassist:$javaAssist"
 
+        api group: 'io.micronaut', name: 'micronaut-aop', version: micronaut
+
         api group: 'org.slf4j', name: 'slf4j-api', version: slf4j
         api group: 'ch.qos.logback', name: 'logback-classic', version: logback
 

diff --git a/mdm-bom/gradle.properties b/mdm-bom/gradle.properties
@@ -1,39 +1,39 @@
-grails=5.1.9
-grailsGradlePlugin=5.1.5
-groovy=3.0.10
-grailsHibernate5=7.2.2
-grailsViews=2.2.0
+grails=5.3.2
+grailsGradlePlugin=5.3.0
+groovy=3.0.11
+grailsHibernate5=7.3.0
+grailsViews=2.3.2
 hibernateSearch=3.0.0-SNAPSHOT
-hibernateSearchOrm=6.0.9.Final
-lucene=8.7.0
-assetPipeline=3.4.6
-springBoot=2.6.7
-spotbugsAnnotation=4.7.0
-commonsText=1.9
-commonsCsv=1.9.0
+hibernateSearchOrm=6.1.8.Final
+lucene=8.11.2
+assetPipeline=4.0.0
+springBoot=2.7.8
+spotbugsAnnotation=4.7.3
+commonsText=1.10.0
+commonsCsv=1.10.0
 javaMail=6.7.6
 guava=31.1-jre
 commonsBeanutils=1.9.4
 jaxbApi=2.3.1
-commonsRng=1.4
-javaAssist=3.29.0-GA
-jsonunit=2.35.0
+commonsRng=1.5
+javaAssist=3.29.2-GA
+jsonunit=2.36.1
 ## BOM Overrides
-hibernate=5.6.8.Final
+hibernate=5.6.11.Final
 logback=1.2.11
 slf4j=1.7.36
-spring-framework=5.3.19
-hibernate-validator=6.2.3.Final
+spring-framework=5.3.25
+hibernate-validator=6.2.5.Final
 #testingSupport=2.4.1
-#micronaut=3.3.4
+micronaut=3.8.4
 #jackson-bom=2.13.2.20220328
 #log4j2=2.17.2
 #junit-jupiter=5.8.2
 #xmlunit2=2.8.4
 # v2.2.1 includes a logback.xml file which needs to be removed before we can update
-views-json=2.2.0
-views-markup=2.2.0
-views-json-testing-support=2.2.0
-views-json-templates=2.2.0
+views-json=2.3.2
+views-markup=2.3.2
+views-json-testing-support=2.3.2
+views-json-templates=2.3.2
 # This really needs updating ASAP but the v5/v6 builds have issues
 cache=4.0.3
diff --git a/.../main/groovy/uk/ac/ox/softeng/maurodatamapper/api/exception/ApiBadRequestException.groovy b/.../main/groovy/uk/ac/ox/softeng/maurodatamapper/api/exception/ApiBadRequestException.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/...common/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/api/exception/ApiException.groovy b/...common/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/api/exception/ApiException.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/...rc/main/groovy/uk/ac/ox/softeng/maurodatamapper/api/exception/ApiInternalException.groovy b/...rc/main/groovy/uk/ac/ox/softeng/maurodatamapper/api/exception/ApiInternalException.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/...ain/groovy/uk/ac/ox/softeng/maurodatamapper/api/exception/ApiInvalidModelException.groovy b/...ain/groovy/uk/ac/ox/softeng/maurodatamapper/api/exception/ApiInvalidModelException.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/...roovy/uk/ac/ox/softeng/maurodatamapper/api/exception/ApiNotYetImplementedException.groovy b/...roovy/uk/ac/ox/softeng/maurodatamapper/api/exception/ApiNotYetImplementedException.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/...ain/groovy/uk/ac/ox/softeng/maurodatamapper/api/exception/ApiUnauthorizedException.groovy b/...ain/groovy/uk/ac/ox/softeng/maurodatamapper/api/exception/ApiUnauthorizedException.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/mdm-common/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/common/CommonPlugin.groovy b/mdm-common/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/common/CommonPlugin.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/mdm-common/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/gorm/HQLPagedResultList.groovy b/mdm-common/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/gorm/HQLPagedResultList.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/...mmon/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/gorm/InMemoryPagedResultList.groovy b/...mmon/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/gorm/InMemoryPagedResultList.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.
@@ -28,8 +28,8 @@ class InMemoryPagedResultList<E> extends PagedResultList<E> {
         totalCount = results.size()
         this.pagination = pagination
 
-        Integer max = pagination.max ?: 10
-        Integer offset = pagination.offset ?: 0
+        Integer max = pagination.max?.toInteger() ?: 10
+        Integer offset = pagination.offset?.toInteger() ?: 0
         resultList = results.subList(Math.min(totalCount, offset), Math.min(totalCount, offset + max))
     }
 

diff --git a/...oovy/uk/ac/ox/softeng/maurodatamapper/gorm/constraint/callable/CallableConstraints.groovy b/...oovy/uk/ac/ox/softeng/maurodatamapper/gorm/constraint/callable/CallableConstraints.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/...ovy/uk/ac/ox/softeng/maurodatamapper/gorm/constraint/callable/MdmDomainConstraints.groovy b/...ovy/uk/ac/ox/softeng/maurodatamapper/gorm/constraint/callable/MdmDomainConstraints.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/...teng/maurodatamapper/gorm/constraint/validator/ParentOwnedLabelCollectionValidator.groovy b/...teng/maurodatamapper/gorm/constraint/validator/ParentOwnedLabelCollectionValidator.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/...y/uk/ac/ox/softeng/maurodatamapper/gorm/constraint/validator/UniqueStringValidator.groovy b/...y/uk/ac/ox/softeng/maurodatamapper/gorm/constraint/validator/UniqueStringValidator.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/...y/uk/ac/ox/softeng/maurodatamapper/gorm/constraint/validator/UniqueValuesValidator.groovy b/...y/uk/ac/ox/softeng/maurodatamapper/gorm/constraint/validator/UniqueValuesValidator.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/...c/main/groovy/uk/ac/ox/softeng/maurodatamapper/gorm/constraint/validator/Validator.groovy b/...c/main/groovy/uk/ac/ox/softeng/maurodatamapper/gorm/constraint/validator/Validator.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/mdm-common/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/hibernate/PathUserType.groovy b/mdm-common/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/hibernate/PathUserType.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/.../src/main/groovy/uk/ac/ox/softeng/maurodatamapper/hibernate/PathUserTypeDescriptor.groovy b/.../src/main/groovy/uk/ac/ox/softeng/maurodatamapper/hibernate/PathUserTypeDescriptor.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/mdm-common/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/hibernate/VersionUserType.groovy b/mdm-common/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/hibernate/VersionUserType.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/...c/main/groovy/uk/ac/ox/softeng/maurodatamapper/hibernate/VersionUserTypeDescriptor.groovy b/...c/main/groovy/uk/ac/ox/softeng/maurodatamapper/hibernate/VersionUserTypeDescriptor.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/...n/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/hibernate/search/CallableSearch.groovy b/...n/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/hibernate/search/CallableSearch.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/.../src/main/groovy/uk/ac/ox/softeng/maurodatamapper/hibernate/search/HibernateSearch.groovy b/.../src/main/groovy/uk/ac/ox/softeng/maurodatamapper/hibernate/search/HibernateSearch.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/...y/uk/ac/ox/softeng/maurodatamapper/hibernate/search/PaginatedHibernateSearchResult.groovy b/...y/uk/ac/ox/softeng/maurodatamapper/hibernate/search/PaginatedHibernateSearchResult.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.
@@ -59,8 +59,9 @@ class PaginatedHibernateSearchResult<K> {
 
         Integer max = pagination.max?.toInteger()
         Integer offsetAmount = pagination.offset?.toInteger()
-        String sortKey = pagination.sort
+        String sortKey = pagination.sort ?: 'label'
         String order = pagination.order ?: 'asc'
+        Boolean ignoreCase = pagination.ignoreCase ? pagination.ignoreCase.toBoolean() : true
 
         List<D> sortedList = new ArrayList<>(fullResultSet)
         if ('distance' == sortKey) {
@@ -75,6 +76,14 @@ class PaginatedHibernateSearchResult<K> {
                 default:
                     log.warn('Unknown sortfield for distance sorting {}', sortField)
             }
+        } else if (sortKey && ignoreCase) {
+            sortedList = fullResultSet.sort {a, b ->
+                if (order == 'asc') {
+                    a."$sortKey".compareToIgnoreCase(b."${sortKey}") ?: a."$sortKey".compareTo(b."${sortKey}")
+                } else {
+                    b."$sortKey".compareToIgnoreCase(a."${sortKey}") ?: b."$sortKey".compareTo(a."${sortKey}")
+                }
+            }
         } else if (sortKey) {
             sortedList = fullResultSet.sort {a, b ->
                 if (order == 'asc') {

diff --git a/...urodatamapper/hibernate/search/backend/lucene/analysis/MdmLuceneAnalysisConfigurer.groovy b/...urodatamapper/hibernate/search/backend/lucene/analysis/MdmLuceneAnalysisConfigurer.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/...k/ac/ox/softeng/maurodatamapper/hibernate/search/comparator/PathDistanceComparator.groovy b/...k/ac/ox/softeng/maurodatamapper/hibernate/search/comparator/PathDistanceComparator.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/.../maurodatamapper/hibernate/search/engine/search/predicate/ExcludedIdsFilterFactory.groovy b/.../maurodatamapper/hibernate/search/engine/search/predicate/ExcludedIdsFilterFactory.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/.../ox/softeng/maurodatamapper/hibernate/search/engine/search/predicate/FilterFactory.groovy b/.../ox/softeng/maurodatamapper/hibernate/search/engine/search/predicate/FilterFactory.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/...maurodatamapper/hibernate/search/engine/search/predicate/IdPathSecureFilterFactory.groovy b/...maurodatamapper/hibernate/search/engine/search/predicate/IdPathSecureFilterFactory.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/...eng/maurodatamapper/hibernate/search/engine/search/predicate/IdSecureFilterFactory.groovy b/...eng/maurodatamapper/hibernate/search/engine/search/predicate/IdSecureFilterFactory.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/...datamapper/hibernate/search/mapper/orm/mapping/MdmHibernateSearchMappingConfigurer.groovy b/...datamapper/hibernate/search/mapper/orm/mapping/MdmHibernateSearchMappingConfigurer.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/...c/ox/softeng/maurodatamapper/hibernate/search/mapper/pojo/bridge/DomainClassBridge.groovy b/...c/ox/softeng/maurodatamapper/hibernate/search/mapper/pojo/bridge/DomainClassBridge.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/...x/softeng/maurodatamapper/hibernate/search/mapper/pojo/bridge/OffsetDateTimeBridge.groovy b/...x/softeng/maurodatamapper/hibernate/search/mapper/pojo/bridge/OffsetDateTimeBridge.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/.../ox/softeng/maurodatamapper/hibernate/search/mapper/pojo/bridge/PathPropertyBridge.groovy b/.../ox/softeng/maurodatamapper/hibernate/search/mapper/pojo/bridge/PathPropertyBridge.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/...c/ox/softeng/maurodatamapper/hibernate/search/mapper/pojo/bridge/binder/PathBinder.groovy b/...c/ox/softeng/maurodatamapper/hibernate/search/mapper/pojo/bridge/binder/PathBinder.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/mdm-common/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/log/SqlLogger.groovy b/mdm-common/src/main/groovy/uk/ac/ox/softeng/maurodatamapper/log/SqlLogger.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.