From a3007d5478ea87a4e8e2bd448072523b78ecab1a Mon Sep 17 00:00:00 2001 From: Mathias Hermansson Date: Thu, 21 Oct 2021 14:10:07 +0200 Subject: [PATCH] ojdkbuild*: Manifest maintenance (#318) --- bucket/ojdkbuild-full.json | 17 +++++++++-------- bucket/ojdkbuild.json | 12 ++++++------ bucket/ojdkbuild10-full.json | 1 + bucket/ojdkbuild11-full.json | 13 +++++++------ bucket/ojdkbuild11.json | 2 +- bucket/ojdkbuild12-full.json | 5 +++-- bucket/ojdkbuild13-full.json | 5 +++-- bucket/ojdkbuild14-full.json | 5 +++-- bucket/ojdkbuild8-full.json | 3 ++- bucket/ojdkbuild8.json | 2 +- bucket/ojdkbuild9-full.json | 1 + 11 files changed, 37 insertions(+), 29 deletions(-) diff --git a/bucket/ojdkbuild-full.json b/bucket/ojdkbuild-full.json index f795325c3..d2a5ad8cd 100644 --- a/bucket/ojdkbuild-full.json +++ b/bucket/ojdkbuild-full.json @@ -1,30 +1,31 @@ { "description": "OpenJDK binaries built using source code from the CentOS project", "homepage": "https://github.com/ojdkbuild/ojdkbuild", - "version": "14.0.2.12-1", + "version": "11.0.12.7-1", "license": "GPL-2.0-only WITH Classpath-exception-2.0", "architecture": { "64bit": { - "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/java-14-openjdk-14.0.2.12-1/java-14-openjdk-14.0.2.12-1.windows.ojdkbuild.x86_64.msi", - "hash": "9786542af2b54af9768f7c2d2ca296b404be26bd4ec328f837757d427b2b9eb7", - "extract_dir": "ojdkbuild\\java-14-openjdk-14.0.2-1" + "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/java-11-openjdk-11.0.12.7-1/java-11-openjdk-11.0.12.7-1.windows.ojdkbuild.x86_64.msi", + "hash": "975fe76ce3e821251313e9a17e248f74a875e1d8bff40f026b4573062bae2a10" } }, + "pre_install": "scoop config MSIEXTRACT_USE_LESSMSI True", + "extract_dir": "ojdkbuild\\java-11-openjdk-11.0.12-1", "env_add_path": "bin", "env_set": { "JAVA_HOME": "$dir" }, "checkver": { - "url": "https://raw.githubusercontent.com/ojdkbuild/ojdkbuild/master/README.md", - "re": "download/(?(?:java-14-openjdk-)?(?(?14[\\d.]+)\\.[\\d]+-(?[\\db.]+)))/(?java-(?[\\d.]+)-openjdk-([\\db.-]+)(.ojdkbuild|.windows){2}).x86_64.msi" + "url": "https://github.com/ojdkbuild/ojdkbuild/raw/master/README.md", + "re": "download/(?(?:java-[\\d]{2,}-openjdk-)?(?(?[\\d]{2,}[\\d.]+).[\\d]+-(?[\\db.]+)))/(?java-(?[\\d.]+)-openjdk-([\\db.-]+)(.ojdkbuild|.windows){2}).x86_64.msi" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/$matchFolder/$matchUrl.x86_64.msi", - "extract_dir": "ojdkbuild\\java-$matchMajor-openjdk-$matchShort-$matchBuild" + "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/$matchFolder/$matchUrl.x86_64.msi" } }, + "extract_dir": "ojdkbuild\\java-$matchMajor-openjdk-$matchShort-$matchBuild", "hash": { "url": "$url.sha256" } diff --git a/bucket/ojdkbuild.json b/bucket/ojdkbuild.json index c221d42aa..6c7898dc7 100644 --- a/bucket/ojdkbuild.json +++ b/bucket/ojdkbuild.json @@ -1,13 +1,13 @@ { "description": "OpenJDK binaries built using source code from the CentOS project", "homepage": "https://github.com/ojdkbuild/ojdkbuild", - "version": "14.0.2.12-1", + "version": "11.0.12.7-1", "license": "GPL-2.0-only WITH Classpath-exception-2.0", "architecture": { "64bit": { - "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/java-14-openjdk-14.0.2.12-1/java-14-openjdk-14.0.2.12-1.windows.ojdkbuild.x86_64.zip", - "hash": "cb84689affd76eb574bddbf61060fbcb116ddfdb0b53962b31d31705e5749517", - "extract_dir": "java-14-openjdk-14.0.2.12-1.windows.ojdkbuild.x86_64" + "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/java-11-openjdk-11.0.12.7-1/java-11-openjdk-11.0.12.7-1.windows.ojdkbuild.x86_64.zip", + "hash": "656e551e23c1302312e6a497fac3a65fc3ce186bc0a428646ab811294b01a439", + "extract_dir": "java-11-openjdk-11.0.12.7-1.windows.ojdkbuild.x86_64" } }, "env_add_path": "bin", @@ -15,8 +15,8 @@ "JAVA_HOME": "$dir" }, "checkver": { - "url": "https://raw.githubusercontent.com/ojdkbuild/ojdkbuild/master/README.md", - "re": "download/(?(?:java-14-openjdk-)?(?14[\\db.-]+))/(?java-(?[\\d.]+)-openjdk-([\\db.-]+)(.ojdkbuild|.windows){2}).x86_64.zip" + "url": "https://github.com/ojdkbuild/ojdkbuild/raw/master/README.md", + "re": "download/(?(?:java-[\\d]{2,}-openjdk-)?(?[\\d]{2,}[\\db.-]+))/(?java-(?[\\d.]+)-openjdk-([\\db.-]+)(.ojdkbuild|.windows){2}).x86_64.zip" }, "autoupdate": { "architecture": { diff --git a/bucket/ojdkbuild10-full.json b/bucket/ojdkbuild10-full.json index b4a6258c6..0ffab7c65 100644 --- a/bucket/ojdkbuild10-full.json +++ b/bucket/ojdkbuild10-full.json @@ -13,6 +13,7 @@ "hash": "73d51aabf911552b188232e63f52bde99ae14fb52693e0e7fedc06abb23c49a2" } }, + "pre_install": "scoop config MSIEXTRACT_USE_LESSMSI True", "extract_dir": "ojdkbuild\\java-1.10.0-openjdk-1.10.0.2-1", "env_add_path": "bin", "env_set": { diff --git a/bucket/ojdkbuild11-full.json b/bucket/ojdkbuild11-full.json index 0988276c9..ab82666fe 100644 --- a/bucket/ojdkbuild11-full.json +++ b/bucket/ojdkbuild11-full.json @@ -6,27 +6,28 @@ "architecture": { "64bit": { "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/java-11-openjdk-11.0.12.7-1/java-11-openjdk-11.0.12.7-1.windows.ojdkbuild.x86_64.msi", - "hash": "975fe76ce3e821251313e9a17e248f74a875e1d8bff40f026b4573062bae2a10", - "extract_dir": "ojdkbuild\\java-11-openjdk-11.0.12-1" + "hash": "975fe76ce3e821251313e9a17e248f74a875e1d8bff40f026b4573062bae2a10" } }, + "pre_install": "scoop config MSIEXTRACT_USE_LESSMSI True", + "extract_dir": "ojdkbuild\\java-11-openjdk-11.0.12-1", "env_add_path": "bin", "env_set": { "JAVA_HOME": "$dir" }, "checkver": { - "url": "https://raw.githubusercontent.com/ojdkbuild/ojdkbuild/master/README.md", + "url": "https://github.com/ojdkbuild/ojdkbuild/raw/master/README.md", "re": "download/(?(?:java-11-openjdk-)?(?(?11[\\d.]+)\\.[\\d]+-(?[\\db.]+)))/(?java-(?[\\d.]+)-openjdk-([\\db.-]+)(.ojdkbuild|.windows){2}).x86_64.msi" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/$matchFolder/$matchUrl.x86_64.msi", - "extract_dir": "ojdkbuild\\java-$matchMajor-openjdk-$matchShort-$matchBuild" + "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/$matchFolder/$matchUrl.x86_64.msi" } }, "hash": { "url": "$url.sha256" - } + }, + "extract_dir": "ojdkbuild\\java-$matchMajor-openjdk-$matchShort-$matchBuild" } } diff --git a/bucket/ojdkbuild11.json b/bucket/ojdkbuild11.json index 4bb776486..94b823972 100644 --- a/bucket/ojdkbuild11.json +++ b/bucket/ojdkbuild11.json @@ -15,7 +15,7 @@ "JAVA_HOME": "$dir" }, "checkver": { - "url": "https://raw.githubusercontent.com/ojdkbuild/ojdkbuild/master/README.md", + "url": "https://github.com/ojdkbuild/ojdkbuild/raw/master/README.md", "re": "download/(?(?:java-11-openjdk-)?(?11[\\db.-]+))/(?java-(?[\\d.]+)-openjdk-([\\db.-]+)(.ojdkbuild|.windows){2}).x86_64.zip" }, "autoupdate": { diff --git a/bucket/ojdkbuild12-full.json b/bucket/ojdkbuild12-full.json index a1ec504ed..39ba60a6a 100644 --- a/bucket/ojdkbuild12-full.json +++ b/bucket/ojdkbuild12-full.json @@ -6,10 +6,11 @@ "architecture": { "64bit": { "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/java-12-openjdk-12.0.2.9-1/java-12-openjdk-12.0.2.9-1.windows.ojdkbuild.x86_64.msi", - "hash": "22db792f00f376e31fca5da6dd7b74d02b55fc1d7f36d8abe48783d0a2a5b5f8", - "extract_dir": "ojdkbuild\\java-12-openjdk-12.0.2-1" + "hash": "22db792f00f376e31fca5da6dd7b74d02b55fc1d7f36d8abe48783d0a2a5b5f8" } }, + "pre_install": "scoop config MSIEXTRACT_USE_LESSMSI True", + "extract_dir": "ojdkbuild\\java-12-openjdk-12.0.2-1", "env_add_path": "bin", "env_set": { "JAVA_HOME": "$dir" diff --git a/bucket/ojdkbuild13-full.json b/bucket/ojdkbuild13-full.json index 1ab290ab9..c907f005b 100644 --- a/bucket/ojdkbuild13-full.json +++ b/bucket/ojdkbuild13-full.json @@ -6,10 +6,11 @@ "architecture": { "64bit": { "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/java-13-openjdk-13.0.3.3-1/java-13-openjdk-13.0.3.3-1.windows.ojdkbuild.x86_64.msi", - "hash": "37e5393e00520bd479aa408d0f6e82c22f981ca02b8b5eeb9057b67fb1cceb92", - "extract_dir": "ojdkbuild\\java-13-openjdk-13.0.3-1" + "hash": "37e5393e00520bd479aa408d0f6e82c22f981ca02b8b5eeb9057b67fb1cceb92" } }, + "pre_install": "scoop config MSIEXTRACT_USE_LESSMSI True", + "extract_dir": "ojdkbuild\\java-13-openjdk-13.0.3-1", "env_add_path": "bin", "env_set": { "JAVA_HOME": "$dir" diff --git a/bucket/ojdkbuild14-full.json b/bucket/ojdkbuild14-full.json index e70069a0e..5a8fe863b 100644 --- a/bucket/ojdkbuild14-full.json +++ b/bucket/ojdkbuild14-full.json @@ -6,10 +6,11 @@ "architecture": { "64bit": { "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/java-14-openjdk-14.0.2.12-1/java-14-openjdk-14.0.2.12-1.windows.ojdkbuild.x86_64.msi", - "hash": "9786542af2b54af9768f7c2d2ca296b404be26bd4ec328f837757d427b2b9eb7", - "extract_dir": "ojdkbuild\\java-14-openjdk-14.0.2-1" + "hash": "9786542af2b54af9768f7c2d2ca296b404be26bd4ec328f837757d427b2b9eb7" } }, + "pre_install": "scoop config MSIEXTRACT_USE_LESSMSI True", + "extract_dir": "ojdkbuild\\java-14-openjdk-14.0.2-1", "env_add_path": "bin", "env_set": { "JAVA_HOME": "$dir" diff --git a/bucket/ojdkbuild8-full.json b/bucket/ojdkbuild8-full.json index e082b4a95..65aa26ebd 100644 --- a/bucket/ojdkbuild8-full.json +++ b/bucket/ojdkbuild8-full.json @@ -13,13 +13,14 @@ "hash": "54ccf900c564fd19ee3c511ef25aac2dfcc6e3bebf90d7a908f2594140d7842c" } }, + "pre_install": "scoop config MSIEXTRACT_USE_LESSMSI True", "extract_dir": "ojdkbuild\\java-1.8.0-openjdk-1.8.0.302-1", "env_add_path": "bin", "env_set": { "JAVA_HOME": "$dir" }, "checkver": { - "url": "https://raw.githubusercontent.com/ojdkbuild/ojdkbuild/master/README.md", + "url": "https://github.com/ojdkbuild/ojdkbuild/raw/master/README.md", "re": "download/(?(?:java-1.8.0-openjdk-)?(?(?1.8.0[\\d.]+)-(?[\\d]+)(?:[\\db.]*)))(?-x86)?/(?java-(?[\\d.]+)-openjdk-([\\db.-]+)(.ojdkbuild|.windows){2}).x86.msi" }, "autoupdate": { diff --git a/bucket/ojdkbuild8.json b/bucket/ojdkbuild8.json index 4b5c4c463..e73df54db 100644 --- a/bucket/ojdkbuild8.json +++ b/bucket/ojdkbuild8.json @@ -20,7 +20,7 @@ "JAVA_HOME": "$dir" }, "checkver": { - "url": "https://raw.githubusercontent.com/ojdkbuild/ojdkbuild/master/README.md", + "url": "https://github.com/ojdkbuild/ojdkbuild/raw/master/README.md", "re": "download/(?(?:java-1.8.0-openjdk-)?(?1.8.0[\\db.-]+))(?-x86)?/(?java-(?[\\d.]+)-openjdk-([\\db.-]+)(.ojdkbuild|.windows){2}).x86.zip" }, "autoupdate": { diff --git a/bucket/ojdkbuild9-full.json b/bucket/ojdkbuild9-full.json index d4b9a4af7..d22b49c45 100644 --- a/bucket/ojdkbuild9-full.json +++ b/bucket/ojdkbuild9-full.json @@ -9,6 +9,7 @@ "hash": "8784a13acaf650a71a3c5becc5e407e3074dd3a6289fd4e2a1bcbbd41e36684b" } }, + "pre_install": "scoop config MSIEXTRACT_USE_LESSMSI True", "extract_dir": "ojdkbuild\\java-1.9.0-openjdk-1.9.0.4-1", "env_add_path": "bin", "env_set": {