Merge branch 'release/B5.0.0_F7.0.0' into main

.env

@@ -8,8 +8,8 @@
 # 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=4.10.0
-MDM_UI_COMMIT=6.6.0
+MDM_APPLICATION_COMMIT=4.11.0
+MDM_UI_COMMIT=6.7.0
 
 # Change this to alter the port MDM is published to
 MDM_PORT=8082

.env.cd

@@ -15,4 +15,7 @@ MDM_UI_COMMIT=develop
 MDM_PORT=9000
 
 # Change this to change the tag assigned to the built docker mdm image
-MDM_TAG=continuous-development
+MDM_TAG=continuous-development
+
+# Change this to force a pull and rebuild of the codebase
+CACHE_BURST=1

.gitignore

@@ -201,4 +201,5 @@ local.properties
 .worksheet
 
 src/main/resources/*.properties
-shared_volumes/logs
+shared_volumes/*
+mauro-data-mapper/mdm-ui/*

docker-compose.yml

@@ -14,10 +14,11 @@ services:
         build:
             context: mauro-data-mapper
             args:
-                MDM_APPLICATION_COMMIT: 4.11.0
-                MDM_UI_COMMIT: 6.7.0
+                MDM_APPLICATION_COMMIT: 5.0.0
+                MDM_UI_COMMIT: 7.0.0
                 ADDITIONAL_PLUGINS: ""
                 MDM_UI_THEME_NAME: "default"
+                CACHE_BURST: "${CACHE_BURST}"
         environment:
             PGPASSWORD: postgresisawesome
             runtime.config.path: /usr/local/tomcat/conf/runtime.yml

mauro-data-mapper/Dockerfile

@@ -1,6 +1,6 @@
 
-ARG MDM_BASE_IMAGE_VERSION=grails-4.0.6-jdk12-node-14.16-npm-7.11.R2
-ARG TOMCAT_IMAGE_VERSION=9.0.27-jdk12-adoptopenjdk-openj9.R2
+ARG MDM_BASE_IMAGE_VERSION=grails-5.1.2-jdk17.0.1_12-node-14.18.1-npm-8.3.0
+ARG TOMCAT_IMAGE_VERSION=9.0.58-jre17-temurin
 
 FROM maurodatamapper/mdm_base:$MDM_BASE_IMAGE_VERSION AS mdm-build
 LABEL maintainer="Oliver Freeman <oliver.freeman@bdi.ox.ac.uk>"
@@ -25,6 +25,9 @@ RUN cd "$MDM_UI_HOME" && git fetch && git checkout "$MDM_UI_COMMIT" && if [[ `gi
 # Copy in build.yml
 COPY config/build.yml $MDM_APPLICATION_HOME/grails-app/conf/build.yml
 
+# Allow customisation of the UI
+COPY mdm-ui $MDM_UI_HOME/
+
 # Build the front and back ends
 # The front end build will try to use precompiled sources or it will build locally from the given commit/tagU
 RUN build_frontend.sh

mauro-data-mapper/config/build.yml

@@ -22,8 +22,8 @@ simplejavamail:
     smtp:
         username: ''
         password: ''
-        host: smtp.gmail.com
-        port: 587
+        host: ''
+        port: ''
     transportstrategy: SMTP_TLS
 ---
 # mdm-plugin-email-proxy Configuration
@@ -39,13 +39,17 @@ grails:
     cors:
         enabled: true
         # The following are the defaults
-        allowedOrigins: [ '*' ]
+        # allowedOrigins: [] # Cannot use allowedOrigins with *, they have to be clearly stated origins
+        allowedOriginPatterns: [ '*' ]
         allowedMethods: [ 'GET', 'POST', 'PUT', 'DELETE', 'OPTIONS', 'HEAD' ]
         allowedHeaders: [ 'origin', 'content-type', 'accept', 'authorization', 'pragma', 'cache-control' ]
         #exposedHeaders: null
         #maxAge: 1800
         #allowCredentials: true
+    assets:
+        mapping: 'api_assets'
 hibernate:
     search:
-        default:
-            indexBase: '/lucene'
+        backend:
+            directory:
+                root: '/lucene'