Merge branch '402-wildcard-version-resolving' into 3.x

nebhale · nebhale · commit df64fb1ffc4a · 2017-03-17T10:50:26.000-07:00
[resolves cloudfoundry#397][resolves cloudfoundry#402]
diff --git a/config/open_jdk_jre.yml b/config/open_jdk_jre.yml
@@ -17,7 +17,7 @@
 # If Java 7 is required, permgen will be used instead of metaspace. Please see the documentation for more detail.
 ---
 jre:
-  version: 1.8.0_12+
+  version: 1.8.0_+
   repository_root: "{default.repository.root}/openjdk/{platform}/{architecture}"
 memory_calculator:
   version: 2.+
diff --git a/config/oracle_jre.yml b/config/oracle_jre.yml
@@ -20,7 +20,7 @@
 # e.g.  repository_root: "http://example.com/oracle-jre/{platform}/{architecture}"
 ---
 jre:
-  version: 1.8.0_12+
+  version: 1.8.0_+
   repository_root: ""
 memory_calculator:
   version: 2.+
diff --git a/config/zulu_jre.yml b/config/zulu_jre.yml
@@ -20,7 +20,7 @@
 # e.g.  repository_root: "http://example.com/zulu-jre/{platform}/{architecture}"
 ---
 jre:
-  version: 1.8.0_12+
+  version: 1.8.0_+
   repository_root: "https://cdn.azul.com/zulu/bin"
 memory_calculator:
   version: 2.+
diff --git a/lib/java_buildpack/util/tokenized_version.rb b/lib/java_buildpack/util/tokenized_version.rb
@@ -121,7 +121,7 @@ def minimum_qualifier_length(a, b)
       end
 
       def qualifier_compare(a, b)
-        comparison = 0
+        comparison = a[/^\d+/].to_i <=> b[/^\d+/].to_i
 
         i = 0
         until comparison.nonzero? || i == minimum_qualifier_length(a, b)
diff --git a/spec/java_buildpack/repository/version_resolver_spec.rb b/spec/java_buildpack/repository/version_resolver_spec.rb
@@ -22,7 +22,9 @@
 describe JavaBuildpack::Repository::VersionResolver do
   include_context 'logging_helper'
 
-  let(:versions) { %w(1.6.0_26 1.6.0_27 1.6.1_14 1.7.0_19 1.7.0_21 1.8.0_M-7 1.8.0_05 2.0.0 2.0.0a) }
+  let(:versions) do
+    %w(1.6.0_26 1.6.0_27 1.6.0_112 1.6.0_102 1.6.0_45RELEASE 1.6.1_14 1.7.0_19 1.7.0_21 1.8.0_M-7 1.8.0_05 2.0.0 2.0.0a)
+  end
 
   it 'resolves the default version if no candidate is supplied' do
     expect(described_class.resolve(nil, versions)).to eq(tokenized_version('2.0.0'))
@@ -41,7 +43,7 @@
   end
 
   it 'resolves a wildcard qualifier' do
-    expect(described_class.resolve(tokenized_version('1.6.0_+'), versions)).to eq(tokenized_version('1.6.0_27'))
+    expect(described_class.resolve(tokenized_version('1.6.0_+'), versions)).to eq(tokenized_version('1.6.0_112'))
     expect(described_class.resolve(tokenized_version('1.8.0_+'), versions)).to eq(tokenized_version('1.8.0_05'))
   end
 
