From 7e84d77e5b3b6ab3ce0e157859dab72832ba3479 Mon Sep 17 00:00:00 2001 From: Mathias Hermansson Date: Thu, 13 Feb 2020 10:29:31 +0100 Subject: [PATCH 1/5] oraclejre8: Update to version 8u241 --- bucket/oraclejre8.json | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/bucket/oraclejre8.json b/bucket/oraclejre8.json index 7cd4e177c..882162538 100644 --- a/bucket/oraclejre8.json +++ b/bucket/oraclejre8.json @@ -1,26 +1,37 @@ { "description": "Oracle JRE 8", "homepage": "https://www.java.com/", - "version": "8u231", + "version": "8u241", "license": "https://www.oracle.com/technetwork/java/javase/terms/license/javase-license.html", "architecture": { "64bit": { - "url": "https://javadl.oracle.com/webapps/download/AutoDL?BundleId=240729_5b13a193868b4bf28bcb45c792fce896#/dl.tar.gz", - "hash": "e73ac9dc61957421d7d735965fa1badb972f9b9a147339a02a33bf896a431f61" + "url": "https://javadl.oracle.com/webapps/download/AutoDL?BundleId=241536_1f5b5a70bf22433b84d0e960903adac8#/dl.tar.gz", + "hash": "9aa43fdf8f12cb4d49fa8cb2f469916a7a761429194968668fcdcf2a375d9797" }, "32bit": { - "url": "https://javadl.oracle.com/webapps/download/AutoDL?BundleId=240727_5b13a193868b4bf28bcb45c792fce896#/dl.tar.gz", - "hash": "74dff390521aaf6f1af60396223b5b1c04de62c77c621097664d07cb015c7ec4" + "url": "https://javadl.oracle.com/webapps/download/AutoDL?BundleId=241534_1f5b5a70bf22433b84d0e960903adac8#/dl.tar.gz", + "hash": "f6803573fb3eb1bbe4aa17ebd587e1affdb33c8f6ca3ffdbba54bccbd407346c" } }, - "extract_dir": "jre1.8.0_231", + "extract_dir": "jre1.8.0_241", "env_add_path": "bin", "env_set": { "JAVA_HOME": "$dir" }, "checkver": { "url": "https://www.java.com/en/download/manual.jsp", - "regex": "(?smi).*Recommended Version 8 Update (?[\\d]+).*https://javadl.oracle.com/webapps/download/AutoDL\\?BundleId=(?[\\d_a-f]+)\">.*?Windows Offline.*https://javadl.oracle.com/webapps/download/AutoDL\\?BundleId=(?[\\d_a-f]+)\">.*?Windows Offline \\(64-bit\\)", + "regex": "(?smi).*Recommended Version 8 Update (?[\\d]+).*https://javadl.oracle.com/webapps/download/AutoDL\\?BundleId=(?[\\d]+)_(?[\\da-f]+)\">.*?Windows Offline.*https://javadl.oracle.com/webapps/download/AutoDL\\?BundleId=(?[\\d]+)_(?[\\da-f]+)\">.*?Windows Offline \\(64-bit\\)", "replace": "8u${update}" + }, + "autoupdate": { + "architecture": { + "64bit": { + "url": "https://javadl.oracle.com/webapps/download/AutoDL?BundleId=$matchBundleidb_$matchBundleb#/dl.tar.gz" + }, + "32bit": { + "url": "https://javadl.oracle.com/webapps/download/AutoDL?BundleId=$matchBundleida_$matchBundlea#/dl.tar.gz" + } + }, + "extract_dir": "jre1.8.0_$matchUpdate" } } From 1b9761141236129afb79beabc748e820298db678 Mon Sep 17 00:00:00 2001 From: Mathias Hermansson Date: Thu, 13 Feb 2020 11:14:41 +0100 Subject: [PATCH 2/5] corretto: Update to version 11.0.6.10.1-1 --- bucket/corretto.json | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/bucket/corretto.json b/bucket/corretto.json index e874f75a5..99be337a6 100644 --- a/bucket/corretto.json +++ b/bucket/corretto.json @@ -1,12 +1,12 @@ { "description": "Amazon Corretto is a no-cost, multiplatform, production-ready distribution of the Open Java Development Kit (OpenJDK)", "homepage": "https://aws.amazon.com/corretto/", - "version": "11.0.5.10.1", + "version": "11.0.6.10.1-1", "license": "GPL-2.0-only WITH Classpath-exception-2.0", "architecture": { "64bit": { - "url": "https://d3pxv6yz143wms.cloudfront.net/11.0.5.10.1/amazon-corretto-11.0.5.10.1-windows-x64.zip", - "hash": "md5:741d0fcee20754e17dd230d7eaf5dff3" + "url": "https://corretto.aws/downloads/latest/amazon-corretto-11-x64-windows-jdk.zip", + "hash": "md5:9d590d3e1d4fe8b927f0b8498f992d53" } }, "extract_to": "tmp", @@ -21,19 +21,17 @@ "JAVA_HOME": "$dir" }, "checkver": { - "url": "https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html", - "re": "//(?.*?).cloudfront.net/([\\d.]+)/(?amazon-corretto-(?:[\\d.]+)-windows)-x64.zip" + "url": "https://github.com/corretto/corretto-11/releases", + "re": "/(?:[\\d.]+)/(?amazon-corretto-([\\d.-]+)-windows)-x64-jdk.zip" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://d3pxv6yz143wms.cloudfront.net/$version/$matchFile-x64.zip" + "url": "https://corretto.aws/downloads/latest/amazon-corretto-11-x64-windows-jdk.zip", + "hash": { + "url": "https://corretto.aws/downloads/latest_checksum/amazon-corretto-11-x64-windows-jdk.zip" + } } - }, - "hash": { - "url": "https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html", - "find": "(?s)$basename.*?([a-fA-F0-9]{32})" - }, - "extract_dir": "Amazon Corretto\\jdk1.$matchMajor.0_$matchBuild" + } } } From 34e6ee6c769a0c7800e4dc7f13552d6b4428f021 Mon Sep 17 00:00:00 2001 From: Mathias Hermansson Date: Thu, 13 Feb 2020 11:14:41 +0100 Subject: [PATCH 3/5] corretto11: Update to version 11.0.6.10.1-1 --- bucket/corretto11.json | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/bucket/corretto11.json b/bucket/corretto11.json index e874f75a5..99be337a6 100644 --- a/bucket/corretto11.json +++ b/bucket/corretto11.json @@ -1,12 +1,12 @@ { "description": "Amazon Corretto is a no-cost, multiplatform, production-ready distribution of the Open Java Development Kit (OpenJDK)", "homepage": "https://aws.amazon.com/corretto/", - "version": "11.0.5.10.1", + "version": "11.0.6.10.1-1", "license": "GPL-2.0-only WITH Classpath-exception-2.0", "architecture": { "64bit": { - "url": "https://d3pxv6yz143wms.cloudfront.net/11.0.5.10.1/amazon-corretto-11.0.5.10.1-windows-x64.zip", - "hash": "md5:741d0fcee20754e17dd230d7eaf5dff3" + "url": "https://corretto.aws/downloads/latest/amazon-corretto-11-x64-windows-jdk.zip", + "hash": "md5:9d590d3e1d4fe8b927f0b8498f992d53" } }, "extract_to": "tmp", @@ -21,19 +21,17 @@ "JAVA_HOME": "$dir" }, "checkver": { - "url": "https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html", - "re": "//(?.*?).cloudfront.net/([\\d.]+)/(?amazon-corretto-(?:[\\d.]+)-windows)-x64.zip" + "url": "https://github.com/corretto/corretto-11/releases", + "re": "/(?:[\\d.]+)/(?amazon-corretto-([\\d.-]+)-windows)-x64-jdk.zip" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://d3pxv6yz143wms.cloudfront.net/$version/$matchFile-x64.zip" + "url": "https://corretto.aws/downloads/latest/amazon-corretto-11-x64-windows-jdk.zip", + "hash": { + "url": "https://corretto.aws/downloads/latest_checksum/amazon-corretto-11-x64-windows-jdk.zip" + } } - }, - "hash": { - "url": "https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html", - "find": "(?s)$basename.*?([a-fA-F0-9]{32})" - }, - "extract_dir": "Amazon Corretto\\jdk1.$matchMajor.0_$matchBuild" + } } } From b7ba78b7070640107ef243da59ed08df49010e59 Mon Sep 17 00:00:00 2001 From: Mathias Hermansson Date: Thu, 13 Feb 2020 11:14:42 +0100 Subject: [PATCH 4/5] corretto8-jre: Update to version 8.242.08.1 --- bucket/corretto8-jre.json | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/bucket/corretto8-jre.json b/bucket/corretto8-jre.json index 122c2a888..34a628b58 100644 --- a/bucket/corretto8-jre.json +++ b/bucket/corretto8-jre.json @@ -1,16 +1,16 @@ { "description": "Amazon Corretto is a no-cost, multiplatform, production-ready distribution of the Open Java Development Kit (OpenJDK)", "homepage": "https://aws.amazon.com/corretto/", - "version": "8.232.09.1", + "version": "8.242.08.1", "license": "GPL-2.0-only WITH Classpath-exception-2.0", "architecture": { "64bit": { - "url": "https://d3pxv6yz143wms.cloudfront.net/8.232.09.1/amazon-corretto-8.232.09.1-windows-x64-jre.zip", - "hash": "md5:f4b3613af15508d4e6d3f8965a1be8a3" + "url": "https://corretto.aws/downloads/latest/amazon-corretto-8-x64-windows-jre.zip", + "hash": "md5:b9aded040819457d04a36b726100e3f6" }, "32bit": { - "url": "https://d3pxv6yz143wms.cloudfront.net/8.232.09.1/amazon-corretto-8.232.09.1-windows-x86-jre.zip", - "hash": "md5:6e846838ae5189b433a38be2731af735" + "url": "https://corretto.aws/downloads/latest/amazon-corretto-8-x86-windows-jre.zip", + "hash": "md5:f7512093358cc3c5bd96d30c9cd339b2" } }, "extract_to": "tmp", @@ -25,22 +25,23 @@ "JAVA_HOME": "$dir" }, "checkver": { - "url": "https://docs.aws.amazon.com/corretto/latest/corretto-8-ug/downloads-list.html", - "re": "//(?.*?).cloudfront.net/([\\d.]+)/(?amazon-corretto-([\\d.]+)-windows)-x64-jre.zip" + "url": "https://github.com/corretto/corretto-8/releases", + "re": "/(?:[\\d.]+)/(?amazon-corretto-([\\d.-]+)-windows)-x64-jre.zip" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://d3pxv6yz143wms.cloudfront.net/$version/$matchFile-x64-jre.zip" + "url": "https://corretto.aws/downloads/latest/amazon-corretto-8-x64-windows-jre.zip", + "hash": { + "url": "https://corretto.aws/downloads/latest_checksum/amazon-corretto-8-x64-windows-jre.zip" + } }, "32bit": { - "url": "https://d3pxv6yz143wms.cloudfront.net/$version/$matchFile-x86-jre.zip" + "url": "https://corretto.aws/downloads/latest/amazon-corretto-8-x86-windows-jre.zip", + "hash": { + "url": "https://corretto.aws/downloads/latest_checksum/amazon-corretto-8-x86-windows-jre.zip" + } } - }, - "hash": { - "url": "https://docs.aws.amazon.com/corretto/latest/corretto-8-ug/downloads-list.html", - "find": "(?s)$basename.*?([a-fA-F0-9]{32})" - }, - "extract_dir": "Amazon Corretto\\jdk1.$matchMajor.0_$matchBuild" + } } } From 38a8ff1bf61fdfccea62e0c122556339bf5a6e35 Mon Sep 17 00:00:00 2001 From: Mathias Hermansson Date: Thu, 13 Feb 2020 11:14:42 +0100 Subject: [PATCH 5/5] corretto8: Update to version 8.242.08.1 --- bucket/corretto8.json | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/bucket/corretto8.json b/bucket/corretto8.json index 4d9030678..c28c0da0a 100644 --- a/bucket/corretto8.json +++ b/bucket/corretto8.json @@ -1,16 +1,16 @@ { "description": "Amazon Corretto is a no-cost, multiplatform, production-ready distribution of the Open Java Development Kit (OpenJDK)", "homepage": "https://aws.amazon.com/corretto/", - "version": "8.232.09.1", + "version": "8.242.08.1", "license": "GPL-2.0-only WITH Classpath-exception-2.0", "architecture": { "64bit": { - "url": "https://d3pxv6yz143wms.cloudfront.net/8.232.09.1/amazon-corretto-8.232.09.1-windows-x64-jdk.zip", - "hash": "md5:b0d375cbcfcda6d04e87888c6c6763d3" + "url": "https://corretto.aws/downloads/latest/amazon-corretto-8-x64-windows-jdk.zip", + "hash": "md5:4e33650b437008622771c8947f145bc5" }, "32bit": { - "url": "https://d3pxv6yz143wms.cloudfront.net/8.232.09.1/amazon-corretto-8.232.09.1-windows-x86-jdk.zip", - "hash": "md5:463d8c7d19bafbf9b307c19e7b516c44" + "url": "https://corretto.aws/downloads/latest/amazon-corretto-8-x86-windows-jdk.zip", + "hash": "md5:90644855f7625d69308dadc4f12c9289" } }, "extract_to": "tmp", @@ -25,22 +25,23 @@ "JAVA_HOME": "$dir" }, "checkver": { - "url": "https://docs.aws.amazon.com/corretto/latest/corretto-8-ug/downloads-list.html", - "re": "//(?.*?).cloudfront.net/([\\d.]+)/(?amazon-corretto-([\\d.]+)-windows)-x64-jdk.zip" + "url": "https://github.com/corretto/corretto-8/releases", + "re": "/(?:[\\d.]+)/(?amazon-corretto-([\\d.-]+)-windows)-x64-jdk.zip" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://d3pxv6yz143wms.cloudfront.net/$version/$matchFile-x64-jdk.zip" + "url": "https://corretto.aws/downloads/latest/amazon-corretto-8-x64-windows-jdk.zip", + "hash": { + "url": "https://corretto.aws/downloads/latest_checksum/amazon-corretto-8-x64-windows-jdk.zip" + } }, "32bit": { - "url": "https://d3pxv6yz143wms.cloudfront.net/$version/$matchFile-x86-jdk.zip" + "url": "https://corretto.aws/downloads/latest/amazon-corretto-8-x86-windows-jdk.zip", + "hash": { + "url": "https://corretto.aws/downloads/latest_checksum/amazon-corretto-8-x86-windows-jdk.zip" + } } - }, - "hash": { - "url": "https://docs.aws.amazon.com/corretto/latest/corretto-8-ug/downloads-list.html", - "find": "(?s)$basename.*?([a-fA-F0-9]{32})" - }, - "extract_dir": "Amazon Corretto\\jdk1.$matchMajor.0_$matchBuild" + } } }