Compare commits

...

2 Commits

Author SHA1 Message Date
Nathan McCarty fe8cd65c2b
Update sources 2023-05-16 12:22:25 -04:00
Nathan McCarty 50809fa040
Fix updater to properly grab openj9 versions 2023-05-16 12:21:28 -04:00
6 changed files with 580 additions and 345 deletions

View File

@ -3,95 +3,95 @@
"semeru": { "semeru": {
"versions": { "versions": {
"jdk10": { "jdk10": {
"link": "https://github.com/AdoptOpenJDK/openjdk10-binaries/releases/download/jdk-10.0.2%2B13.1/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz", "link": "https://github.com/AdoptOpenJDK/openjdk10-openj9-releases/releases/download/jdk-10.0.2%2B13_openj9-0.9.0/OpenJDK10-OPENJ9_x64_Linux_jdk-10.0.2.13_openj9-0.9.0.tar.gz",
"major_version": 10, "major_version": 10,
"sha256": "3998c36c7feb4bb7a565b3d33609ec67acd40f1ae5addf103378f2ef32ab377f", "sha256": "1ef0dab3853b2f3666091854ef8149fcb85970254558d5d62cfa9446831779d1",
"java_version": "10.0.2+13.1" "java_version": "10.0.2+13"
}, },
"jdk11": { "jdk11": {
"link": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru11-binaries/releases/download/jdk-11.0.18%2B10_openj9-0.36.1/ibm-semeru-open-jdk_x64_linux_11.0.18_10_openj9-0.36.1.tar.gz",
"major_version": 11, "major_version": 11,
"sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581", "sha256": "256135d0992f23acaf61cf955325e6a899ebbd41bb2c7fdd2fe7ac4c2ee55e38",
"java_version": "11.0.19+7" "java_version": "11.0.18+10"
}, },
"jdk12": { "jdk12": {
"link": "https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jdk_x64_linux_hotspot_12.0.2_10.tar.gz", "link": "https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10_openj9-0.15.1/OpenJDK12U-jdk_x64_linux_openj9_12.0.2_10_openj9-0.15.1.tar.gz",
"major_version": 12, "major_version": 12,
"sha256": "1202f536984c28d68681d51207a84b6c76e5998579132d3fe1b8085aa6a5f21e", "sha256": "e2f6f021560ddf217c60980ac147856e5b36f0ab0a0fd70091800d6042136229",
"java_version": "12.0.2+10" "java_version": "12.0.2+10"
}, },
"jdk13": { "jdk13": {
"link": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz", "link": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
"major_version": 13, "major_version": 13,
"sha256": "9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998", "sha256": "aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590",
"java_version": "13.0.2+8" "java_version": "13.0.2+8"
}, },
"jdk14": { "jdk14": {
"link": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz", "link": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz",
"major_version": 14, "major_version": 14,
"sha256": "7d5ee7e06909b8a99c0d029f512f67b092597aa5b0e78c109bd59405bbfa74fe", "sha256": "306f7138cdb65daaf2596ec36cafbde72088144c83b2e964f0193662e6caf3be",
"java_version": "14.0.2+12" "java_version": "14.0.2+12"
}, },
"jdk15": { "jdk15": {
"link": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz", "link": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
"major_version": 15, "major_version": 15,
"sha256": "94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d", "sha256": "5515ccd79b1b5e8d8a615b80d5fe1272f7bb41100e46d94fb78ee611ea014816",
"java_version": "15.0.2+7" "java_version": "15.0.2+7"
}, },
"jdk16": { "jdk16": {
"link": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru16-binaries/releases/download/jdk-16.0.2%2B7_openj9-0.27.0/ibm-semeru-open-jdk_x64_linux_16.0.2_7_openj9-0.27.0.tar.gz",
"major_version": 16, "major_version": 16,
"sha256": "323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c", "sha256": "1349eb9a1d9af491a1984d66a80126730357c4a5c4fcbe7112a2c832f6c0886e",
"java_version": "16.0.2+7" "java_version": "16.0.2+7"
}, },
"jdk17": { "jdk17": {
"link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru17-binaries/releases/download/jdk-17.0.6%2B10_openj9-0.36.0/ibm-semeru-open-jdk_x64_linux_17.0.6_10_openj9-0.36.0.tar.gz",
"major_version": 17, "major_version": 17,
"sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b", "sha256": "ce39a4f7c2e08e56083f17f3e44c05e0fbbeba775e670f015a337679c99c54c6",
"java_version": "17.0.7+7" "java_version": "17.0.6+10"
}, },
"jdk18": { "jdk18": {
"link": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_linux_hotspot_18.0.2.1_1.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru18-binaries/releases/download/jdk-18.0.2%2B9_openj9-0.33.1/ibm-semeru-open-jdk_x64_linux_18.0.2_9_openj9-0.33.1.tar.gz",
"major_version": 18, "major_version": 18,
"sha256": "7d6beba8cfc0a8347f278f7414351191a95a707d46b6586e9a786f2669af0f8b", "sha256": "b694d47666035b1f7870bc3749aa7c1903d50976eab3772fd81c32dab2aa8e64",
"java_version": "18.0.2.1+1" "java_version": "18.0.2+9"
}, },
"jdk19": { "jdk19": {
"link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_linux_hotspot_19.0.2_7.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru19-binaries/releases/download/jdk-19.0.2%2B7_openj9-0.37.0/ibm-semeru-open-jdk_x64_linux_19.0.2_7_openj9-0.37.0.tar.gz",
"major_version": 19, "major_version": 19,
"sha256": "3a3ba7a3f8c3a5999e2c91ea1dca843435a0d1c43737bd2f6822b2f02fc52165", "sha256": "5fd94c57afe0d4e778bfc284f3f7830c34de59bed4faba12d4bb46a77d0b516e",
"java_version": "19.0.2+7" "java_version": "19.0.2+7"
}, },
"jdk8": { "jdk8": {
"link": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru8-binaries/releases/download/jdk8u362-b09_openj9-0.36.0/ibm-semeru-open-jdk_x64_linux_8u362b09_openj9-0.36.0.tar.gz",
"major_version": 8, "major_version": 8,
"sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c", "sha256": "4c956f08cbe02d43a06536e9eae888925cc495a669bd024606389bec5ea6964a",
"java_version": "1.8.0_372-b07" "java_version": "1.8.0_362-b09"
}, },
"jdk9": { "jdk9": {
"link": "https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9%2B181/OpenJDK9U-jdk_x64_linux_hotspot_9_181.tar.gz", "link": "https://github.com/AdoptOpenJDK/openjdk9-openj9-releases/releases/download/jdk-9.0.4%2B12_openj9-0.9.0/OpenJDK9-OPENJ9_x64_Linux_jdk-9.0.4.12_openj9-0.9.0.tar.gz",
"major_version": 9, "major_version": 9,
"sha256": "ebe1eaad73584f70ab4e587ab9367fb15af820745979e68350fe80fadf615df8", "sha256": "d5bb41b7ed4fc1a6aba0914718aff4abec42acf18c776b7641efcbbb761e6e6b",
"java_version": "9+181" "java_version": "9.0.4+12"
} }
}, },
"latest": { "latest": {
"link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk19u-2023-02-28-13-32-beta/OpenJDK19U-jdk_x64_linux_hotspot_2023-02-28-13-32.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru19-binaries/releases/download/jdk-19.0.2%2B7_openj9-0.37.0/ibm-semeru-open-jdk_x64_linux_19.0.2_7_openj9-0.37.0.tar.gz",
"major_version": 19, "major_version": 19,
"sha256": "fb78a338b97688cb9a72ff49779636afb9c38882e6275df0760da74239b45313", "sha256": "5fd94c57afe0d4e778bfc284f3f7830c34de59bed4faba12d4bb46a77d0b516e",
"java_version": "19.0.2-beta+7-202302280337" "java_version": "19.0.2+7"
}, },
"stable": { "stable": {
"link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk19u-2023-02-28-13-32-beta/OpenJDK19U-jdk_x64_linux_hotspot_2023-02-28-13-32.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru19-binaries/releases/download/jdk-19.0.2%2B7_openj9-0.37.0/ibm-semeru-open-jdk_x64_linux_19.0.2_7_openj9-0.37.0.tar.gz",
"major_version": 19, "major_version": 19,
"sha256": "fb78a338b97688cb9a72ff49779636afb9c38882e6275df0760da74239b45313", "sha256": "5fd94c57afe0d4e778bfc284f3f7830c34de59bed4faba12d4bb46a77d0b516e",
"java_version": "19.0.2-beta+7-202302280337" "java_version": "19.0.2+7"
}, },
"lts": { "lts": {
"link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17u-2023-05-12-05-40-beta/OpenJDK17U-jdk_x64_linux_hotspot_2023-05-12-05-40.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru17-binaries/releases/download/jdk-17.0.6%2B10_openj9-0.36.0/ibm-semeru-open-jdk_x64_linux_17.0.6_10_openj9-0.36.0.tar.gz",
"major_version": 17, "major_version": 17,
"sha256": "004fe3df67c575b3b89eae9a1230fd0c53439e37427481a06f55bb845bf39f80", "sha256": "ce39a4f7c2e08e56083f17f3e44c05e0fbbeba775e670f015a337679c99c54c6",
"java_version": "17.0.8-beta+2-202305120032" "java_version": "17.0.6+10"
} }
}, },
"temurin": { "temurin": {
@ -146,16 +146,16 @@
"java_version": "20.0.1-beta+9-202305100346" "java_version": "20.0.1-beta+9-202305100346"
}, },
"stable": { "stable": {
"link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk20u-2023-05-10-08-56-beta/OpenJDK20U-jdk_x64_linux_hotspot_2023-05-10-08-56.tar.gz", "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_linux_hotspot_20.0.1_9.tar.gz",
"major_version": 20, "major_version": 20,
"sha256": "d73db1554c637bf1619cd0e23f27e3e236ab505359934afbf7abe0cd357288c9", "sha256": "43ad054f135a7894dc87ad5d10ad45d8e82846186515892acdbc17c2c5cd27e4",
"java_version": "20.0.1-beta+9-202305100346" "java_version": "20.0.1+9"
}, },
"lts": { "lts": {
"link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17u-2023-05-12-05-40-beta/OpenJDK17U-jdk_x64_linux_hotspot_2023-05-12-05-40.tar.gz", "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz",
"major_version": 17, "major_version": 17,
"sha256": "004fe3df67c575b3b89eae9a1230fd0c53439e37427481a06f55bb845bf39f80", "sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b",
"java_version": "17.0.8-beta+2-202305120032" "java_version": "17.0.7+7"
} }
} }
}, },
@ -163,95 +163,95 @@
"semeru": { "semeru": {
"versions": { "versions": {
"jdk10": { "jdk10": {
"link": "https://github.com/AdoptOpenJDK/openjdk10-binaries/releases/download/jdk-10.0.2%2B13.1/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz", "link": "https://github.com/AdoptOpenJDK/openjdk10-openj9-releases/releases/download/jdk-10.0.2%2B13_openj9-0.9.0/OpenJDK10-OPENJ9_x64_Linux_jdk-10.0.2.13_openj9-0.9.0.tar.gz",
"major_version": 10, "major_version": 10,
"sha256": "3998c36c7feb4bb7a565b3d33609ec67acd40f1ae5addf103378f2ef32ab377f", "sha256": "1ef0dab3853b2f3666091854ef8149fcb85970254558d5d62cfa9446831779d1",
"java_version": "10.0.2+13.1" "java_version": "10.0.2+13"
}, },
"jdk11": { "jdk11": {
"link": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru11-binaries/releases/download/jdk-11.0.18%2B10_openj9-0.36.1/ibm-semeru-open-jdk_x64_linux_11.0.18_10_openj9-0.36.1.tar.gz",
"major_version": 11, "major_version": 11,
"sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581", "sha256": "256135d0992f23acaf61cf955325e6a899ebbd41bb2c7fdd2fe7ac4c2ee55e38",
"java_version": "11.0.19+7" "java_version": "11.0.18+10"
}, },
"jdk12": { "jdk12": {
"link": "https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jdk_x64_linux_hotspot_12.0.2_10.tar.gz", "link": "https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10_openj9-0.15.1/OpenJDK12U-jdk_x64_linux_openj9_12.0.2_10_openj9-0.15.1.tar.gz",
"major_version": 12, "major_version": 12,
"sha256": "1202f536984c28d68681d51207a84b6c76e5998579132d3fe1b8085aa6a5f21e", "sha256": "e2f6f021560ddf217c60980ac147856e5b36f0ab0a0fd70091800d6042136229",
"java_version": "12.0.2+10" "java_version": "12.0.2+10"
}, },
"jdk13": { "jdk13": {
"link": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz", "link": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
"major_version": 13, "major_version": 13,
"sha256": "9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998", "sha256": "aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590",
"java_version": "13.0.2+8" "java_version": "13.0.2+8"
}, },
"jdk14": { "jdk14": {
"link": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz", "link": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz",
"major_version": 14, "major_version": 14,
"sha256": "7d5ee7e06909b8a99c0d029f512f67b092597aa5b0e78c109bd59405bbfa74fe", "sha256": "306f7138cdb65daaf2596ec36cafbde72088144c83b2e964f0193662e6caf3be",
"java_version": "14.0.2+12" "java_version": "14.0.2+12"
}, },
"jdk15": { "jdk15": {
"link": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz", "link": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
"major_version": 15, "major_version": 15,
"sha256": "94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d", "sha256": "5515ccd79b1b5e8d8a615b80d5fe1272f7bb41100e46d94fb78ee611ea014816",
"java_version": "15.0.2+7" "java_version": "15.0.2+7"
}, },
"jdk16": { "jdk16": {
"link": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru16-binaries/releases/download/jdk-16.0.2%2B7_openj9-0.27.0/ibm-semeru-open-jdk_x64_linux_16.0.2_7_openj9-0.27.0.tar.gz",
"major_version": 16, "major_version": 16,
"sha256": "323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c", "sha256": "1349eb9a1d9af491a1984d66a80126730357c4a5c4fcbe7112a2c832f6c0886e",
"java_version": "16.0.2+7" "java_version": "16.0.2+7"
}, },
"jdk17": { "jdk17": {
"link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru17-binaries/releases/download/jdk-17.0.6%2B10_openj9-0.36.0/ibm-semeru-open-jdk_x64_linux_17.0.6_10_openj9-0.36.0.tar.gz",
"major_version": 17, "major_version": 17,
"sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b", "sha256": "ce39a4f7c2e08e56083f17f3e44c05e0fbbeba775e670f015a337679c99c54c6",
"java_version": "17.0.7+7" "java_version": "17.0.6+10"
}, },
"jdk18": { "jdk18": {
"link": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_linux_hotspot_18.0.2.1_1.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru18-binaries/releases/download/jdk-18.0.2%2B9_openj9-0.33.1/ibm-semeru-open-jdk_x64_linux_18.0.2_9_openj9-0.33.1.tar.gz",
"major_version": 18, "major_version": 18,
"sha256": "7d6beba8cfc0a8347f278f7414351191a95a707d46b6586e9a786f2669af0f8b", "sha256": "b694d47666035b1f7870bc3749aa7c1903d50976eab3772fd81c32dab2aa8e64",
"java_version": "18.0.2.1+1" "java_version": "18.0.2+9"
}, },
"jdk19": { "jdk19": {
"link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_linux_hotspot_19.0.2_7.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru19-binaries/releases/download/jdk-19.0.2%2B7_openj9-0.37.0/ibm-semeru-open-jdk_x64_linux_19.0.2_7_openj9-0.37.0.tar.gz",
"major_version": 19, "major_version": 19,
"sha256": "3a3ba7a3f8c3a5999e2c91ea1dca843435a0d1c43737bd2f6822b2f02fc52165", "sha256": "5fd94c57afe0d4e778bfc284f3f7830c34de59bed4faba12d4bb46a77d0b516e",
"java_version": "19.0.2+7" "java_version": "19.0.2+7"
}, },
"jdk8": { "jdk8": {
"link": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru8-binaries/releases/download/jdk8u362-b09_openj9-0.36.0/ibm-semeru-open-jdk_x64_linux_8u362b09_openj9-0.36.0.tar.gz",
"major_version": 8, "major_version": 8,
"sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c", "sha256": "4c956f08cbe02d43a06536e9eae888925cc495a669bd024606389bec5ea6964a",
"java_version": "1.8.0_372-b07" "java_version": "1.8.0_362-b09"
}, },
"jdk9": { "jdk9": {
"link": "https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9%2B181/OpenJDK9U-jdk_x64_linux_hotspot_9_181.tar.gz", "link": "https://github.com/AdoptOpenJDK/openjdk9-openj9-releases/releases/download/jdk-9.0.4%2B12_openj9-0.9.0/OpenJDK9-OPENJ9_x64_Linux_jdk-9.0.4.12_openj9-0.9.0.tar.gz",
"major_version": 9, "major_version": 9,
"sha256": "ebe1eaad73584f70ab4e587ab9367fb15af820745979e68350fe80fadf615df8", "sha256": "d5bb41b7ed4fc1a6aba0914718aff4abec42acf18c776b7641efcbbb761e6e6b",
"java_version": "9+181" "java_version": "9.0.4+12"
} }
}, },
"latest": { "latest": {
"link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk19u-2023-02-28-13-32-beta/OpenJDK19U-jdk_x64_linux_hotspot_2023-02-28-13-32.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru19-binaries/releases/download/jdk-19.0.2%2B7_openj9-0.37.0/ibm-semeru-open-jdk_x64_linux_19.0.2_7_openj9-0.37.0.tar.gz",
"major_version": 19, "major_version": 19,
"sha256": "fb78a338b97688cb9a72ff49779636afb9c38882e6275df0760da74239b45313", "sha256": "5fd94c57afe0d4e778bfc284f3f7830c34de59bed4faba12d4bb46a77d0b516e",
"java_version": "19.0.2-beta+7-202302280337" "java_version": "19.0.2+7"
}, },
"stable": { "stable": {
"link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk19u-2023-02-28-13-32-beta/OpenJDK19U-jdk_x64_linux_hotspot_2023-02-28-13-32.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru19-binaries/releases/download/jdk-19.0.2%2B7_openj9-0.37.0/ibm-semeru-open-jdk_x64_linux_19.0.2_7_openj9-0.37.0.tar.gz",
"major_version": 19, "major_version": 19,
"sha256": "fb78a338b97688cb9a72ff49779636afb9c38882e6275df0760da74239b45313", "sha256": "5fd94c57afe0d4e778bfc284f3f7830c34de59bed4faba12d4bb46a77d0b516e",
"java_version": "19.0.2-beta+7-202302280337" "java_version": "19.0.2+7"
}, },
"lts": { "lts": {
"link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17u-2023-05-12-05-40-beta/OpenJDK17U-jdk_x64_linux_hotspot_2023-05-12-05-40.tar.gz", "link": "https://github.com/AdoptOpenJDK/semeru17-binaries/releases/download/jdk-17.0.6%2B10_openj9-0.36.0/ibm-semeru-open-jdk_x64_linux_17.0.6_10_openj9-0.36.0.tar.gz",
"major_version": 17, "major_version": 17,
"sha256": "004fe3df67c575b3b89eae9a1230fd0c53439e37427481a06f55bb845bf39f80", "sha256": "ce39a4f7c2e08e56083f17f3e44c05e0fbbeba775e670f015a337679c99c54c6",
"java_version": "17.0.8-beta+2-202305120032" "java_version": "17.0.6+10"
} }
}, },
"temurin": { "temurin": {
@ -306,16 +306,16 @@
"java_version": "20.0.1-beta+9-202305100346" "java_version": "20.0.1-beta+9-202305100346"
}, },
"stable": { "stable": {
"link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk20u-2023-05-10-08-56-beta/OpenJDK20U-jdk_x64_linux_hotspot_2023-05-10-08-56.tar.gz", "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_linux_hotspot_20.0.1_9.tar.gz",
"major_version": 20, "major_version": 20,
"sha256": "d73db1554c637bf1619cd0e23f27e3e236ab505359934afbf7abe0cd357288c9", "sha256": "43ad054f135a7894dc87ad5d10ad45d8e82846186515892acdbc17c2c5cd27e4",
"java_version": "20.0.1-beta+9-202305100346" "java_version": "20.0.1+9"
}, },
"lts": { "lts": {
"link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17u-2023-05-12-05-40-beta/OpenJDK17U-jdk_x64_linux_hotspot_2023-05-12-05-40.tar.gz", "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz",
"major_version": 17, "major_version": 17,
"sha256": "004fe3df67c575b3b89eae9a1230fd0c53439e37427481a06f55bb845bf39f80", "sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b",
"java_version": "17.0.8-beta+2-202305120032" "java_version": "17.0.7+7"
} }
} }
} }

