From 3e072f179ed9207690937b5d8fc618cfb47fa459 Mon Sep 17 00:00:00 2001
From: Mathias Hermansson <mathias.hermansson@se.ibm.com>
Date: Sat, 6 Apr 2019 11:27:03 +0200
Subject: [PATCH] AdoptOpenJDK 12: Remove OpenJ9 version from extract_dir.
 Fixes #47

---
 bucket/adopt12-openj9-jre.json      | 4 ++--
 bucket/adopt12-openj9.json          | 4 ++--
 bucket/adoptopenjdk-openj9-jre.json | 4 ++--
 bucket/adoptopenjdk-openj9.json     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bucket/adopt12-openj9-jre.json b/bucket/adopt12-openj9-jre.json
index d1a2c3969..a8346199d 100644
--- a/bucket/adopt12-openj9-jre.json
+++ b/bucket/adopt12-openj9-jre.json
@@ -9,7 +9,7 @@
             "hash": "ef85ab503b124360a0d2d9be45a041a3d7cc42fda010303f38db94ab8ffe4fb8"
         }
     },
-    "extract_dir": "jdk-12+33_openj9-0.13.0-jre",
+    "extract_dir": "jdk-12+33-jre",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
@@ -30,6 +30,6 @@
             "url": "$url.sha256.txt",
             "find": "^([a-fA-F0-9]+)\\s"
         },
-        "extract_dir": "jdk-$matchMajor+$matchBuild$matchOj$matchJvmver-jre"
+        "extract_dir": "jdk-$matchMajor+$matchBuild-jre"
     }
 }
diff --git a/bucket/adopt12-openj9.json b/bucket/adopt12-openj9.json
index 2860c67ad..18e134e51 100644
--- a/bucket/adopt12-openj9.json
+++ b/bucket/adopt12-openj9.json
@@ -9,7 +9,7 @@
             "hash": "2e79ba9a0ad623c6c3052ff017a4f5e178e81013c281e533ae422524aea5031e"
         }
     },
-    "extract_dir": "jdk-12+33_openj9-0.13.0",
+    "extract_dir": "jdk-12+33",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
@@ -30,6 +30,6 @@
             "url": "$url.sha256.txt",
             "find": "^([a-fA-F0-9]+)\\s"
         },
-        "extract_dir": "jdk-$matchMajor+$matchBuild$matchOj$matchJvmver"
+        "extract_dir": "jdk-$matchMajor+$matchBuild"
     }
 }
diff --git a/bucket/adoptopenjdk-openj9-jre.json b/bucket/adoptopenjdk-openj9-jre.json
index 2739eb72c..d0579dbd0 100644
--- a/bucket/adoptopenjdk-openj9-jre.json
+++ b/bucket/adoptopenjdk-openj9-jre.json
@@ -9,7 +9,7 @@
             "hash": "ef85ab503b124360a0d2d9be45a041a3d7cc42fda010303f38db94ab8ffe4fb8"
         }
     },
-    "extract_dir": "jdk-12+33_openj9-0.13.0-jre",
+    "extract_dir": "jdk-12+33-jre",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
@@ -30,6 +30,6 @@
             "url": "$url.sha256.txt",
             "find": "^([a-fA-F0-9]+)\\s"
         },
-        "extract_dir": "jdk-$matchMajor+$matchBuild$matchOj$matchJvmver-jre"
+        "extract_dir": "jdk-$matchMajor+$matchBuild-jre"
     }
 }
diff --git a/bucket/adoptopenjdk-openj9.json b/bucket/adoptopenjdk-openj9.json
index d3ba1cb17..e32b24079 100644
--- a/bucket/adoptopenjdk-openj9.json
+++ b/bucket/adoptopenjdk-openj9.json
@@ -9,7 +9,7 @@
             "hash": "2e79ba9a0ad623c6c3052ff017a4f5e178e81013c281e533ae422524aea5031e"
         }
     },
-    "extract_dir": "jdk-12+33_openj9-0.13.0",
+    "extract_dir": "jdk-12+33",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
@@ -30,6 +30,6 @@
             "url": "$url.sha256.txt",
             "find": "^([a-fA-F0-9]+)\\s"
         },
-        "extract_dir": "jdk-$matchMajor+$matchBuild$matchOj$matchJvmver"
+        "extract_dir": "jdk-$matchMajor+$matchBuild"
     }
 }