feature: Include Java 14java-14

6 files changed, 16 insertions, 6 deletions

diff --git a/Dockerfile b/Dockerfile
index 3ceb3a1..930f324 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -52,8 +52,7 @@ ADD https://rubygems.org/downloads/bundler-2.1.4.gem /opt/toolcache/
 COPY pkg/asdf*.deb /opt/toolcache/
 COPY pkg/dotnet*.deb /opt/toolcache/
 COPY pkg/golang*.deb /opt/toolcache/
-COPY pkg/java-8*.deb /opt/toolcache/
-COPY pkg/java-11*.deb /opt/toolcache/
+COPY pkg/java-*.deb /opt/toolcache/
 COPY pkg/license*.deb /opt/toolcache/
 COPY pkg/mono*.deb /opt/toolcache/
 COPY pkg/node*.deb /opt/toolcache/
diff --git a/lib/license/management/tool_box.rb b/lib/license/management/tool_box.rb
index ddfd222..527bd1d 100644
--- a/lib/license/management/tool_box.rb
+++ b/lib/license/management/tool_box.rb
@@ -110,7 +110,7 @@ module License
 
       def java_version(env:)
         lm_version = env['LM_JAVA_VERSION']
-        return lm_version if lm_version && %w[8 11].include?(lm_version)
+        return lm_version if lm_version && %w[8 11 14].include?(lm_version)
 
         asdf_version = env['ASDF_JAVA_VERSION']
         return asdf_version.gsub('adopt-openjdk', 'adoptopenjdk') if asdf_version
diff --git a/spec/fixtures/java/gradle/java-14/build.gradle b/spec/fixtures/java/gradle/java-14/build.gradle
new file mode 100644
index 0000000..b7cffcd
--- /dev/null
+++ b/spec/fixtures/java/gradle/java-14/build.gradle
@@ -0,0 +1,9 @@
+apply plugin: 'groovy'
+
+repositories {
+  mavenCentral()
+}
+
+dependencies {
+  compile 'org.postgresql:postgresql:42.1.4'
+}
diff --git a/spec/integration/java/gradle_spec.rb b/spec/integration/java/gradle_spec.rb
index dd0ba26..d1bf38a 100644
--- a/spec/integration/java/gradle_spec.rb
+++ b/spec/integration/java/gradle_spec.rb
@@ -151,7 +151,8 @@ plugins {
 
   [
     { java: '8', gradle: ['2.14', '3.5'] },
-    { java: '11', gradle: ['4.9', '5.6', '6.3'] }
+    { java: '11', gradle: ['4.9', '5.6', '6.3'] },
+    { java: '14', gradle: ['4.9', '5.6', '6.6'] }
   ].each do |item|
     item[:gradle].each do |gradle_version|
       context "when using Java v#{item[:java]} with a gradle v#{gradle_version} on a groovy project" do
diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb
index 95a6cb0..dd19a0f 100644
--- a/spec/integration/java/maven_spec.rb
+++ b/spec/integration/java/maven_spec.rb
@@ -116,7 +116,8 @@ RSpec.describe "maven" do
 
   [
     { java: '8', maven: ['3.6.3', '3.5.4', '3.3.9', '3.2.5'] },
-    { java: '11', maven: ['3.6.3', '3.5.4', '3.3.9', '3.2.5'] }
+    { java: '11', maven: ['3.6.3', '3.5.4', '3.3.9', '3.2.5'] },
+    { java: '14', maven: ['3.6.3', '3.5.4', '3.3.9', '3.2.5'] }
   ].each do |item|
     item[:maven].each do |maven_version|
       context "when using Java v#{item[:java]} with maven v#{maven_version}" do
diff --git a/spec/unit/license_finder/maven_spec.rb b/spec/unit/license_finder/maven_spec.rb
index 737b707..cd46f0e 100644
--- a/spec/unit/license_finder/maven_spec.rb
+++ b/spec/unit/license_finder/maven_spec.rb
@@ -39,7 +39,7 @@ RSpec.describe LicenseFinder::Maven do
       specify { expect(subject).to eql('adoptopenjdk-11') }
     end
 
-    %w[8 11].each do |java_version|
+    %w[8 11 14].each do |java_version|
       context "when the version is specified via a LM_JAVA_VERSION (#{java_version}) environment variable" do
         let(:env) { { "LM_JAVA_VERSION" => java_version } }