From 08dd8f3a6aca4ced2b7315b316f2e052e40af105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Mon, 26 Apr 2021 13:48:47 +0200
Subject: [PATCH] [all os] Updated maven from 3.6.3 to 3.8.1 (#3247)

---
 images/linux/scripts/installers/java-tools.sh       | 4 ++--
 images/win/scripts/Installers/Install-JavaTools.ps1 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh
index a5df5182..94c3252d 100644
--- a/images/linux/scripts/installers/java-tools.sh
+++ b/images/linux/scripts/installers/java-tools.sh
@@ -62,10 +62,10 @@ apt-fast install -y --no-install-recommends ant ant-optional
 echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment
 
 # Install Maven
-curl -sL https://www-eu.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip
+curl -sL https://www-eu.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.zip -o maven.zip
 unzip -qq -d /usr/share maven.zip
 rm maven.zip
-ln -s /usr/share/apache-maven-3.6.3/bin/mvn /usr/bin/mvn
+ln -s /usr/share/apache-maven-3.8.1/bin/mvn /usr/bin/mvn
 
 # Install Gradle
 # This script downloads the latest HTML list of releases at https://gradle.org/releases/.
diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1
index 085be394..f0f6f1b8 100644
--- a/images/win/scripts/Installers/Install-JavaTools.ps1
+++ b/images/win/scripts/Installers/Install-JavaTools.ps1
@@ -105,7 +105,7 @@ foreach ($jdkVersion in $jdkVersions) {
 # Install Java tools
 # Force chocolatey to ignore dependencies on Ant and Maven or else they will download the Oracle JDK
 Choco-Install -PackageName ant -ArgumentList "-i"
-Choco-Install -PackageName maven -ArgumentList "-i", "--version=3.6.3"
+Choco-Install -PackageName maven -ArgumentList "-i", "--version=3.8.1"
 Choco-Install -PackageName gradle
 
 # Move maven variables to Machine. They may not be in the environment for this script so we need to read them from the registry.