dox4/Java
1
0
Fork 0
mirror of https://github.com/ScoopInstaller/Java.git synced 2026-08-05 16:53:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

microsoft-jdk: Fix regex and extract dir, use static versions in manifests (#317)

Browse Source
This commit is contained in:
Mathias Hermansson 2021-10-07 11:02:43 +02:00 committed by GitHub
parent c9a46b0c96
commit c6eeac10ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bucket/microsoft-jdk.json
View File

@ -1,23 +1,22 @@
{
"description": "The Microsoft Build of OpenJDK is a no-cost long-term supported distribution and Microsoft's way to collaborate and contribute to the Java ecosystem.",
"homepage": "https://www.microsoft.com/openjdk/",
"version": "16.0.2.7.1",
"version": "17.35.1",
"license": "GPL-2.0-only WITH Classpath-exception-2.0",
"architecture": {
"64bit": {
"url": "https://aka.ms/download-jdk/microsoft-jdk-16.0.2.7.1-windows-x64.zip",
"hash": "2911ef05fc64fd9f6a992807416f3806f1862a545fe2fd72b87fcdd1ad9371ca"
"url": "https://aka.ms/download-jdk/microsoft-jdk-17.35.1-windows-x64.zip",
"hash": "9dd44c04f7910f473f48df3432043b4e125a70fe70cf1095afd5b2480a90582d"
}
},
"extract_dir": "jdk-16.0.2+7",
"extract_dir": "jdk-17+35",
"env_add_path": "bin",
"env_set": {
"JAVA_HOME": "$dir"
},
"checkver": {
"url": "https://docs.microsoft.com/java/openjdk/download",
"regex": "(?<ms>microsoft-jdk-([\\d.]+)-windows-x64).zip",
"reverse": true
"regex": "(?<ms>microsoft-jdk-((?<ver>[\\d.]+?).(?<build>[\\d]+).[\\d]+)-windows-x64).zip"
},
"autoupdate": {
"architecture": {
@ -28,6 +27,6 @@
"hash": {
"url": "$url.sha256sum.txt"
},
"extract_dir": "jdk-$matchHead+$buildVersion"
"extract_dir": "jdk-$matchVer+$matchBuild"
}
}

6
bucket/microsoft-lts-jdk.json
View File

@ -9,14 +9,14 @@
"hash": "9dd44c04f7910f473f48df3432043b4e125a70fe70cf1095afd5b2480a90582d"
}
},
"extract_dir": "jdk-17.35.1+",
"extract_dir": "jdk-17+35",
"env_add_path": "bin",
"env_set": {
"JAVA_HOME": "$dir"
},
"checkver": {
"url": "https://docs.microsoft.com/java/openjdk/download",
"regex": "(?<ms>microsoft-jdk-([\\d.]+)-windows-x64).zip"
"regex": "(?<ms>microsoft-jdk-((?<ver>17[\\d.]*?).(?<build>[\\d]+).[\\d]+)-windows-x64).zip"
},
"autoupdate": {
"architecture": {
@ -27,6 +27,6 @@
"hash": {
"url": "$url.sha256sum.txt"
},
"extract_dir": "jdk-$matchHead+$buildVersion"
"extract_dir": "jdk-$matchVer+$matchBuild"
}
}

12
bucket/microsoft11-jdk.json
View File

@ -1,22 +1,22 @@
{
"description": "The Microsoft Build of OpenJDK is a no-cost long-term supported distribution and Microsoft's way to collaborate and contribute to the Java ecosystem.",
"homepage": "https://www.microsoft.com/openjdk/",
"version": "17.35.1",
"version": "11.0.12.7.1",
"license": "GPL-2.0-only WITH Classpath-exception-2.0",
"architecture": {
"64bit": {
"url": "https://aka.ms/download-jdk/microsoft-jdk-17.35.1-windows-x64.zip",
"hash": "9dd44c04f7910f473f48df3432043b4e125a70fe70cf1095afd5b2480a90582d"
"url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.12.7.1-windows-x64.zip",
"hash": "c520c316353c6b0f8a4f8be3763664e44473b57f1e078922d5d2a8d3a8e84041"
}
},
"extract_dir": "jdk-17.35.1+",
"extract_dir": "jdk-11.0.12+7",
"env_add_path": "bin",
"env_set": {
"JAVA_HOME": "$dir"
},
"checkver": {
"url": "https://docs.microsoft.com/java/openjdk/download",
"regex": "(?<ms>microsoft-jdk-([\\d.]+)-windows-x64).zip"
"regex": "(?<ms>microsoft-jdk-((?<ver>11[\\d.]*?).(?<build>[\\d]+).[\\d]+)-windows-x64).zip"
},
"autoupdate": {
"architecture": {
@ -27,6 +27,6 @@
"hash": {
"url": "$url.sha256sum.txt"
},
"extract_dir": "jdk-$matchHead+$buildVersion"
"extract_dir": "jdk-$matchVer+$matchBuild"
}
}

5
bucket/microsoft16-jdk.json
View File

@ -16,8 +16,7 @@
},
"checkver": {
"url": "https://docs.microsoft.com/java/openjdk/download",
"regex": "(?<ms>microsoft-jdk-([\\d.]+)-windows-x64).zip",
"reverse": true
"regex": "(?<ms>microsoft-jdk-((?<ver>16[\\d.]*?).(?<build>[\\d]+).[\\d]+)-windows-x64).zip"
},
"autoupdate": {
"architecture": {
@ -28,6 +27,6 @@
"hash": {
"url": "$url.sha256sum.txt"
},
"extract_dir": "jdk-$matchHead+$buildVersion"
"extract_dir": "jdk-$matchVer+$matchBuild"
}
}