From 8369bacbc1e4f5b6de080d7172b7838b68d7ca73 Mon Sep 17 00:00:00 2001 From: Erem Boto Date: Fri, 30 Sep 2016 10:58:08 -0700 Subject: [PATCH 1/3] Reproduce the bug from https://repo1.maven.org/maven2/com/amazonaws/amazon-kinesis-producer/0.12.0/amazon-kinesis-producer-0.12.0.pom --- .../src/test/scala/coursier/test/VersionIntervalTests.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/shared/src/test/scala/coursier/test/VersionIntervalTests.scala b/tests/shared/src/test/scala/coursier/test/VersionIntervalTests.scala index 09c906ef7..d8ada55ad 100644 --- a/tests/shared/src/test/scala/coursier/test/VersionIntervalTests.scala +++ b/tests/shared/src/test/scala/coursier/test/VersionIntervalTests.scala @@ -133,7 +133,7 @@ object VersionIntervalTests extends TestSuite { 'basic{ val itv = Parse.versionInterval("[2.2,)").get - + assert(!itv.contains(v21)) assert(itv.contains(v22)) assert(itv.contains(v23)) @@ -195,6 +195,10 @@ object VersionIntervalTests extends TestSuite { val s4 = "(1.1,1.3)" val itv4 = Parse.versionInterval(s4) assert(itv4 == Some(VersionInterval(Some(Version("1.1")), Some(Version("1.3")), false, false))) + + val s5 = "(1.11.0, 1.12.0]" + val itv5 = Parse.versionInterval(s5) + assert(itv5 == Some(VersionInterval(Some(Version("1.11.0")), Some(Version("1.12.0")), false, true))) } 'leftEmptyVersions { val s1 = "[,1.3]" From 50f38725d81065e86a7136bfe995b942f4f9c17c Mon Sep 17 00:00:00 2001 From: Erem Boto Date: Fri, 30 Sep 2016 11:21:38 -0700 Subject: [PATCH 2/3] Make version parsing robust to leading or trailing spaces (#355) --- core/shared/src/main/scala/coursier/core/Parse.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/shared/src/main/scala/coursier/core/Parse.scala b/core/shared/src/main/scala/coursier/core/Parse.scala index 179903f14..d16a05591 100644 --- a/core/shared/src/main/scala/coursier/core/Parse.scala +++ b/core/shared/src/main/scala/coursier/core/Parse.scala @@ -6,8 +6,9 @@ import coursier.core.compatibility._ object Parse { def version(s: String): Option[Version] = { - if (s.isEmpty || s.exists(c => c != '.' && c != '-' && c != '_' && !c.letterOrDigit)) None - else Some(Version(s)) + val trimmed = s.trim + if (trimmed.isEmpty || trimmed.exists(c => c != '.' && c != '-' && c != '_' && !c.letterOrDigit)) None + else Some(Version(trimmed)) } def ivyLatestSubRevisionInterval(s: String): Option[VersionInterval] = From ef085cbc8ee47091af0977fecc1f57cb859e3724 Mon Sep 17 00:00:00 2001 From: Erem Boto Date: Fri, 30 Sep 2016 15:14:36 -0700 Subject: [PATCH 3/3] Bump jquery dependencies in webjars text resource to fix broken tests --- .../org.webjars.bower/malihu-custom-scrollbar-plugin/3.1.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/shared/src/test/resources/resolutions/org.webjars.bower/malihu-custom-scrollbar-plugin/3.1.5 b/tests/shared/src/test/resources/resolutions/org.webjars.bower/malihu-custom-scrollbar-plugin/3.1.5 index 2300dfd10..6c236c935 100644 --- a/tests/shared/src/test/resources/resolutions/org.webjars.bower/malihu-custom-scrollbar-plugin/3.1.5 +++ b/tests/shared/src/test/resources/resolutions/org.webjars.bower/malihu-custom-scrollbar-plugin/3.1.5 @@ -1,3 +1,3 @@ -org.webjars.bower:jquery:3.1.0:compile +org.webjars.bower:jquery:3.1.1:compile org.webjars.bower:jquery-mousewheel:3.1.13:compile org.webjars.bower:malihu-custom-scrollbar-plugin:3.1.5:compile