From 20bc06ea0bfb29cac428019fe9e41760d19c0679 Mon Sep 17 00:00:00 2001 From: Mathias Hermansson Date: Wed, 26 Sep 2018 09:20:25 +0200 Subject: [PATCH] openjdk: Update to version 11-28 --- openjdk.json | 20 +++++++++--------- oraclejre-lts.json | 44 --------------------------------------- oraclejre-server-lts.json | 37 -------------------------------- oraclejre-server.json | 37 -------------------------------- oraclejre.json | 37 -------------------------------- 5 files changed, 10 insertions(+), 165 deletions(-) delete mode 100644 oraclejre-lts.json delete mode 100644 oraclejre-server-lts.json delete mode 100644 oraclejre-server.json delete mode 100644 oraclejre.json diff --git a/openjdk.json b/openjdk.json index 5edf19d2c..4b9b64391 100644 --- a/openjdk.json +++ b/openjdk.json @@ -1,32 +1,32 @@ { - "description": "Official production-ready open-source builds of OpenJDK", - "homepage": "http://jdk.java.net/10", - "version": "10.0.2-13", + "description": "Official production-ready open-source builds of OpenJDK 11", + "homepage": "http://jdk.java.net/11", + "version": "11-28", "license": "GPL-2.0-with-classpath-exception", "architecture": { "64bit": { - "url": "https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_windows-x64_bin.tar.gz", - "hash": "d6fadd228b195f754d3bb74cb7dce7a7fdbce58963257ba2ab63a923301bc2dd" + "url": "https://download.java.net/java/GA/jdk11/28/GPL/openjdk-11+28_windows-x64_bin.zip", + "hash": "fde3b28ca31b86a889c37528f17411cd0b9651beb6fa76cac89a223417910f4b" } }, - "extract_dir": "jdk-10.0.2", + "extract_dir": "jdk-11", "env_add_path": "bin", "env_set": { "JAVA_HOME": "$dir" }, "checkver": { - "re": "https://download.java.net/java/GA/jdk10/(?[\\d.]+)/(?[a-fA-F0-9]{32})/(?[\\d]+)/", + "re": "https://download.java.net/java/GA/jdk(?[\\d]+)/(?[\\d]+)/(?([a-fA-F0-9]{32}|GPL)?)/(?openjdk-(?[\\d.]+)\\+(?:[\\d]+)_windows-x64_bin.(zip|tar.gz))", "replace": "${version}-${build}" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://download.java.net/java/GA/jdk10/$matchVersion/$matchRandom/$matchBuild/openjdk-$matchVersion_windows-x64_bin.tar.gz" + "url": "https://download.java.net/java/GA/jdk$matchMajor/$matchBuild/$matchRandom/$matchFile" } }, - "extract_dir": "jdk-$matchVersion", "hash": { "url": "$url.sha256" - } + }, + "extract_dir": "jdk-$matchVersion" } } diff --git a/oraclejre-lts.json b/oraclejre-lts.json deleted file mode 100644 index 91760b82d..000000000 --- a/oraclejre-lts.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "description": "Oracle JRE (LTS)", - "homepage": "http://www.oracle.com/technetwork/java/javase/overview/index.html", - "version": "8u181-b13", - "license": "http://www.oracle.com/technetwork/java/javase/terms/license", - "architecture": { - "64bit": { - "url": "http://download.oracle.com/otn-pub/java/jdk/8u181-b13/96a7b8442fe848ef90c96a2fad6ed6d1/jre-8u181-windows-x64.tar.gz", - "hash": "4045e16ea023c68b8aa3818a4a200148850251830db6c57aaefb5c0f2b8e97c3" - }, - "32bit": { - "url": "http://download.oracle.com/otn-pub/java/jdk/8u181-b13/96a7b8442fe848ef90c96a2fad6ed6d1/jre-8u181-windows-i586.tar.gz", - "hash": "dd6b4869219ec9005fd6d53766d628a54480edfea5d34687ed31b8bd064f2b4f" - } - }, - "cookie": { - "oraclelicense": "accept-securebackup-cookie" - }, - "extract_dir": "jre1.8.0_181", - "env_add_path": "bin", - "env_set": { - "JAVA_HOME": "$dir" - }, - "checkver": { - "url": "http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html", - "re": "(?[ub\\-\\d]+)/(?[a-fA-F0-9]{32})/jre-(?(?[\\d]+)u(?[\\d]+))-windows-x64.tar.gz", - "reverse": true - }, - "autoupdate": { - "architecture": { - "64bit": { - "url": "http://download.oracle.com/otn-pub/java/jdk/$version/$matchRandom/jre-$matchShort-windows-x64.tar.gz" - }, - "32bit": { - "url": "http://download.oracle.com/otn-pub/java/jdk/$version/$matchRandom/jre-$matchShort-windows-i586.tar.gz" - } - }, - "extract_dir": "jre1.$matchRelease.0_$matchUpdate", - "hash": { - "url": "http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html", - "find": "$basename.*([a-fA-F0-9]{64})\"};" - } - } -} diff --git a/oraclejre-server-lts.json b/oraclejre-server-lts.json deleted file mode 100644 index 0ed5ba0b0..000000000 --- a/oraclejre-server-lts.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "description": "Oracle Server-JRE (LTS)", - "homepage": "http://www.oracle.com/technetwork/java/javase/overview/index.html", - "version": "8u181-b13", - "license": "http://www.oracle.com/technetwork/java/javase/terms/license", - "architecture": { - "64bit": { - "url": "http://download.oracle.com/otn-pub/java/jdk/8u181-b13/96a7b8442fe848ef90c96a2fad6ed6d1/server-jre-8u181-windows-x64.tar.gz", - "hash": "7799b9007760663da32a3b177a0b9ea42ec268afaa69dcf8518cdce5136c3768" - } - }, - "cookie": { - "oraclelicense": "accept-securebackup-cookie" - }, - "extract_dir": "jdk1.8.0_181", - "env_add_path": "bin", - "env_set": { - "JAVA_HOME": "$dir" - }, - "checkver": { - "url": "http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html", - "re": "(?[ub\\-\\d]+)/(?[a-fA-F0-9]{32})/server-jre-(?(?[\\d]+)u(?[\\d]+))-windows-x64.tar.gz", - "reverse": true - }, - "autoupdate": { - "architecture": { - "64bit": { - "url": "http://download.oracle.com/otn-pub/java/jdk/$version/$matchRandom/server-jre-$matchShort-windows-x64.tar.gz" - } - }, - "extract_dir": "jdk1.$matchRelease.0_$matchUpdate", - "hash": { - "url": "http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html", - "find": "$basename.*([a-fA-F0-9]{64})\"};" - } - } -} diff --git a/oraclejre-server.json b/oraclejre-server.json deleted file mode 100644 index ffe231daa..000000000 --- a/oraclejre-server.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "description": "Oracle Server-JRE", - "homepage": "http://www.oracle.com/technetwork/java/javase/overview/index.html", - "license": "http://www.oracle.com/technetwork/java/javase/terms/license", - "version": "10.0.2-13", - "architecture": { - "64bit": { - "url": "http://download.oracle.com/otn-pub/java/jdk/10.0.2+13/19aef61b38124481863b1413dce1855f/serverjre-10.0.2_windows-x64_bin.tar.gz", - "hash": "d54f57d574a0eaac231f486d6b15fe6d3d3857d3df74789675f08eb13b61076f" - } - }, - "cookie": { - "oraclelicense": "accept-securebackup-cookie" - }, - "extract_dir": "jdk-10.0.2", - "env_add_path": "bin", - "env_set": { - "JAVA_HOME": "$dir" - }, - "checkver": { - "url": "http://www.oracle.com/technetwork/java/javase/downloads/sjre10-downloads-4417025.html", - "re": "otn-pub/java/jdk/(?(?[\\d.]+)\\+(?[\\d]+)/(?[a-fA-F0-9]{32})/serverjre-(?:.*?)_windows-x64_bin.tar.gz)", - "replace": "${major}-${build}" - }, - "autoupdate": { - "architecture": { - "64bit": { - "url": "http://download.oracle.com/otn-pub/java/jdk/$matchPath" - } - }, - "extract_dir": "jdk-$matchMajor", - "hash": { - "url": "http://www.oracle.com/technetwork/java/javase/downloads/sjre10-downloads-4417025.html", - "find": "$basename.*([a-fA-F0-9]{64})\"};" - } - } -} diff --git a/oraclejre.json b/oraclejre.json deleted file mode 100644 index aecb48ccf..000000000 --- a/oraclejre.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "description": "Oracle JRE", - "homepage": "http://www.oracle.com/technetwork/java/javase/overview/index.html", - "license": "http://www.oracle.com/technetwork/java/javase/terms/license", - "version": "10.0.2-13", - "architecture": { - "64bit": { - "url": "http://download.oracle.com/otn-pub/java/jdk/10.0.2+13/19aef61b38124481863b1413dce1855f/jre-10.0.2_windows-x64_bin.tar.gz", - "hash": "cc5362d17c8baaa84c6bc63bba79fe8c2ec3d2ff2a2ec239482ae0b7cf03887a" - } - }, - "cookie": { - "oraclelicense": "accept-securebackup-cookie" - }, - "extract_dir": "jre-10.0.2", - "env_add_path": "bin", - "env_set": { - "JAVA_HOME": "$dir" - }, - "checkver": { - "url": "http://www.oracle.com/technetwork/java/javase/downloads/jre10-downloads-4417026.html", - "re": "otn-pub/java/jdk/(?(?[\\d.]+)\\+(?[\\d]+)/(?[a-fA-F0-9]{32})/jre-(?:.*?)_windows-x64_bin.tar.gz)", - "replace": "${major}-${build}" - }, - "autoupdate": { - "architecture": { - "64bit": { - "url": "http://download.oracle.com/otn-pub/java/jdk/$matchPath" - } - }, - "extract_dir": "jre-$matchMajor", - "hash": { - "url": "http://www.oracle.com/technetwork/java/javase/downloads/jre10-downloads-4417026.html", - "find": "$basename.*([a-fA-F0-9]{64})\"};" - } - } -}