From 3bf53a1a315f0bd9408c3d703f981eb326f6f38d Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <heliocastro@gmail.com>
Date: Fri, 11 Aug 2023 12:42:35 +0200
Subject: [PATCH] fix(docker): Use the recommend fix fro Liferay x Java

Signed-off-by: Helio Chissini de Castro <heliocastro@gmail.com>
---
 Dockerfile | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 217938b104..25d52df973 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -117,18 +117,12 @@ COPY --from=sw360thriftbuild /usr/local/bin/thrift /usr/local/bin/thrift
 # So when decide to use as development, only this last stage
 # is triggered by buildkit images
 
-FROM eclipse-temurin:11.0.19_7-jdk-jammy as sw360build
+FROM maven:3.9-eclipse-temurin-11 as sw360build
 
-# Thanks to Liferay, we need fix the java version
-ENV MAVEN_VERSION=3.9.4
-ENV MAVEN_HOME /usr/share/maven
-ARG BASE_URL=https://downloads.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
 ARG COUCHDB_HOST=localhost
 
-RUN set -eux; curl -fsSLO --compressed ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz
-RUN mkdir -p ${MAVEN_HOME} ${MAVEN_HOME}/ref \
-    && tar -xzf apache-maven-${MAVEN_VERSION}-bin.tar.gz -C ${MAVEN_HOME} --strip-components=1 \
-    && ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
+# Thanks to Liferay, we need fix the java version
+ENV _JAVA_OPTIONS='-Djdk.util.zip.disableZip64ExtraFieldValidation=true'
 
 WORKDIR /build