Merge branch 'eread/fix-references-to-go-version' into 'master'v3.25.2

Change references to Go to version 1.15.1

See merge request gitlab-org/security-products/license-management!216

5 files changed, 8 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c42ca7b..fbec8f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # GitLab License management changelog
 
+## v3.25.2
+
+- Roll out `golang` version `1.15.1` to more of the project. (!216)
+
 ## v3.25.1
 
 - Set `golang` version to `1.15.1` in `.tool-versions` file. (!212)
diff --git a/Gemfile.lock b/Gemfile.lock
index 2f1b7d3..da47682 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    license-management (3.25.1)
+    license-management (3.25.2)
       license_finder (~> 6.7)
 
 GEM
diff --git a/config/projects/golang.rb b/config/projects/golang.rb
index d40d6aa..0a53092 100644
--- a/config/projects/golang.rb
+++ b/config/projects/golang.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-golang_version = ENV.fetch('GOLANG_VERSION', '1.14.6')
+golang_version = ENV.fetch('GOLANG_VERSION', '1.15.1')
 
 name "golang-#{golang_version}"
 maintainer "GitLab B.V."
diff --git a/config/software/asdf_golang.rb b/config/software/asdf_golang.rb
index f412649..80d5cdd 100644
--- a/config/software/asdf_golang.rb
+++ b/config/software/asdf_golang.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 name "asdf_golang"
-default_version "1.14.6"
+default_version "1.15.1"
 
 source url: "https://golang.org/dl/go#{version}.linux-amd64.tar.gz"
 relative_path "go"
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index ec7cb80..61167c6 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '3.25.1'
+    VERSION = '3.25.2'
   end
 end