Revert "Corretto version update on Wed Jan 17 19:49:40 UTC 2024" + up…

…date corretto sync This reverts commit 3bf1583.
ajshastri · Jan 18, 2024 · 1ab0b06 · 1ab0b06
1 parent f74d067
commit 1ab0b06
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 16 deletions.
diff --git a/corretto-jdk-11/corretto11jdk.nuspec b/corretto-jdk-11/corretto11jdk.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>corretto11jdk</id>
-    <version>11.0.22.71</version>
+    <version>11.0.22.7.1</version>
     <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages/tree/master/corretto-jdk-11</packageSourceUrl>
     <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/aws-corretto.png</iconUrl>
     <title>Corretto 11 JDK</title>

diff --git a/corretto-jdk-11/tools/chocolateyinstall.ps1 b/corretto-jdk-11/tools/chocolateyinstall.ps1
@@ -1,7 +1,7 @@
 $packageArgs = @{
   PackageName = $env:ChocolateyPackageName
-  Url64bit = 'https://corretto.aws/downloads/resources/11.0.22.71/amazon-corretto-11.0.22.71-windows-x64-jdk.msi'
-  Checksum64 = '59c529c07d2a79896ab67bd04d1e8fef'
+  Url64bit = 'https://corretto.aws/downloads/resources/11.0.22.7.1/amazon-corretto-11.0.22.7.1-windows-x64-jdk.msi'
+  Checksum64 = '59c529c07d2a79896ab627bd04d1e8fef'
   ChecksumType64 = 'md5'
   fileType      = 'msi'
   silentArgs    = "INSTALLLEVEL=3 /quiet"

diff --git a/corretto-jdk-17/corretto17jdk.nuspec b/corretto-jdk-17/corretto17jdk.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>corretto17jdk</id>
-    <version>17.0.10.71</version>
+    <version>17.0.10.7.1</version>
     <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages/tree/master/corretto-jdk-17</packageSourceUrl>
     <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/aws-corretto.png</iconUrl>
     <title>Corretto 17 JDK</title>

diff --git a/corretto-jdk-17/tools/chocolateyinstall.ps1 b/corretto-jdk-17/tools/chocolateyinstall.ps1
@@ -1,7 +1,7 @@
 $packageArgs = @{
   PackageName = $env:ChocolateyPackageName
-  Url64bit = 'https://corretto.aws/downloads/resources/17.0.10.71/amazon-corretto-17.0.10.71-windows-x64-jdk.msi'
-  Checksum64 = '2bc47187eea0e84dae73013b762148d5'
+  Url64bit = 'https://corretto.aws/downloads/resources/17.0.10.7.1/amazon-corretto-17.0.10.7.1-windows-x64-jdk.msi'
+  Checksum64 = '2bc47187eea0e84dae732013b762148d5'
   ChecksumType64 = 'md5'
   fileType      = 'msi'
   silentArgs    = "INSTALLLEVEL=3 /quiet"

diff --git a/corretto-jdk-21/corretto21jdk.nuspec b/corretto-jdk-21/corretto21jdk.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>corretto21jdk</id>
-    <version>21.0.2.131</version>
+    <version>21.0.2.13.1</version>
     <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages/tree/master/corretto-jdk-21</packageSourceUrl>
     <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/aws-corretto.png</iconUrl>
     <title>Corretto JDK</title>

diff --git a/corretto-jdk-21/tools/chocolateyinstall.ps1 b/corretto-jdk-21/tools/chocolateyinstall.ps1
@@ -1,7 +1,7 @@
 $packageArgs = @{
   PackageName = $env:ChocolateyPackageName
-  Url64bit = 'https://corretto.aws/downloads/resources/21.0.2.131/amazon-corretto-21.0.2.131-windows-x64-jdk.msi'
-  Checksum64 = '58899be77c0992cce9317389de1cbeb8'
+  Url64bit = 'https://corretto.aws/downloads/resources/21.0.2.13.1/amazon-corretto-21.0.2.13.1-windows-x64-jdk.msi'
+  Checksum64 = '58899be77c0992cce29317389de1cbeb8'
   ChecksumType64 = 'md5'
   fileType      = 'msi'
   silentArgs    = "INSTALLLEVEL=3 /quiet"

diff --git a/corretto-jdk/correttojdk.nuspec b/corretto-jdk/correttojdk.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>correttojdk</id>
-    <version>21.0.2.131</version>
+    <version>21.0.2.13.1</version>
     <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages/tree/master/corretto-jdk</packageSourceUrl>
     <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/aws-corretto.png</iconUrl>
     <title>Corretto JDK</title>

diff --git a/corretto-jdk/tools/chocolateyinstall.ps1 b/corretto-jdk/tools/chocolateyinstall.ps1
@@ -1,6 +1,6 @@
 $packageArgs = @{
   PackageName = $env:ChocolateyPackageName
-  Url64bit = 'https://corretto.aws/downloads/resources/21.0.2.131/amazon-corretto-21.0.2.131-windows-x64-jdk.msi'
+  Url64bit = 'https://corretto.aws/downloads/resources/21.0.2.13.1/amazon-corretto-21.0.2.13.1-windows-x64-jdk.msi'
   Checksum64 = '58899be77c0992cce93172389de1cbeb8'
   ChecksumType64 = 'md5'
   fileType      = 'msi'

diff --git a/scripts/corretto-sync.sh b/scripts/corretto-sync.sh
@@ -9,11 +9,13 @@ MAILVAL=false
 function correttodl {
     JVERSION="$1"
     PACKAGE="$2"
-    VERSIONNEW=$(curl -s -L https://api.github.com/repos/corretto/corretto-${JVERSION}/releases/latest | jq -r '.tag_name' | awk -F. '{print $1"."$2"."$3"."$4$5}')
+    DLVERSIONNEW=$(curl -s -L https://api.github.com/repos/corretto/corretto-${JVERSION}/releases/latest | jq -r '.tag_name')
+    VERSIONNEW=$(echo $DLVERSIONNEW | awk -F. '{print $1"."$2"."$3"."$4$5}')
+
     MD5NEW=$(curl -L -s https://corretto.aws/downloads/latest_checksum/amazon-corretto-${JVERSION}-x64-windows-${PACKAGE}.msi)
     # DLURL="https://corretto.aws/downloads/latest/amazon-corretto-${JVERSION}-x64-windows-${PACKAGE}.msi"
-    DLURL="https://corretto.aws/downloads/resources/${VERSIONNEW}/amazon-corretto-${VERSIONNEW}-windows-x64-${PACKAGE}.msi"
-    DLFILE="amazon-corretto-${VERSIONNEW}-windows-x64-${PACKAGE}.msi"
+    DLURL="https://corretto.aws/downloads/resources/${DLVERSIONNEW}/amazon-corretto-${DLVERSIONNEW}-windows-x64-${PACKAGE}.msi"
+    DLFILE="amazon-corretto-${DLVERSIONNEW}-windows-x64-${PACKAGE}.msi"
     echo "Latest file of ${JVERSION} is ${DLFILE} with {MD5NEW} ${MD5NEW} for ${VERSIONNEW}"
 
     MD5ORIG=$(grep -i checksum64 corretto-${PACKAGE}-${JVERSION}/tools/chocolateyinstall.ps1 | awk -F\' '{print $2}')
@@ -24,7 +26,7 @@ function correttodl {
     if [[ "${MD5NEW}" != "${MD5ORIG}" ]]
     then
         # COMMITYES=TRUE
-        echo "${MD5NEW} is not the same as ${MD5ORIG} for ${VERSIONNEW}"
+        echo "${MD5NEW} is not the same as ${MD5ORIG} for ${DLVERSIONNEW}"
         echo "Updating file corretto-${PACKAGE}-${JVERSION}/tools/chocolateyinstall.ps1 with the new MD5"
         ${SED} -i "s@${MD5ORIG}@${MD5NEW}@g" corretto-${PACKAGE}-${JVERSION}/tools/chocolateyinstall.ps1
         echo "Updating file corretto-${PACKAGE}-${JVERSION}/corretto${JVERSION}${PACKAGE}.nuspec with the new version - ${VERSIONORIG} to ${VERSIONNEW}"
@@ -43,7 +45,7 @@ function correttodl {
             ${SED} -i "s@${URLORIG}@${DLURL}@g" corretto-${PACKAGE}/tools/chocolateyinstall.ps1
         fi
 
-        echo "Latest file of ${JVERSION} is ${DLFILE} with {MD5NEW} ${MD5NEW} for ${VERSIONNEW}"
+        echo "Latest file of ${JVERSION} is ${DLFILE} with {MD5NEW} ${MD5NEW} for ${DLVERSIONNEW}"
         MAILVAL=true
     fi
 }