From 7e064a20ced4f1a7b69488ac5b955ea7f790ebd0 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Fri, 13 May 2022 17:46:28 -0500
Subject: [PATCH] Added Adoptium JDK8 support and updated DistroTestPlugin JDK
 version used by Gradle (#3324) (#3325)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit e0743954527005f5037f1a2a03cf084b631b7a7e)
---
 .../main/java/org/opensearch/gradle/Jdk.java  |  2 +-
 .../opensearch/gradle/JdkDownloadPlugin.java  | 48 ++++++++++++-------
 .../gradle/test/DistroTestPlugin.java         |  4 +-
 3 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/buildSrc/src/main/java/org/opensearch/gradle/Jdk.java b/buildSrc/src/main/java/org/opensearch/gradle/Jdk.java
index 792debe3f350a..53fd998bcc53f 100644
--- a/buildSrc/src/main/java/org/opensearch/gradle/Jdk.java
+++ b/buildSrc/src/main/java/org/opensearch/gradle/Jdk.java
@@ -54,7 +54,7 @@ public class Jdk implements Buildable, Iterable<File> {
         Arrays.asList("darwin", "freebsd", "linux", "mac", "windows")
     );
     private static final Pattern VERSION_PATTERN = Pattern.compile("(\\d+)(\\.\\d+\\.\\d+)?\\+(\\d+(?:\\.\\d+)?)(@([a-f0-9]{32}))?");
-    private static final Pattern LEGACY_VERSION_PATTERN = Pattern.compile("(\\d)(u\\d+)\\+(b\\d+?)(@([a-f0-9]{32}))?");
+    private static final Pattern LEGACY_VERSION_PATTERN = Pattern.compile("(\\d)(u\\d+)(?:\\+|\\-)(b\\d+?)(@([a-f0-9]{32}))?");
 
     private final String name;
     private final Configuration configuration;
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/JdkDownloadPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/JdkDownloadPlugin.java
index b9f3036f7aad9..f638f1931cf62 100644
--- a/buildSrc/src/main/java/org/opensearch/gradle/JdkDownloadPlugin.java
+++ b/buildSrc/src/main/java/org/opensearch/gradle/JdkDownloadPlugin.java
@@ -110,22 +110,38 @@ private void setupRepository(Project project, Jdk jdk) {
 
         if (jdk.getVendor().equals(VENDOR_ADOPTIUM)) {
             repoUrl = "https://github.com/adoptium/temurin" + jdk.getMajor() + "-binaries/releases/download/";
-            // JDK updates are suffixed with 'U' (fe OpenJDK17U), whereas GA releases are not (fe OpenJDK17).
-            // To distinguish between those, the GA releases have only major version component (fe 17+32),
-            // the updates always have minor/patch components (fe 17.0.1+12), checking for the presence of
-            // version separator '.' should be enough.
-            artifactPattern = "jdk-"
-                + jdk.getBaseVersion()
-                + "+"
-                + jdk.getBuild()
-                + "/OpenJDK"
-                + jdk.getMajor()
-                + (jdk.getBaseVersion().contains(".") ? "U" : "")
-                + "-jdk_[classifier]_[module]_hotspot_"
-                + jdk.getBaseVersion()
-                + "_"
-                + jdk.getBuild()
-                + ".[ext]";
+
+            if (jdk.getMajor().equals("8")) {
+                // JDK-8 updates are always suffixed with 'U' (fe OpenJDK8U).
+                artifactPattern = "jdk"
+                    + jdk.getBaseVersion()
+                    + "-"
+                    + jdk.getBuild()
+                    + "/OpenJDK"
+                    + jdk.getMajor()
+                    + "U"
+                    + "-jdk_[classifier]_[module]_hotspot_"
+                    + jdk.getBaseVersion()
+                    + jdk.getBuild()
+                    + ".[ext]";
+            } else {
+                // JDK updates are suffixed with 'U' (fe OpenJDK17U), whereas GA releases are not (fe OpenJDK17).
+                // To distinguish between those, the GA releases have only major version component (fe 17+32),
+                // the updates always have minor/patch components (fe 17.0.1+12), checking for the presence of
+                // version separator '.' should be enough.
+                artifactPattern = "jdk-"
+                    + jdk.getBaseVersion()
+                    + "+"
+                    + jdk.getBuild()
+                    + "/OpenJDK"
+                    + jdk.getMajor()
+                    + (jdk.getBaseVersion().contains(".") ? "U" : "")
+                    + "-jdk_[classifier]_[module]_hotspot_"
+                    + jdk.getBaseVersion()
+                    + "_"
+                    + jdk.getBuild()
+                    + ".[ext]";
+            }
         } else if (jdk.getVendor().equals(VENDOR_ADOPTOPENJDK)) {
             repoUrl = "https://api.adoptopenjdk.net/v3/binary/version/";
             if (jdk.getMajor().equals("8")) {
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java
index c206860bb0117..c947a457d33ec 100644
--- a/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java
+++ b/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java
@@ -75,8 +75,8 @@
 import java.util.stream.Stream;
 
 public class DistroTestPlugin implements Plugin<Project> {
-    private static final String SYSTEM_JDK_VERSION = "8u242+b08";
-    private static final String SYSTEM_JDK_VENDOR = "adoptopenjdk";
+    private static final String SYSTEM_JDK_VERSION = "11.0.15+10";
+    private static final String SYSTEM_JDK_VENDOR = "adoptium";
     private static final String GRADLE_JDK_VERSION = "17.0.3+7";
     private static final String GRADLE_JDK_VENDOR = "adoptium";