From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Sat, 31 Dec 2022 22:35:57 +0000 (+0100)
Subject: Merge branch 'main' of https://github.tools.sap/E-Mobility/mbt-docker into multiple... 
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=2749a7d8209981e773782ba2feb935ebef4b7d49;hp=c8a3e45a4bc2cab98c0cd2743a1af55cae1783cc;p=mbt-docker.git

Merge branch 'main' of https://github.tools.sap/E-Mobility/mbt-docker into multiple-images
---

diff --git a/.xmake.cfg b/.xmake.cfg
index e37cc59..ce12634 100644
--- a/.xmake.cfg
+++ b/.xmake.cfg
@@ -1,5 +1,5 @@
 [xmake]
-version=1.0.12
+version=1.0.13
 # https://github.wdf.sap.corp/pages/xmake-ci/User-Guide/Setting_up_a_Build/Release_Procedure/Release_Versions/
 
 [buildplugin]
diff --git a/Dockerfile b/Dockerfile
index 31a4e8e..db0ef52 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -168,7 +168,7 @@ RUN sapmachine_install() { \
   # smoke test
   && java -version
 
-ARG MAVEN_VERSION=3.8.6
+ARG MAVEN_VERSION=3.8.7
 ARG BASE_URL=https://downloads.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
 
 ENV MAVEN_HOME /usr/share/maven