From aa0229ff5827c29cf68dc687646066acb25d76d1 Mon Sep 17 00:00:00 2001 From: Pim van Nierop Date: Fri, 30 Jul 2021 14:01:27 +0200 Subject: [PATCH] Fix for hard-coded 'no-cache' in MSK docker images --- portal/pom.xml | 1 + portal/src/main/webapp/WEB-INF/web.xml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/portal/pom.xml b/portal/pom.xml index 0d8374ed469..a2b41dfe157 100644 --- a/portal/pom.xml +++ b/portal/pom.xml @@ -103,6 +103,7 @@ ${final.war.name} ${project.build.directory}/portal true + \ ${project.parent.basedir}/persistence/persistence-connections/src/main/resources diff --git a/portal/src/main/webapp/WEB-INF/web.xml b/portal/src/main/webapp/WEB-INF/web.xml index afc4fb444ea..3956944a745 100755 --- a/portal/src/main/webapp/WEB-INF/web.xml +++ b/portal/src/main/webapp/WEB-INF/web.xml @@ -24,11 +24,11 @@ spring.profiles.active - ${dbconnector:dbcp},${authenticate},${google.analytics.tracking:ga-api-tracking-disabled} + \${dbconnector:dbcp},\${authenticate},\${google.analytics.tracking:ga-api-tracking-disabled} spring.liveBeansView.mbeanDomain - ${dbconnector:dbcp},${authenticate} + \${dbconnector:dbcp},\${authenticate} @@ -38,7 +38,7 @@ webAppRootKey - ${app.name}.${timestamp} + \${app.name}.${timestamp}