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

diff --git a/.xmake.cfg b/.xmake.cfg
index e37cc59c026164143fa73f805d6bbb947132d47f..ce126340a730beda045abd6deb2bc0fe93293496 100644 (file)
--- 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 31a4e8e4ed247118fa18c5a81d07c1ef887c493e..db0ef52f8ede069f109e9708c08ad675b932c5f3 100644 (file)
--- 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