Merge branch 'release/2023.1' into main

.env

@@ -8,11 +8,11 @@
 # 1. a tagged release e.g. 4.10.0
 # 2. a branch e.g. main or develop
 # 3. a git commit hash
-MDM_APPLICATION_COMMIT=5.2.0
-MDM_UI_COMMIT=7.2.0
+MDM_APPLICATION_COMMIT=5.3.0
+MDM_UI_COMMIT=7.3.0
 
 # Change this to alter the port MDM is published to
 MDM_PORT=8082
 
 # Change this to change the tag assigned to the built docker mdm image
-MDM_TAG=2022.3
+MDM_TAG=2023.1

NOTICE

@@ -1,4 +1,4 @@
-Copyright 2020 University of Oxford
+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.

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.8'
 services:
     postgres:
-        image: "maurodatamapper/postgres:12.0-alpine"
+        image: "maurodatamapper/postgres:12.14-alpine"
         build: ./postgres
         shm_size: 512mb
         environment:

mauro-data-mapper/Dockerfile

@@ -1,6 +1,6 @@
 
-ARG MDM_BASE_IMAGE_VERSION=grails-5.1.9-jdk17.0.3_7-node-14.18.1-npm-8.3.0.R2
-ARG TOMCAT_IMAGE_VERSION=9.0.65-jre17-temurin
+ARG MDM_BASE_IMAGE_VERSION=grails-5.3.2-jdk17.0.6_10-node-16.10.0-npm-8.3.0
+ARG TOMCAT_IMAGE_VERSION=9.0.71-jre17-temurin
 
 FROM maurodatamapper/mdm_base:$MDM_BASE_IMAGE_VERSION AS mdm-build
 LABEL org.opencontainers.image.authors="Oliver Freeman <[email protected]>, Joe Crawford <[email protected]>"

postgres/Dockerfile

@@ -1,4 +1,4 @@
-FROM postgres:12.10-alpine
+FROM postgres:12.14-alpine
 COPY fixtures /docker-entrypoint-initdb.d
 
 ENV POSTGRES_PASSWORD=postgresisawesome \