[Ubuntu] add maven back to toolset (#4507)

images/linux/scripts/installers/java-tools.sh

@@ -57,12 +57,11 @@ apt-fast install -y --no-install-recommends ant ant-optional
 echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment
 
 # Install Maven
-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"
+mavenVersion=$(get_toolset_value '.java.maven')
+mavenDownloadUrl="https://www-eu.apache.org/dist/maven/maven-3/${mavenVersion}/binaries/apache-maven-${mavenVersion}-bin.zip"
+download_with_retries ${mavenDownloadUrl} "/tmp" "maven.zip"
 unzip -qq -d /usr/share /tmp/maven.zip
-ln -s /usr/share/apache-maven-${latestMavenVersion}/bin/mvn /usr/bin/mvn
+ln -s /usr/share/apache-maven-${mavenVersion}/bin/mvn /usr/bin/mvn
 
 # Install Gradle
 # This script founds the latest gradle release from https://services.gradle.org/versions/all

images/linux/toolsets/toolset-1804.json

@@ -73,7 +73,8 @@
         "default": "8",
         "versions": [
             "8", "11", "12"
-        ]
+        ],
+        "maven": "3.8.3"
     },
     "android": {
         "platform_min_version": "23",

images/linux/toolsets/toolset-2004.json

@@ -74,7 +74,8 @@
         "default": "11",
         "versions": [
             "8", "11"
-        ]
+        ],
+        "maven": "3.8.3"
     },
     "android": {
         "platform_min_version": "27",