From 1cbea058249db750691ec74f1b3ba9a7b1605d26 Mon Sep 17 00:00:00 2001
From: Dibir Magomedsaygitov
 <61747324+dibir-magomedsaygitov@users.noreply.github.com>
Date: Fri, 27 Aug 2021 22:43:29 +0300
Subject: [PATCH] [Ubuntu] Rework Maven installation (#3973)

* rework maven installation

* resolve issues

* resolve issue with extracting latest maven version
---
 images/linux/scripts/installers/java-tools.sh | 7 ++++---
 images/linux/toolsets/toolset-1604.json       | 3 +--
 images/linux/toolsets/toolset-1804.json       | 3 +--
 images/linux/toolsets/toolset-2004.json       | 3 +--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh
index a78043a0..8067ef34 100644
--- a/images/linux/scripts/installers/java-tools.sh
+++ b/images/linux/scripts/installers/java-tools.sh
@@ -63,11 +63,12 @@ apt-fast install -y --no-install-recommends ant ant-optional
 echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment
 
 # Install Maven
-mavenVersion=$(get_toolset_value '.java.maven')
-mavenDownloadUrl="https://www-eu.apache.org/dist/maven/maven-3/${mavenVersion}/binaries/apache-maven-${mavenVersion}-bin.zip"
+json=$(curl -s "https://api.github.com/repos/apache/maven/tags")
+latestMavenVersion=$(echo $json | jq -r '.[] | select(.name | match("^(maven-[0-9.]*)$")) | .name' | head -1 | cut -d- -f2)
+mavenDownloadUrl="https://www-eu.apache.org/dist/maven/maven-3/${latestMavenVersion}/binaries/apache-maven-${latestMavenVersion}-bin.zip"
 download_with_retries $mavenDownloadUrl "/tmp" "maven.zip"
 unzip -qq -d /usr/share /tmp/maven.zip
-ln -s /usr/share/apache-maven-${mavenVersion}/bin/mvn /usr/bin/mvn
+ln -s /usr/share/apache-maven-${latestMavenVersion}/bin/mvn /usr/bin/mvn
 
 # Install Gradle
 # This script founds the latest gradle release from https://services.gradle.org/versions/all
diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json
index 613d0489..2021bc1f 100644
--- a/images/linux/toolsets/toolset-1604.json
+++ b/images/linux/toolsets/toolset-1604.json
@@ -72,8 +72,7 @@
         "default": "8",
         "versions": [
             "8", "11", "12"
-        ],
-        "maven": "3.8.1"
+        ]
     },
     "android": {
         "platform_min_version": "23",
diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index fb135f0b..8aeab69a 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -72,8 +72,7 @@
         "default": "8",
         "versions": [
             "8", "11", "12"
-        ],
-        "maven": "3.8.1"
+        ]
     },
     "android": {
         "platform_min_version": "23",
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index 812d556a..ca263e0d 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -72,8 +72,7 @@
         "default": "11",
         "versions": [
             "8", "11"
-        ],
-        "maven": "3.8.1"
+        ]
     },
     "android": {
         "platform_min_version": "27",