Merge branch 'eread/set-golang-1_15_2' into 'main'v3.28.1

Set Go 1.15.2 and Ruby to 2.7.2 for project

See merge request gitlab-org/security-products/analyzers/license-finder!6

9 files changed, 19 insertions, 11 deletions

diff --git a/.gitlab/deb.yml b/.gitlab/deb.yml
index c4c152a..ef456e0 100644
--- a/.gitlab/deb.yml
+++ b/.gitlab/deb.yml
@@ -34,11 +34,11 @@ license_management:
   variables:
     OMNIBUS_PROJECT: license_management
 
-golang-1.15.1:
+golang-1.15.2:
   extends: .deb
   variables:
     OMNIBUS_PROJECT: golang
-    GOLANG_VERSION: '1.15.1'
+    GOLANG_VERSION: '1.15.2'
 
 java-8:
   extends: .deb
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff5e997..8da9752 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # GitLab License management changelog
 
+## v3.28.1
+
+- Set `golang` version to `1.15.2` in `.tool-versions` file. (https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/-/merge_requests/6)
+- Set `ruby` version to `2.7.2` in `.tool-versions` file and other places. (https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/-/merge_requests/6)
+
 ## v3.28.0
 
 - Move project from https://gitlab.com/gitlab-org/security-products/license-management to https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/ https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/-/merge_requests/3
diff --git a/Gemfile.lock b/Gemfile.lock
index f9157a6..081a5ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    license-management (3.28.0)
+    license-management (3.28.1)
       license_finder (~> 6.7)
       spandx (~> 0.13)
 
diff --git a/config/files/.tool-versions b/config/files/.tool-versions
index 515e14a..62697d2 100644
--- a/config/files/.tool-versions
+++ b/config/files/.tool-versions
@@ -1,11 +1,11 @@
 dotnet-core 3.1.302
 elixir 1.10.4
-golang 1.15.1
+golang 1.15.2
 java 8
 mono 6.8.0.123
 nodejs 12.18.2
 php 7.4.8
 python 3.8.5
-ruby 2.6.6
+ruby 2.7.2
 rust 1.45.0
 sbt 1.3.8
diff --git a/config/projects/golang.rb b/config/projects/golang.rb
index cb21ae8..d1357c9 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.15.1')
+golang_version = ENV.fetch('GOLANG_VERSION', '1.15.2')
 
 name "golang-#{golang_version}"
 maintainer "GitLab B.V."
diff --git a/config/software/asdf_golang.rb b/config/software/asdf_golang.rb
index 80d5cdd..1922736 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.15.1"
+default_version "1.15.2"
 
 source url: "https://golang.org/dl/go#{version}.linux-amd64.tar.gz"
 relative_path "go"
@@ -18,6 +18,9 @@ end
 version "1.15.1" do
   source sha256: "70ac0dbf60a8ee9236f337ed0daa7a4c3b98f6186d4497826f68e97c0c0413f6"
 end
+version "1.15.2" do
+  source sha256: "b49fda1ca29a1946d6bb2a5a6982cf07ccd2aba849289508ee0f9918f6bb4552"
+end
 
 build do
   mkdir install_dir
diff --git a/config/software/ruby.rb b/config/software/ruby.rb
index 316a342..0c81646 100644
--- a/config/software/ruby.rb
+++ b/config/software/ruby.rb
@@ -7,14 +7,14 @@ license_file "BSDL"
 license_file "COPYING"
 license_file "LEGAL"
 
-default_version "2.7.1"
+default_version "2.7.2"
 
 dependency "libffi"
 dependency "libyaml"
 dependency "openssl"
 dependency "zlib"
 
-source url: "https://cache.ruby-lang.org/pub/ruby/#{version.match(/^(\d+\.\d+)/)[0]}/ruby-#{version}.tar.gz", sha256: "d418483bdd0000576c1370571121a6eb24582116db0b7bb2005e90e250eae418"
+source url: "https://cache.ruby-lang.org/pub/ruby/#{version.match(/^(\d+\.\d+)/)[0]}/ruby-#{version}.tar.gz", sha256: "6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4"
 
 relative_path "ruby-#{version}"
 embedded_dir = "#{install_dir}/embedded"
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 5f83679..2965174 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '3.28.0'
+    VERSION = '3.28.1'
   end
 end
diff --git a/spec/unit/license_finder/bundler_spec.rb b/spec/unit/license_finder/bundler_spec.rb
index 84edde2..5e007fa 100644
--- a/spec/unit/license_finder/bundler_spec.rb
+++ b/spec/unit/license_finder/bundler_spec.rb
@@ -72,7 +72,7 @@ RSpec.describe LicenseFinder::Bundler do
     context "when a ruby is not specified it uses the default version" do
       let(:project_fixture) { fixture_file('ruby/bundler-v2.1') }
 
-      specify { expect(subject).to eql('2.6.6') }
+      specify { expect(subject).to eql('2.7.2') }
     end
   end
 end