Merge branch 'update-java' into 'master'v3.12.3

Update Java to match new naming convention

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

6 files changed, 13 insertions, 9 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0335c7c..0deb3b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # GitLab License management changelog
 
+## v3.12.3
+
+- Update default Java versions to match [new naming convention](https://github.com/halcyon/asdf-java/pull/87 (!176)
+
 ## v3.12.2
 
 - Publish latest major version to registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder:3 (!175)
diff --git a/Gemfile.lock b/Gemfile.lock
index a108672..715f380 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    license-management (3.12.2)
+    license-management (3.12.3)
       license_finder (~> 6.0.0)
 
 GEM
diff --git a/config/.tool-versions b/config/.tool-versions
index b66d736..852c2d4 100644
--- a/config/.tool-versions
+++ b/config/.tool-versions
@@ -1,7 +1,7 @@
 elixir system
 golang 1.14
 gradle 6.3
-java adopt-openjdk-8u242-b08 adopt-openjdk-11.0.7+10
+java adoptopenjdk-8.0.252+9.1 adoptopenjdk-11.0.7+10.1
 maven 3.6.3
 nodejs 12.16.3 10.20.1
 php 7.4.5
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index f8376f4..774b99e 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '3.12.2'
+    VERSION = '3.12.3'
   end
 end
diff --git a/run.sh b/run.sh
index 524371f..97207a6 100755
--- a/run.sh
+++ b/run.sh
@@ -63,11 +63,11 @@ function prepare_dotnet() {
 
 function prepare_java() {
   if [ -n "$LM_JAVA_VERSION" ]; then
-    switch_to java "adopt-openjdk-${LM_JAVA_VERSION}"
+    switch_to java "adoptopenjdk-${LM_JAVA_VERSION}"
   elif [ -n "$ASDF_JAVA_VERSION" ]; then
-    switch_to_exact java "$ASDF_JAVA_VERSION"
+    switch_to_exact java "${ASDF_JAVA_VERSION//adopt-openjdk/adoptopenjdk}"
   else
-    switch_to java "adopt-openjdk-8"
+    switch_to java "adoptopenjdk-8"
   fi
 }
 
diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb
index 410d607..49ee82c 100644
--- a/spec/integration/java/maven_spec.rb
+++ b/spec/integration/java/maven_spec.rb
@@ -124,12 +124,12 @@ RSpec.describe "maven" do
       })
 
       expect(output_file).to exist
-      expect(output_file.read).to include('openjdk version "1.8.0_242"')
+      expect(output_file.read).to include('openjdk version "1.8.0_252"')
     end
 
     it 'reads the ASDF_JAVA_VERSION' do
       runner.scan(env: {
-        'ASDF_JAVA_VERSION' => 'adopt-openjdk-11.0.7+10',
+        'ASDF_JAVA_VERSION' => 'adopt-openjdk-11.0.7+10.1',
         'SETUP_CMD' => 'bash custom.sh'
       })
 
@@ -141,7 +141,7 @@ RSpec.describe "maven" do
       runner.scan(env: { 'SETUP_CMD' => 'bash custom.sh' })
 
       expect(output_file).to exist
-      expect(output_file.read).to include('openjdk version "1.8.0_242"')
+      expect(output_file.read).to include('openjdk version "1.8.0_252"')
     end
   end
 end