From f02f1cc402cc61bfd6b938bdc05c747e5022cf3f Mon Sep 17 00:00:00 2001 From: amreus <38442825+amreus@users.noreply.github.com> Date: Sun, 19 Dec 2021 10:41:25 -0500 Subject: [PATCH] (chore): Remove oraclejdk references (#3106) * remove oraclejdk references * remove oraclejdk reference * remove oraclejdk reference * replace single item arrays with simple strings --- bucket/ammonite.json | 5 +---- bucket/ant.json | 5 +---- bucket/asciidoctorj.json | 5 +---- bucket/avro-tools.json | 5 +---- bucket/bfg.json | 5 +---- bucket/cfr.json | 5 +---- bucket/dependency-check.json | 5 +---- bucket/dokka.json | 5 +---- bucket/gradle-bin.json | 5 +---- bucket/gradle.json | 5 +---- bucket/grails.json | 5 +---- bucket/groovy.json | 5 +---- bucket/halo.json | 5 +---- bucket/i2p-portable.json | 5 +---- bucket/i2p.json | 5 +---- bucket/jruby.json | 5 +---- bucket/kafka.json | 5 +---- bucket/kotlin.json | 5 +---- bucket/maven.json | 5 +---- bucket/micronaut.json | 5 +---- bucket/mill.json | 5 +---- bucket/mvndaemon.json | 5 +---- bucket/pdfbox.json | 5 +---- bucket/redpen.json | 1 - bucket/scala.json | 5 +---- bucket/selenium.json | 5 +---- bucket/signal-cli.json | 5 +---- bucket/sonar-scanner.json | 5 +---- bucket/sonarqube.json | 5 +---- bucket/spark.json | 5 +---- bucket/spotbugs.json | 5 +---- bucket/uber-apk-signer.json | 5 +---- bucket/zookeeper.json | 5 +---- 33 files changed, 32 insertions(+), 129 deletions(-) diff --git a/bucket/ammonite.json b/bucket/ammonite.json index c06486ae07..5d8c635989 100644 --- a/bucket/ammonite.json +++ b/bucket/ammonite.json @@ -4,10 +4,7 @@ "homepage": "http://ammonite.io", "license": "MIT", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://github.com/lihaoyi/Ammonite/releases/download/2.5.0/2.12-2.5.0#/amm.bat", "hash": "2535b5c5bf9e09bd32873ac0d67b666a53fcf09a14a3e2ab8ce06fb3e72e13f0", diff --git a/bucket/ant.json b/bucket/ant.json index 4deea38efb..9da16ef667 100644 --- a/bucket/ant.json +++ b/bucket/ant.json @@ -4,10 +4,7 @@ "homepage": "https://ant.apache.org/", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://www.apache.org/dist/ant/binaries/apache-ant-1.10.12-bin.zip", "hash": "sha512:7e6fbcc3563df4bd87c883ad86a161a71da2774e0ed71a1b3aad82cbff1a7656ed9a0acb5ce40652129376dfd79f1ef74ec3369c1067d412a63062fea62ceccd", diff --git a/bucket/asciidoctorj.json b/bucket/asciidoctorj.json index 2e5e583ff6..45ec3f767a 100644 --- a/bucket/asciidoctorj.json +++ b/bucket/asciidoctorj.json @@ -4,10 +4,7 @@ "homepage": "https://asciidoctor.org/docs/asciidoctorj", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://repo1.maven.org/maven2/org/asciidoctor/asciidoctorj/2.5.2/asciidoctorj-2.5.2-bin.zip", "hash": "889fd490a43e59e06c4f9d6692228e48ada2829acead7ea8c454a596c5cb2a96", diff --git a/bucket/avro-tools.json b/bucket/avro-tools.json index 392497e916..1b91354fbe 100644 --- a/bucket/avro-tools.json +++ b/bucket/avro-tools.json @@ -4,10 +4,7 @@ "homepage": "https://avro.apache.org/", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://apache.org/dist/avro/avro-1.11.0/java/avro-tools-1.11.0.jar#/avro-tools.jar", "hash": "sha512:fd61212a170ff7f91b76f7f3b894feb93e90768d7dcd726a335729355bda04d36d6bee41845bea41fb2f17b0b769fbb473d62caa18b16f20089af1bb035a34fb", diff --git a/bucket/bfg.json b/bucket/bfg.json index f009a467c4..f5c6c292e9 100644 --- a/bucket/bfg.json +++ b/bucket/bfg.json @@ -4,10 +4,7 @@ "homepage": "https://rtyley.github.io/bfg-repo-cleaner/", "license": "GPL-3.0-or-later", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://repo1.maven.org/maven2/com/madgag/bfg/1.14.0/bfg-1.14.0.jar#/bfg.jar", "hash": "md5:c8d2e17d9a42d87f82653aec47acfc80", diff --git a/bucket/cfr.json b/bucket/cfr.json index 087e7e65fc..7aa9b32316 100644 --- a/bucket/cfr.json +++ b/bucket/cfr.json @@ -4,10 +4,7 @@ "homepage": "https://www.benf.org/other/cfr", "license": "MIT", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://www.benf.org/other/cfr/cfr-0.152.jar#/cfr.jar", "hash": "md5:8a85ada8cec494121246805a5562b82b", diff --git a/bucket/dependency-check.json b/bucket/dependency-check.json index 7ceba304d6..58d6064011 100644 --- a/bucket/dependency-check.json +++ b/bucket/dependency-check.json @@ -4,10 +4,7 @@ "homepage": "https://owasp.org/www-project-dependency-check/", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://github.com/jeremylong/DependencyCheck/releases/download/v6.5.1/dependency-check-6.5.1-release.zip", "hash": "b99626a16ee9e761d1747502856896c05386aad777da3a7a5ca21c31d55694fb", diff --git a/bucket/dokka.json b/bucket/dokka.json index 96b83801d7..b0e2ed2e71 100644 --- a/bucket/dokka.json +++ b/bucket/dokka.json @@ -4,10 +4,7 @@ "homepage": "https://github.com/Kotlin/dokka/", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://github.com/Kotlin/dokka/releases/download/0.10.1/dokka-fatjar-0.10.1.jar#/dokka.jar", "hash": "fc315c6aeab2015789f1a964e38bfc46758a6b7bf4f9671687d4e277f92a52a4", diff --git a/bucket/gradle-bin.json b/bucket/gradle-bin.json index b6c021692b..18250a9edf 100644 --- a/bucket/gradle-bin.json +++ b/bucket/gradle-bin.json @@ -4,10 +4,7 @@ "homepage": "https://gradle.org", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://services.gradle.org/distributions/gradle-7.3.2-bin.zip", "hash": "23b89f8eac363f5f4b8336e0530c7295c55b728a9caa5268fdd4a532610d5392", diff --git a/bucket/gradle.json b/bucket/gradle.json index 0b93707d37..57fe8d12cc 100644 --- a/bucket/gradle.json +++ b/bucket/gradle.json @@ -4,10 +4,7 @@ "homepage": "https://gradle.org", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://services.gradle.org/distributions/gradle-7.3.2-all.zip", "hash": "dd54e87b4d7aa8ff3c6afb0f7805aa121d4b70bca55b8c9b1b896eb103184582", diff --git a/bucket/grails.json b/bucket/grails.json index 70c4a8a820..eb5e645ad8 100644 --- a/bucket/grails.json +++ b/bucket/grails.json @@ -4,10 +4,7 @@ "homepage": "https://grails.org", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://github.com/grails/grails-core/releases/download/v5.1.0/grails-5.1.0.zip", "hash": "028299f9bad0eb9a81ffb7e0cb055e378374e08c8d05f6549c1ae97704341c14", diff --git a/bucket/groovy.json b/bucket/groovy.json index d645cafc55..3d139a8c4c 100644 --- a/bucket/groovy.json +++ b/bucket/groovy.json @@ -4,10 +4,7 @@ "homepage": "https://www.groovy-lang.org", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ], + "JDK": "java/openjdk", "groovyserv": "groovyserv" }, "url": "https://groovy.jfrog.io/artifactory/dist-release-local/groovy-zips/apache-groovy-binary-3.0.9.zip", diff --git a/bucket/halo.json b/bucket/halo.json index 2afcf72748..7c1136cfdf 100644 --- a/bucket/halo.json +++ b/bucket/halo.json @@ -4,10 +4,7 @@ "homepage": "https://halo.run", "license": "GPL-3.0-or-later", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://github.com/halo-dev/halo/releases/download/v1.4.16/halo-1.4.16.jar#/halo.jar", "hash": "47802051244154bf49d30794babcff89202c1574835e2382491fba73574ffd74", diff --git a/bucket/i2p-portable.json b/bucket/i2p-portable.json index fb350a4c79..cdd133c2c7 100644 --- a/bucket/i2p-portable.json +++ b/bucket/i2p-portable.json @@ -7,10 +7,7 @@ "url": "https://github.com/i2p/i2p.i2p/blob/master/LICENSE.txt" }, "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://launchpad.net/i2p/trunk/0.9.50/%2Bdownload/i2pinstall_0.9.50_windows.exe#/dl.7z", "hash": "92e38abf0650671e08460dd25711afa67f7933a0b6fa655cbd2746662f06fb30", diff --git a/bucket/i2p.json b/bucket/i2p.json index 7486f12733..88505bb3d7 100644 --- a/bucket/i2p.json +++ b/bucket/i2p.json @@ -7,10 +7,7 @@ "url": "https://github.com/i2p/i2p.i2p/blob/master/LICENSE.txt" }, "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://launchpad.net/i2p/trunk/0.9.50/%2Bdownload/i2pinstall_0.9.50_windows.exe#/dl.7z", "hash": "92e38abf0650671e08460dd25711afa67f7933a0b6fa655cbd2746662f06fb30", diff --git a/bucket/jruby.json b/bucket/jruby.json index 5071514c94..246f9822ad 100644 --- a/bucket/jruby.json +++ b/bucket/jruby.json @@ -11,10 +11,7 @@ "Also note that this installation overrides GEM_HOME and GEM_PATH from any previous Ruby or JRuby installation." ], "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://s3.amazonaws.com/jruby.org/downloads/9.3.2.0/jruby-bin-9.3.2.0.zip", "hash": "7053161145d3759032969935a21e7fda0bcb39860eac0e6b2f4d497a8c93c813", diff --git a/bucket/kafka.json b/bucket/kafka.json index 333f9e0fd5..5e8e8aec8b 100644 --- a/bucket/kafka.json +++ b/bucket/kafka.json @@ -4,10 +4,7 @@ "homepage": "https://kafka.apache.org/", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://www.apache.org/dist/kafka/3.0.0/kafka_2.12-3.0.0.tgz", "hash": "sha1:f74f1a6eeb157b65fbe9cff4128802b5b9595fcc", diff --git a/bucket/kotlin.json b/bucket/kotlin.json index 0e0132db18..de2fc71333 100644 --- a/bucket/kotlin.json +++ b/bucket/kotlin.json @@ -4,10 +4,7 @@ "homepage": "https://kotlinlang.org/", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://github.com/JetBrains/kotlin/releases/download/v1.6.10/kotlin-compiler-1.6.10.zip", "hash": "432267996d0d6b4b17ca8de0f878e44d4a099b7e9f1587a98edc4d27e76c215a", diff --git a/bucket/maven.json b/bucket/maven.json index 9ce547a5b7..0ce66cb141 100644 --- a/bucket/maven.json +++ b/bucket/maven.json @@ -4,10 +4,7 @@ "homepage": "https://maven.apache.org/", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://www.apache.org/dist/maven/maven-3/3.8.4/binaries/apache-maven-3.8.4-bin.zip", "hash": "sha512:bcd1e99548ac8a5b9ec159ee16c23d29d6799696c92140d583d25eb323433aadcc0b47c45b0b6bd9dbcf344bbba38b56dd056a9c49ae714cfc22dc06bb4a4230", diff --git a/bucket/micronaut.json b/bucket/micronaut.json index d92a197db5..17e8c4f817 100644 --- a/bucket/micronaut.json +++ b/bucket/micronaut.json @@ -4,10 +4,7 @@ "homepage": "https://micronaut.io", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://github.com/micronaut-projects/micronaut-starter/releases/download/v3.2.3/micronaut-cli-3.2.3.zip", "hash": "7b6a815be99c37a99216f3302a93eb57af0b4151a563aa2d699bde75db5a81cc", diff --git a/bucket/mill.json b/bucket/mill.json index 4999e86214..5f35932b43 100644 --- a/bucket/mill.json +++ b/bucket/mill.json @@ -4,10 +4,7 @@ "homepage": "http://www.lihaoyi.com/mill/", "license": "MIT", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://github.com/lihaoyi/mill/releases/download/0.9.11/0.9.11-assembly#/mill.bat", "hash": "a98c02b7bfbffc62472720eb67cadc18228bb2129e6c80c1402ca7eab2ce8494", diff --git a/bucket/mvndaemon.json b/bucket/mvndaemon.json index 7e65010061..3af6c7aa72 100644 --- a/bucket/mvndaemon.json +++ b/bucket/mvndaemon.json @@ -9,10 +9,7 @@ "See https://github.com/oracle/graal/issues/1762 for more information." ], "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ], + "JDK": "java/openjdk", "vcredist": "extras/vcredist2019" }, "architecture": { diff --git a/bucket/pdfbox.json b/bucket/pdfbox.json index fc6c7a9bca..6cfccbfea0 100755 --- a/bucket/pdfbox.json +++ b/bucket/pdfbox.json @@ -4,10 +4,7 @@ "homepage": "https://pdfbox.apache.org", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": [ "https://downloads.apache.org/pdfbox/2.0.24/pdfbox-app-2.0.24.jar#/pdfbox.jar", diff --git a/bucket/redpen.json b/bucket/redpen.json index dfe3347f86..8c233b3ae7 100644 --- a/bucket/redpen.json +++ b/bucket/redpen.json @@ -5,7 +5,6 @@ "license": "Apache-2.0", "suggest": { "Java": [ - "oraclejdk", "adopt8-hotspot-jre" ] }, diff --git a/bucket/scala.json b/bucket/scala.json index 9b5c582d43..690c6ea489 100644 --- a/bucket/scala.json +++ b/bucket/scala.json @@ -4,10 +4,7 @@ "homepage": "https://www.scala-lang.org/", "license": "BSD-3-Clause", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://downloads.typesafe.com/scala/2.13.7/scala-2.13.7.zip", "hash": "a52cd39d0c13748b36a389b87ffbf5c4b6bc098af9ea745cf3c874867fd91976", diff --git a/bucket/selenium.json b/bucket/selenium.json index 14646d8930..90e07d80d0 100644 --- a/bucket/selenium.json +++ b/bucket/selenium.json @@ -4,10 +4,7 @@ "homepage": "https://selenium.dev", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/openjdk", - "java/oraclejdk" - ] + "JDK": "java/openjdk" }, "url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.1.0/selenium-server-4.1.0.jar#/selenium.jar", "hash": "5f6701edf43b557495292fa032d6c1f31f0d0aa2f6cf71f844fb8b30775641fe", diff --git a/bucket/signal-cli.json b/bucket/signal-cli.json index 9871ddbb9e..ebd0f4f6f2 100644 --- a/bucket/signal-cli.json +++ b/bucket/signal-cli.json @@ -4,10 +4,7 @@ "homepage": "https://github.com/AsamK/signal-cli", "license": "GPL-3.0-only", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://github.com/AsamK/signal-cli/releases/download/v0.10.0/signal-cli-0.10.0.tar.gz", "hash": "d89a1f0c2abd1ec17ed833b9c3339bcc000b6c9989f472609aeb922500eed6f6", diff --git a/bucket/sonar-scanner.json b/bucket/sonar-scanner.json index 956862d65b..5000b17ce0 100644 --- a/bucket/sonar-scanner.json +++ b/bucket/sonar-scanner.json @@ -4,10 +4,7 @@ "homepage": "https://docs.sonarqube.org/latest/analysis/scan/sonarscanner/", "license": "LGPL-3.0-only", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ], + "JDK": "java/openjdk", "SonarQube": "sonarqube" }, "url": "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip", diff --git a/bucket/sonarqube.json b/bucket/sonarqube.json index 4c99e42827..4fcea79daf 100644 --- a/bucket/sonarqube.json +++ b/bucket/sonarqube.json @@ -4,10 +4,7 @@ "homepage": "https://www.sonarqube.org", "license": "LGPL-3.0-only", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://binaries.sonarsource.com/Distribution/sonarqube/sonarqube-8.9.5.50698.zip", "hash": "6a6704cab1ece8e5af33ce3c909ca9ca56f46ac66c07dc7671d43a3bff166670", diff --git a/bucket/spark.json b/bucket/spark.json index a36c242092..f7c8992983 100644 --- a/bucket/spark.json +++ b/bucket/spark.json @@ -4,10 +4,7 @@ "homepage": "https://spark.apache.org/", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://www.apache.org/dist/spark/spark-3.2.0/spark-3.2.0-bin-hadoop2.7.tgz", "hash": "sha512:f20d853cfd1e0e2ba1378b11f1ce6fd9fd546ee072724667853456efffa11926f5feaf08da49aa2c0c0775813cbd82e24239961d6a976bce14e15aec3d6d1ac4", diff --git a/bucket/spotbugs.json b/bucket/spotbugs.json index 5e1899bda9..b174ef8ff8 100644 --- a/bucket/spotbugs.json +++ b/bucket/spotbugs.json @@ -4,10 +4,7 @@ "homepage": "https://spotbugs.github.io/", "license": "LGPL-2.1-only", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://repo.maven.apache.org/maven2/com/github/spotbugs/spotbugs/4.5.2/spotbugs-4.5.2.zip", "hash": "0467dc71b24b61bfda7dfaec3df96b5095d526b99b034cad9d068ee026f4cbe3", diff --git a/bucket/uber-apk-signer.json b/bucket/uber-apk-signer.json index db0c640070..bc99f68db2 100644 --- a/bucket/uber-apk-signer.json +++ b/bucket/uber-apk-signer.json @@ -4,10 +4,7 @@ "homepage": "https://github.com/patrickfav/uber-apk-signer", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://github.com/patrickfav/uber-apk-signer/releases/download/v1.2.1/uber-apk-signer-1.2.1.jar#/uber-apk-signer.jar", "hash": "47ae984df200afbae292d6f950e517afb445d3c902a1edc7717a82c513c5e772", diff --git a/bucket/zookeeper.json b/bucket/zookeeper.json index 86281f8253..32e5159ca4 100644 --- a/bucket/zookeeper.json +++ b/bucket/zookeeper.json @@ -4,10 +4,7 @@ "homepage": "https://zookeeper.apache.org/", "license": "Apache-2.0", "suggest": { - "JDK": [ - "java/oraclejdk", - "java/openjdk" - ] + "JDK": "java/openjdk" }, "url": "https://www.apache.org/dist/zookeeper/zookeeper-3.7.0/apache-zookeeper-3.7.0-bin.tar.gz", "hash": "sha512:64e2701c019ed46f45f4d53b2c5eaeaf7cf48c342bbafa032a0819d527fc77caebfada6bdad34e5171e6d838f40b16c95b62ce378b53dfc827af2d60cec0b17c",