From faf1ea5a1340f8eea2c4766620ed93c7c7ae51ef Mon Sep 17 00:00:00 2001
From: Josh W Lewis <josh.lewis@salesforce.com>
Date: Mon, 13 Nov 2023 12:14:02 -0600
Subject: [PATCH 1/3] Add go1.20.11 and go1.21.4

---
 files.json | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/files.json b/files.json
index 06f99f7b..e7244a06 100644
--- a/files.json
+++ b/files.json
@@ -751,6 +751,14 @@
     "SHA": "000a5b1fca4f75895f78befeb2eecf10bfff3c428597f3f1e69133b63b911b02",
     "URL": "https://dl.google.com/go/go1.20.1.linux-amd64.tar.gz"
   },
+  "go1.20.10.linux-amd64.tar.gz": {
+    "SHA": "80d34f1fd74e382d86c2d6102e0e60d4318461a7c2f457ec1efc4042752d4248",
+    "URL": "https://dl.google.com/go/go1.20.10.linux-amd64.tar.gz"
+  },
+  "go1.20.11.linux-amd64.tar.gz": {
+    "SHA": "ef79a11aa095a08772d2a69e4f152f897c4e96ee297b0dc20264b7dec2961abe",
+    "URL": "https://dl.google.com/go/go1.20.11.linux-amd64.tar.gz"
+  },
   "go1.20.2.linux-amd64.tar.gz": {
     "SHA": "4eaea32f59cde4dc635fbc42161031d13e1c780b87097f4b4234cfce671f1768",
     "URL": "https://go.dev/dl/go1.20.2.linux-amd64.tar.gz"
@@ -783,10 +791,6 @@
     "SHA": "8921369701afa749b07232d2c34d514510c32dbfd79c65adb379451b5f0d7216",
     "URL": "https://dl.google.com/go/go1.20.9.linux-amd64.tar.gz"
   },
-  "go1.20.10.linux-amd64.tar.gz": {
-    "SHA": "80d34f1fd74e382d86c2d6102e0e60d4318461a7c2f457ec1efc4042752d4248",
-    "URL": "https://dl.google.com/go/go1.20.10.linux-amd64.tar.gz"
-  },
   "go1.20.linux-amd64.tar.gz": {
     "SHA": "5a9ebcc65c1cce56e0d2dc616aff4c4cedcfbda8cc6f0288cc08cda3b18dcbf1",
     "URL": "https://dl.google.com/go/go1.20.linux-amd64.tar.gz"
@@ -807,6 +811,10 @@
     "SHA": "1241381b2843fae5a9707eec1f8fb2ef94d827990582c7c7c32f5bdfbfd420c8",
     "URL": "https://dl.google.com/go/go1.21.3.linux-amd64.tar.gz"
   },
+  "go1.21.4.linux-amd64.tar.gz": {
+    "SHA": "73cac0215254d0c7d1241fa40837851f3b9a8a742d0b54714cbdfb3feaf8f0af",
+    "URL": "https://dl.google.com/go/go1.21.4.linux-amd64.tar.gz"
+  },
   "go1.3.1.linux-amd64.tar.gz": {
     "SHA": "3af011cc19b21c7180f2604fd85fbc4ddde97143",
     "URL": "https://storage.googleapis.com/golang/go1.3.1.linux-amd64.tar.gz"

From f355b81f1ed17ca057a408af34ea7a1e54ea91ff Mon Sep 17 00:00:00 2001
From: Josh W Lewis <josh.lewis@salesforce.com>
Date: Mon, 13 Nov 2023 12:15:29 -0600
Subject: [PATCH 2/3] Update default expansions to go1.20.11 and go1.21.4

---
 data.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data.json b/data.json
index 6b574cc4..5778a320 100644
--- a/data.json
+++ b/data.json
@@ -2,9 +2,9 @@
   "Go": {
     "DefaultVersion": "go1.12.17",
     "VersionExpansion": {
-      "go1.21": "go1.21.3",
+      "go1.21": "go1.21.4",
       "go1.20.0": "go1.20",
-      "go1.20": "go1.20.10",
+      "go1.20": "go1.20.11",
       "go1.19.0": "go1.19",
       "go1.19": "go1.19.13",
       "go1.18.0": "go1.18",
@@ -131,8 +131,8 @@
       "go1.17.13.linux-amd64.tar.gz",
       "go1.18.10.linux-amd64.tar.gz",
       "go1.19.13.linux-amd64.tar.gz",
-      "go1.20.10.linux-amd64.tar.gz",
-      "go1.21.3.linux-amd64.tar.gz",
+      "go1.20.11.linux-amd64.tar.gz",
+      "go1.21.4.linux-amd64.tar.gz",
       "go1.4.3.linux-amd64.tar.gz",
       "go1.6.4.linux-amd64.tar.gz",
       "go1.7.6.linux-amd64.tar.gz",

From 6595507c3b374fe171ed37a3a0fc8b42d649fc56 Mon Sep 17 00:00:00 2001
From: Josh W Lewis <josh.lewis@salesforce.com>
Date: Mon, 13 Nov 2023 12:18:07 -0600
Subject: [PATCH 3/3] Add changelog entry for go1.20.11 and go1.21.4

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db8d53a2..e11968ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Go Buildpack Changelog
 
 ## Unreleased
+* Add go1.20.11
+* Add go1.21.4
+* go1.20 defaults to go1.20.11
+* go1.21 defaults to go1.21.4
 
 ## v181 (2023-10-11)
 * Add go1.20.9