Merge 54204032-spring-boot-cli-container to master

Glyn Normington · Glyn Normington · commit 00a6de28c8a1 · 2013-08-01T11:27:25.000+01:00
[#54204032]
diff --git a/docs/util-repository-builders.md b/docs/util-repository-builders.md
@@ -9,4 +9,5 @@ The repositories that are currently referenced by the buildpack are easily repli
 | MySQL JDBC | <https://github.com/cloudfoundry/builder-mysql-jdbc>
 | OpenJDK | <https://github.com/cloudfoundry/builder-openjdk>
 | PostgreSQL JDBC | <https://github.com/cloudfoundry/builder-postgresql-jdbc>
+| Spring Boot CLI | <https://github.com/cloudfoundry/builder-spring-boot-cli>
 | Tomcat | <https://github.com/cloudfoundry/builder-tomcat>
diff --git a/lib/java_buildpack/util/tokenized_version.rb b/lib/java_buildpack/util/tokenized_version.rb
@@ -43,7 +43,7 @@ def initialize(version, allow_wildcards = true)
 
     # Compare this to another array
     #
-    # @return [Integer] A numerical representation of the comparisong between two instances
+    # @return [Integer] A numerical representation of the comparison between two instances
     def <=>(other)
       comparison = self[0].to_i <=> other[0].to_i
       comparison = self[1].to_i <=> other[1].to_i if comparison == 0
@@ -62,7 +62,7 @@ def to_s # rubocop:disable TrivialAccessors
 
     private
 
-      COLLATING_SEQUENCE = ['-'] + ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
+      COLLATING_SEQUENCE = ['-', '.'] + ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
 
       def char_compare(c1, c2)
         COLLATING_SEQUENCE.index(c1) <=> COLLATING_SEQUENCE.index(c2)
@@ -134,7 +134,7 @@ def valid_major_minor_or_micro(major_minor_or_micro)
       end
 
       def valid_qualifier(qualifier)
-        qualifier.nil? || qualifier.empty? || qualifier =~ /^[-a-zA-Z\d]*$/ || qualifier =~ /^\+$/
+        qualifier.nil? || qualifier.empty? || qualifier =~ /^[-\.a-zA-Z\d]*$/ || qualifier =~ /^\+$/
       end
   end
 
diff --git a/spec/java_buildpack/util/tokenized_version_spec.rb b/spec/java_buildpack/util/tokenized_version_spec.rb
@@ -44,6 +44,10 @@ module JavaBuildpack::Util
       expect(TokenizedVersion.new('1.7.0_28a')).to be > TokenizedVersion.new('1.7.0_28')
     end
 
+    it 'should accept a qualifier with embedded periods and hyphens' do
+      TokenizedVersion.new('0.5.0_BUILD-20120731.141622-16')
+    end
+
     it 'should raise an exception when the major version is not numeric' do
       expect { TokenizedVersion.new('A') }.to raise_error(/Invalid/)
     end
