From c161416ac88327a4362f4fb8b3413fea4fe9289b Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com>
Date: Mon, 4 Oct 2021 10:19:24 +0300
Subject: [PATCH] Revert "[Ubuntu] java: do not use the github tag release
 (#4182)" (#4213)

This reverts commit 1d9156313991640f6c5232a258ffbcf84b69978c.
---
 images/linux/scripts/installers/java-tools.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh
index fbc5f6b13..8067ef348 100644
--- a/images/linux/scripts/installers/java-tools.sh
+++ b/images/linux/scripts/installers/java-tools.sh
@@ -63,10 +63,12 @@ apt-fast install -y --no-install-recommends ant ant-optional
 echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment
 
 # Install Maven
-mavenDownloadUrl=$(curl -sL https://maven.apache.org/download.cgi | grep -oP 'https://[^/"].+/binaries/apache-maven-.+-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-*/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