From ff4e23463c28a8dc9f8f3b65073487fc8730e966 Mon Sep 17 00:00:00 2001
From: Richard Kuhnt <r15ch13+git@gmail.com>
Date: Sat, 21 Apr 2018 23:18:19 +0200
Subject: [PATCH] Add Java bucket maintained by @se35710  (#2209)

* Add Java bucket maintained by @se35710
---
 ant.json       |  4 ++--
 bfg.json       |  4 ++--
 gradle.json    |  4 ++--
 grails.json    |  4 ++--
 groovy.json    |  4 ++--
 jruby.json     |  5 +++--
 kotlin.json    |  4 ++--
 maven.json     |  4 ++--
 openjdk.json   | 40 ----------------------------------------
 scala.json     |  4 ++--
 sonarqube.json |  4 ++--
 11 files changed, 21 insertions(+), 60 deletions(-)
 delete mode 100644 openjdk.json

diff --git a/ant.json b/ant.json
index c79e9da4f3..be1e6364f7 100644
--- a/ant.json
+++ b/ant.json
@@ -11,8 +11,8 @@
     },
     "suggest": {
         "JDK": [
-            "extras/oraclejdk",
-            "openjdk"
+            "java/oraclejdk",
+            "java/openjdk"
         ]
     },
     "checkver": {
diff --git a/bfg.json b/bfg.json
index 7054bf1c4b..dd4c1ec761 100644
--- a/bfg.json
+++ b/bfg.json
@@ -6,8 +6,8 @@
     "hash": "bf22bab9dd42d4682b490d6bc366afdad6c3da99f97521032d3be8ba7526c8ce",
     "suggest": {
         "JDK": [
-            "extras/oraclejdk",
-            "openjdk"
+            "java/oraclejdk",
+            "java/openjdk"
         ]
     },
     "bin": "bfg.ps1",
diff --git a/gradle.json b/gradle.json
index 4fb710b69a..08ecede2b2 100644
--- a/gradle.json
+++ b/gradle.json
@@ -8,8 +8,8 @@
     "bin": "bin\\gradle.bat",
     "suggest": {
         "JDK": [
-            "extras/oraclejdk",
-            "openjdk"
+            "java/oraclejdk",
+            "java/openjdk"
         ]
     },
     "checkver": {
diff --git a/grails.json b/grails.json
index a193d94704..6771154d9b 100644
--- a/grails.json
+++ b/grails.json
@@ -13,8 +13,8 @@
     },
     "suggest": {
         "JDK": [
-            "extras/oraclejdk",
-            "openjdk"
+            "java/oraclejdk",
+            "java/openjdk"
         ]
     },
     "checkver": {
diff --git a/groovy.json b/groovy.json
index 30f878eb0b..173e33f405 100644
--- a/groovy.json
+++ b/groovy.json
@@ -20,8 +20,8 @@
     },
     "suggest": {
         "JDK": [
-            "extras/oraclejdk",
-            "openjdk"
+            "java/oraclejdk",
+            "java/openjdk"
         ]
     },
     "checkver": {
diff --git a/jruby.json b/jruby.json
index 1f1df6472b..37cd32f29c 100644
--- a/jruby.json
+++ b/jruby.json
@@ -15,8 +15,9 @@
         "GEM_PATH": "$dir\\gems"
     },
     "suggest": {
-        "OpenJDK": [
-            "openjdk"
+        "JDK": [
+            "java/oraclejdk",
+            "java/openjdk"
         ]
     },
     "notes": "Install a JDK and set JAVA_HOME if you don't already have. JRuby won't work without it.
diff --git a/kotlin.json b/kotlin.json
index 328a47aec7..be2fc5e0a7 100644
--- a/kotlin.json
+++ b/kotlin.json
@@ -16,8 +16,8 @@
     },
     "suggest": {
         "JDK": [
-            "extras/oraclejdk",
-            "openjdk"
+            "java/oraclejdk",
+            "java/openjdk"
         ]
     },
     "checkver": {
diff --git a/maven.json b/maven.json
index aee2bc8127..a7d7c6da22 100644
--- a/maven.json
+++ b/maven.json
@@ -8,8 +8,8 @@
     "env_add_path": "bin",
     "suggest": {
         "JDK": [
-            "extras/oraclejdk",
-            "openjdk"
+            "java/oraclejdk",
+            "java/openjdk"
         ]
     },
     "checkver": {
diff --git a/openjdk.json b/openjdk.json
deleted file mode 100644
index d27484bdb0..0000000000
--- a/openjdk.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "homepage": "https://github.com/ojdkbuild/ojdkbuild",
-    "version": "1.8.0.161-1",
-    "license": "GPL-2.0",
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/1.8.0.161-1/java-1.8.0-openjdk-1.8.0.161-1.b14.ojdkbuild.windows.x86_64.zip",
-            "hash": "7fcd9909173ed19f4ae6c0bba8b32b1e6bece2d49eb9d87271828be8121fc31b",
-            "extract_dir": "java-1.8.0-openjdk-1.8.0.161-1.b14.ojdkbuild.windows.x86_64"
-        },
-        "32bit": {
-            "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/1.8.0.161-1/java-1.8.0-openjdk-1.8.0.161-1.b14.ojdkbuild.windows.x86.zip",
-            "hash": "73cf753afe0590b90edb8643b4d628339bfe942a4f539c892fb4f82d9a122173",
-            "extract_dir": "java-1.8.0-openjdk-1.8.0.161-1.b14.ojdkbuild.windows.x86"
-        }
-    },
-    "env_add_path": "bin",
-    "env_set": {
-        "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://raw.githubusercontent.com/ojdkbuild/ojdkbuild/master/README.md",
-        "re": "download/.*/java-(?<short>[\\d.]+)-openjdk-(?<version>[\\d.]+-[\\d]+)(?<tail>.*).x86_64.zip\\)"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/$version/java-$matchShort-openjdk-$version$matchTail.x86_64.zip",
-                "extract_dir": "java-$matchShort-openjdk-$version$matchTail.x86_64"
-            },
-            "32bit": {
-                "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/$version/java-$matchShort-openjdk-$version$matchTail.x86.zip",
-                "extract_dir": "java-$matchShort-openjdk-$version$matchTail.x86"
-            }
-        },
-        "hash": {
-            "url": "$url.sha256"
-        }
-    }
-}
diff --git a/scala.json b/scala.json
index 3fc73b5c3c..00c50377cf 100644
--- a/scala.json
+++ b/scala.json
@@ -17,8 +17,8 @@
     },
     "suggest": {
         "JDK": [
-            "extras/oraclejdk",
-            "openjdk"
+            "java/oraclejdk",
+            "java/openjdk"
         ]
     },
     "checkver": {
diff --git a/sonarqube.json b/sonarqube.json
index c0cf93ff42..32541f8f95 100644
--- a/sonarqube.json
+++ b/sonarqube.json
@@ -22,8 +22,8 @@
     "extract_dir": "sonarqube-7.1",
     "suggest": {
         "JDK": [
-            "extras/oraclejdk",
-            "openjdk"
+            "java/oraclejdk",
+            "java/openjdk"
         ]
     },
     "checkver": {