From b7e6ffd8d32cb9dab59063e03dd941464f45f375 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com>
Date: Fri, 25 Feb 2022 15:55:30 +0300
Subject: [PATCH] [Ubuntu] Convert non valid java semver (#5131)

* Convert non valid java semver

* remove whitespace

* Update regex
---
 images/linux/scripts/installers/java-tools.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh
index 2ac4817d0..b4567d96f 100644
--- a/images/linux/scripts/installers/java-tools.sh
+++ b/images/linux/scripts/installers/java-tools.sh
@@ -76,6 +76,10 @@ installOpenJDK() {
     # If there is no semver in java release, then extract java version from -fullversion
     [[ -z ${fullJavaVersion} ]] && fullJavaVersion=$(${javaVersionPath}/bin/java -fullversion 2>&1 | tr -d "\"" | tr "+" "-" | awk '{print $4}')
 
+    # Convert non valid semver like 11.0.14.1-9 -> 11.0.14-9
+    # https://github.com/adoptium/temurin-build/issues/2248
+    [[ ${fullJavaVersion} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ ]] && fullJavaVersion=$(echo $fullJavaVersion | sed -E 's/\.[0-9]+-/-/')
+
     javaToolcacheVersionPath="${JAVA_TOOLCACHE_PATH}/${fullJavaVersion}"
     mkdir -p "${javaToolcacheVersionPath}"