Merge 50968219- to master

[Completes #50968219]

Author: Glyn Normington

lib/java_buildpack/version_resolver.rb

@@ -76,10 +76,11 @@ def <=>(another)
         self_qualifier = self[3].nil? ? '' : self[3]
         another_qualifier = another[3].nil? ? '' : another[3]
         i = 0
-        until comparison != 0 || i == [self_qualifier.length, another_qualifier.length].max
+        until comparison != 0 || i == [self_qualifier.length, another_qualifier.length].min
           comparison = char_compare(self_qualifier[i], another_qualifier[i])
           i += 1
         end
+        comparison = self_qualifier.length <=> another_qualifier.length  if comparison == 0
 
         comparison
       end

spec/java_buildpack/version_resolver_spec.rb

@@ -59,6 +59,10 @@
     expect(JavaBuildpack::VersionResolver.resolve('1.8.0_M-7', VERSIONS)).to eq('1.8.0_M-7')
   end
 
+  it 'should order qualifiers correctly' do
+    expect(JavaBuildpack::VersionResolver.resolve('1.7.0_+', ['1.7.0_28', '1.7.0_28a'])).to eq('1.7.0_28a')
+  end
+
   it 'should raise an exception when the major version is not numeric' do
     expect { JavaBuildpack::VersionResolver.resolve('A', VERSIONS) }.to raise_error
   end