644
updater/Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -8,7 +8,10 @@ edition = "2021"
[dependencies] [dependencies]
async-std = { version = "1.12.0", features = ["attributes"] } async-std = { version = "1.12.0", features = ["attributes"] }
color-eyre = "0.5.11" color-eyre = "0.5.11"
custom_debug = "0.5.1"
isahc = "1.7.2" isahc = "1.7.2"
serde = { version = "1.0.132", features = ["derive"] } serde = { version = "1.0.132", features = ["derive"] }
serde_json = "1.0.73" serde_json = "1.0.73"
tracing = { version = "0.1.37", features = ["log"] }
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
urlencoding = "2.1.2" urlencoding = "2.1.2"

View File

@ -57,11 +57,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1684120848, "lastModified": 1684212024,
"narHash": "sha256-gIwJ5ac1FwZEkCRwjY+gLwgD4G1Bw3Xtr2jr2XihMPo=", "narHash": "sha256-/3ZvkPuIXdyZqPR53qC7aaV5wiwMOY+ddbESOykZ9Vo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0cb867999eec4085e1c9ca61c09b72261fa63bb4", "rev": "d4825e5e4ac1de7d5bb99381534fd0af3875a26d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -71,11 +71,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1684120848, "lastModified": 1684181436,
"narHash": "sha256-gIwJ5ac1FwZEkCRwjY+gLwgD4G1Bw3Xtr2jr2XihMPo=", "narHash": "sha256-FxGaVF3KYOe3uAHGsToSPM7sfpdudRozeF1iGiyjRBE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0cb867999eec4085e1c9ca61c09b72261fa63bb4", "rev": "9f9fcc1483fb041f4d8708a78d025614d7a03430",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -100,11 +100,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1684183882, "lastModified": 1684207659,
"narHash": "sha256-Ed692aLxADTPRThPE6FdgGXWdKuLWgj84jX7Hsl4zpY=", "narHash": "sha256-EVVCm5u/tWPHDVjXPDEKioLsDiQLcrASw9Yo8i4l6dI=",
"ref": "refs/heads/trunk", "ref": "refs/heads/trunk",
"rev": "9c6ccfcbc17736559181ca214e711bc493944e8a", "rev": "4cca422b3b3cf2eef688306437eee165abf79687",
"revCount": 12, "revCount": 13,
"type": "git", "type": "git",
"url": "https://git.stranger.systems/nix/Rust" "url": "https://git.stranger.systems/nix/Rust"
}, },
@ -122,11 +122,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684117262, "lastModified": 1684203630,
"narHash": "sha256-ZSF4CZqeyk6QwTjal73KPMuTWiU6w/p8ygEimrPb7u4=", "narHash": "sha256-ZOWNixdHU4qFZUgYNEULFB3ifctMQO9H4Oo+Zrz+4L8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "4679872d2dd3e94ffef75efcbf77ea11549d90a7", "rev": "65c3f2655f52a81e1b3e629d4c07df4873d0f2bb",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -7,12 +7,15 @@ use color_eyre::{
}; };
use isahc::HttpClient; use isahc::HttpClient;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tracing::{debug, error, instrument, trace, warn};
/// Abstraction over an adoptium API instance /// Abstraction over an adoptium API instance
#[derive(custom_debug::Debug)]
pub struct AdoptiumAPI { pub struct AdoptiumAPI {
/// Base URL /// Base URL
base_url: String, base_url: String,
/// Client /// Client
#[debug(skip)]
client: HttpClient, client: HttpClient,
/// Jvm_Impl string /// Jvm_Impl string
jvm_impl: String, jvm_impl: String,
@ -38,6 +41,7 @@ impl AdoptiumAPI {
} }
/// Get the availble releases /// Get the availble releases
#[instrument]
pub async fn available_releases(&self) -> Result<AvailableReleases> { pub async fn available_releases(&self) -> Result<AvailableReleases> {
let response = self let response = self
.client .client
@ -86,6 +90,7 @@ impl AdoptiumAPI {
} }
/// Return latest release /// Return latest release
#[instrument(skip(arch), fields(arch = arch.as_ref()))]
pub async fn latest( pub async fn latest(
&self, &self,
version: u32, version: u32,
@ -93,30 +98,41 @@ impl AdoptiumAPI {
pre_release: bool, pre_release: bool,
) -> Result<Release> { ) -> Result<Release> {
let release_type = if pre_release { "ea" } else { "ga" }; let release_type = if pre_release { "ea" } else { "ga" };
debug!(?release_type);
let arch = arch.as_ref(); let arch = arch.as_ref();
let url = format!( let url = format!(
"{}/v3/assets/feature_releases/{version}/{release_type}?architecture={arch}&heap_size=normal&image_type=jdk&jvm_impl=hotspot&os=linux&page=0&page_size=10&project=jdk&sort_method=DATE&sort_order=DESC&jvm_impl={}", "{}/v3/assets/feature_releases/{version}/{release_type}?architecture={arch}&heap_size=normal&image_type=jdk&os=linux&page=0&page_size=10&project=jdk&sort_method=DATE&sort_order=DESC&jvm_impl={}",
self.base_url, self.base_url,
self.jvm_impl self.jvm_impl
); );
trace!(?url);
let mut response = self let mut response = self
.client .client
.get_async(url) .get_async(&url)
.await .await
.context("Failed to request release")?; .context("Failed to request release")?;
debug!(?response);
// If we get a 301, respond to it // If we get a 301, respond to it
if response.status().as_u16() == 301 { match response.status().as_u16() {
301 => {
let location = response let location = response
.headers() .headers()
.get("location") .get("location")
.context("Failed to get redirect location")? .context("Failed to get redirect location")?
.to_str() .to_str()
.context("Failed to parse redirect location")?; .context("Failed to parse redirect location")?;
warn!(?location, ?url, "Redirecting");
response = self response = self
.client .client
.get_async(location) .get_async(location)
.await .await
.context("Failed to request release")?; .context("Failed to request release")?;
debug!(?response, "New response");
}
404 => {
error!(?url, "Location not found");
}
_ => (),
} }
let mut response = response.into_body(); let mut response = response.into_body();
let mut body = String::new(); let mut body = String::new();
@ -148,16 +164,22 @@ impl AdoptiumAPI {
output_release, output_release,
); );
} }
let latest: OutputRelease = self let latest: OutputRelease = match self
.latest(input_versions.most_recent_feature_version, arch, true) .latest(input_versions.most_recent_feature_version, arch, true)
.await .await
.context("Failed to get version - latest")? {
.into(); Ok(x) => x.into(),
Err(_) => self
.latest(input_versions.most_recent_feature_release, arch, false)
.await
.context("Failed to get latest version")?
.into(),
};
let stable: OutputRelease = self let stable: OutputRelease = self
.latest( .latest(
input_versions.available_releases[input_versions.available_releases.len() - 1], input_versions.available_releases[input_versions.available_releases.len() - 1],
arch, arch,
true, false,
) )
.await .await
.context("Failed to get version - stable")? .context("Failed to get version - stable")?
@ -167,7 +189,7 @@ impl AdoptiumAPI {
input_versions.available_lts_releases input_versions.available_lts_releases
[input_versions.available_lts_releases.len() - 1], [input_versions.available_lts_releases.len() - 1],
arch, arch,
true, false,
) )
.await .await
.context("Failed to get version - lts")? .context("Failed to get version - lts")?

View File

@ -1,10 +1,8 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use api::OutputReleases; use api::OutputReleases;
use color_eyre::{ use color_eyre::eyre::{Context, Result};
eyre::{Context, Result}, use tracing_subscriber::{fmt, prelude::*, EnvFilter};
};
use crate::api::AdoptiumAPI; use crate::api::AdoptiumAPI;
@ -14,6 +12,12 @@ pub mod api;
#[async_std::main] #[async_std::main]
async fn main() -> Result<()> { async fn main() -> Result<()> {
color_eyre::install()?; color_eyre::install()?;
tracing_subscriber::registry()
.with(fmt::layer().pretty().with_writer(std::io::stderr))
.with(EnvFilter::from_default_env())
.init();
let mut output: BTreeMap<String, BTreeMap<String, OutputReleases>> = BTreeMap::new(); let mut output: BTreeMap<String, BTreeMap<String, OutputReleases>> = BTreeMap::new();
// Create the api instances // Create the api instances
let adoptium = AdoptiumAPI::adoptium().context("Creating api")?; let adoptium = AdoptiumAPI::adoptium().context("Creating api")?;