From 5e9b4ce08c3ab082a69d9a37c633f3f70746b422 Mon Sep 17 00:00:00 2001
From: cezary-witkowski <cezary.witkowski@hyland.com>
Date: Fri, 15 Nov 2024 11:59:48 +0100
Subject: [PATCH] [ACS-5768] Updated jolokia to current newest version and
 removed tomcat migrate.sh workaround script usage

---
 tests/environment/alfresco-with-jolokia/Dockerfile | 3 +--
 tests/pipeline-all-amps/repo/Dockerfile            | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/environment/alfresco-with-jolokia/Dockerfile b/tests/environment/alfresco-with-jolokia/Dockerfile
index 7896e5f204..5297b6899a 100644
--- a/tests/environment/alfresco-with-jolokia/Dockerfile
+++ b/tests/environment/alfresco-with-jolokia/Dockerfile
@@ -1,14 +1,13 @@
 # BUILD STAGE
 FROM alfresco/alfresco-content-repository:latest AS JOLOKIABUILDER
 
-ARG JOLOKIA_VER=1.6.2
+ARG JOLOKIA_VER=2.1.2
 ARG TOMCAT_DIR=/usr/local/tomcat
 
 USER root
 RUN yum install -y curl-minimal unzip && \
     mkdir -p /build/jolokia && \
     curl -o /build/jolokia-jee.war https://repo1.maven.org/maven2/org/jolokia/jolokia-war-unsecured/${JOLOKIA_VER}/jolokia-war-unsecured-${JOLOKIA_VER}.war && \
-    ${TOMCAT_DIR}/bin/migrate.sh /build/jolokia-jee.war /build/jolokia.war && \
     unzip -q /build/jolokia.war -d /build/jolokia && chmod -R g+r,g-w,o= /build
 
 # ACTUAL IMAGE
diff --git a/tests/pipeline-all-amps/repo/Dockerfile b/tests/pipeline-all-amps/repo/Dockerfile
index 01e4894f5d..6b59a34863 100644
--- a/tests/pipeline-all-amps/repo/Dockerfile
+++ b/tests/pipeline-all-amps/repo/Dockerfile
@@ -1,11 +1,11 @@
 ARG BASE_IMAGE
 # BUILD STAGE SWAGGERBUILDER
-FROM debian:11-slim AS SWAGGERBUILDER
+FROM alfresco/alfresco-enterprise-repo-base:latest AS SWAGGERBUILDER
 
-ARG JOLOKIA_VER=1.6.2
+ARG JOLOKIA_VER=2.1.2
 
-RUN DEBIAN_FRONTEND=noninteractive; \
-    apt-get update -yqq && apt-get -yqq install curl unzip && \
+USER root
+RUN yum install -y curl unzip && \
     mkdir -p /build/{api-explorer,gs-api-explorer,jolokia} && \
     curl -o /build/jolokia.war https://repo1.maven.org/maven2/org/jolokia/jolokia-war-unsecured/${JOLOKIA_VER}/jolokia-war-unsecured-${JOLOKIA_VER}.war && \
     unzip -q /build/jolokia.war -d /build/jolokia