Merge pull request #247 from alexarchambault/topic/properties-special…

…-characters Don't restrict Maven property name characters too much
coursier · May 10, 2016 · bb77e85 · bb77e85
2 parents 95d6d9e + b7ba8d9
commit bb77e85
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/core/shared/src/main/scala/coursier/core/Resolution.scala b/core/shared/src/main/scala/coursier/core/Resolution.scala
@@ -71,7 +71,7 @@ object Resolution {
   }
 
   val propRegex = (
-    quote("${") + "([a-zA-Z0-9-.]*)" + quote("}")
+    quote("${") + "([^" + quote("{}") + "]*)" + quote("}")
   ).r
 
   def substituteProps(s: String, properties: Map[String, String]) = {

diff --git a/tests/shared/src/test/scala/coursier/test/ResolutionTests.scala b/tests/shared/src/test/scala/coursier/test/ResolutionTests.scala
@@ -34,11 +34,11 @@ object ResolutionTests extends TestSuite {
 
     Project(Module("acme", "play"), "2.4.1",
       dependencies = Seq(
-        "" -> Dependency(Module("acme", "play-json"), "${playJsonVersion}"),
-        "" -> Dependency(Module("${project.groupId}", "${configName}"), "1.3.0")),
+        "" -> Dependency(Module("acme", "play-json"), "${play_json_version}"),
+        "" -> Dependency(Module("${project.groupId}", "${WithSpecialChar©}"), "1.3.0")),
       properties = Seq(
-        "playJsonVersion" -> "2.4.0",
-        "configName" -> "config")),
+        "play_json_version" -> "2.4.0",
+        "WithSpecialChar©" -> "config")),
 
     Project(Module("acme", "play-extra-no-config"), "2.4.1",
       Seq(