From 43e78cbd1459c6be50c2150ef87cf9d9949e11f3 Mon Sep 17 00:00:00 2001
From: hc-github-team-consul-core <github-team-consul-core@hashicorp.com>
Date: Thu, 19 Sep 2024 15:21:00 -0400
Subject: [PATCH] Backport of security: Upgrade Go to 1.22.7 into release/1.1.x
 (#4317)

* backport of commit 9f290754da387140cd8eee8ab0ac5ebdc4f40e4a

* backport of commit 430864e21c81a7facb428e59c2d3d12337300b1b

---------

Co-authored-by: NiniOak <anita.akaeze@hashicorp.com>
---
 .changelog/4313.txt | 4 ++++
 .go-version         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 .changelog/4313.txt

diff --git a/.changelog/4313.txt b/.changelog/4313.txt
new file mode 100644
index 0000000000..e6ab5ba811
--- /dev/null
+++ b/.changelog/4313.txt
@@ -0,0 +1,4 @@
+```release-note:security
+Upgrade Go to use 1.22.7. This addresses CVE 
+[CVE-2024-34155](https://nvd.nist.gov/vuln/detail/CVE-2024-34155)
+```
\ No newline at end of file
diff --git a/.go-version b/.go-version
index da9594fd66..87b26e8b1a 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.22.5
+1.22.7