From 58428e70ef7b34419cccb4cbe110f5748e0a82bb Mon Sep 17 00:00:00 2001
From: David Enyeart <enyeart@us.ibm.com>
Date: Mon, 27 Jan 2025 12:05:24 -0500
Subject: [PATCH] Bump Go to 1.23.5 (release-2.5)

Bump Go to 1.23.5 (release-2.5)

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
---
 .github/workflows/release.yml      | 2 +-
 .github/workflows/verify-build.yml | 2 +-
 Makefile                           | 2 +-
 docs/source/prereqs.md             | 4 ++--
 release_notes/v2.5.10.md           | 2 +-
 vagrant/golang.sh                  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fe06debd66c..c311e52be13 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
     tags: [ v2.* ]
 
 env:
-  GO_VER: 1.23.1
+  GO_VER: 1.23.5
   UBUNTU_VER: 20.04
   FABRIC_VER: ${{ github.ref_name }}
 
diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
index 9662fa95ce9..1bd8ded398b 100644
--- a/.github/workflows/verify-build.yml
+++ b/.github/workflows/verify-build.yml
@@ -13,7 +13,7 @@ on:
 env:
   GOPATH: /opt/go
   PATH: /opt/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
-  GO_VER: 1.23.1
+  GO_VER: 1.23.5
 
 jobs:
   basic-checks:
diff --git a/Makefile b/Makefile
index df048ee9aae..43ca14ba844 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ METADATA_VAR += CommitSHA=$(EXTRA_VERSION)
 METADATA_VAR += BaseDockerLabel=$(BASE_DOCKER_LABEL)
 METADATA_VAR += DockerNamespace=$(DOCKER_NS)
 
-GO_VER = 1.23.1
+GO_VER = 1.23.5
 GO_TAGS ?=
 
 RELEASE_EXES = orderer $(TOOLS_EXES)
diff --git a/docs/source/prereqs.md b/docs/source/prereqs.md
index 7521a220725..5d3d56d9c3c 100644
--- a/docs/source/prereqs.md
+++ b/docs/source/prereqs.md
@@ -79,9 +79,9 @@ Optional: Install the latest Fabric supported version of [Go](https://golang.org
 installed (only required if you will be writing Go chaincode or SDK applications).
 
 ```shell
-$ brew install go@1.23.1
+$ brew install go@1.23.5
 $ go version
-go1.23.1 darwin/amd64
+go1.23.5 darwin/amd64
 ```
 
 ### JQ
diff --git a/release_notes/v2.5.10.md b/release_notes/v2.5.10.md
index 7f54aaf2c9e..234dd7136f5 100644
--- a/release_notes/v2.5.10.md
+++ b/release_notes/v2.5.10.md
@@ -7,7 +7,7 @@ v2.5.10 updates code dependencies.
 Dependencies
 ------------
 Fabric v2.5.10 has been tested with the following dependencies:
-* Go 1.23.1
+* Go 1.23.5
 * CouchDB v3.3.3
 
 Fabric docker images on dockerhub utilize Ubuntu 20.04.
diff --git a/vagrant/golang.sh b/vagrant/golang.sh
index cc232257c1c..c8b16e0b93f 100644
--- a/vagrant/golang.sh
+++ b/vagrant/golang.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 GOROOT='/opt/go'
-GO_VERSION=1.23.1
+GO_VERSION=1.23.5
 
 # ----------------------------------------------------------------
 # Install Golang