luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Don't restrict Maven property name characters too much
This commit is contained in:
Alexandre Archambault 2016-05-10 16:00:13 +02:00
parent 95d6d9e14e b7ba8d98d5
commit bb77e85f1e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/shared/src/main/scala/coursier/core/Resolution.scala
View File

@ -71,7 +71,7 @@ object Resolution {
} }
val propRegex = ( val propRegex = (
quote("${") + "([a-zA-Z0-9-.]*)" + quote("}") quote("${") + "([^" + quote("{}") + "]*)" + quote("}")
).r ).r
def substituteProps(s: String, properties: Map[String, String]) = { def substituteProps(s: String, properties: Map[String, String]) = {

8
tests/shared/src/test/scala/coursier/test/ResolutionTests.scala
View File

@ -34,11 +34,11 @@ object ResolutionTests extends TestSuite {
Project(Module("acme", "play"), "2.4.1", Project(Module("acme", "play"), "2.4.1",
dependencies = Seq( dependencies = Seq(
"" -> Dependency(Module("acme", "play-json"), "${playJsonVersion}"), "" -> Dependency(Module("acme", "play-json"), "${play_json_version}"),
"" -> Dependency(Module("${project.groupId}", "${configName}"), "1.3.0")), "" -> Dependency(Module("${project.groupId}", "${WithSpecialChar©}"), "1.3.0")),
properties = Seq( properties = Seq(
"playJsonVersion" -> "2.4.0", "play_json_version" -> "2.4.0",
"configName" -> "config")), "WithSpecialChar©" -> "config")),
Project(Module("acme", "play-extra-no-config"), "2.4.1", Project(Module("acme", "play-extra-no-config"), "2.4.1",
Seq( Seq(