Merge pull request #380 from peter-janssen/expand-allowed-repository-…

…id-chars Expand allowed maven repository id characters to match maven
sbt · Jun 2, 2021 · 564119c · 564119c
2 parents f461546 + 976ff44
commit 564119c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala
@@ -504,7 +504,7 @@ class MakePom(val log: Logger) {
     s.toArray.map(_.asInstanceOf[DependencyResolver])
 
   def toID(name: String) = checkID(name.filter(isValidIDCharacter).mkString, name)
-  def isValidIDCharacter(c: Char) = c.isLetterOrDigit
+  def isValidIDCharacter(c: Char) = !"""\/:"<>|?*""".contains(c)
   private def checkID(id: String, name: String) =
     if (id.isEmpty) sys.error("Could not convert '" + name + "' to an ID") else id
   def mavenRepository(repo: MavenRepository): XNode =

diff --git a/ivy/src/test/scala/sbt/internal/librarymanagement/MakePomSpec.scala b/ivy/src/test/scala/sbt/internal/librarymanagement/MakePomSpec.scala
@@ -1,6 +1,7 @@
 package sbt.internal.librarymanagement
 
 import sbt.internal.util.ConsoleLogger
+import sbt.librarymanagement.MavenRepository
 import verify.BasicTestSuite
 
 // http://ant.apache.org/ivy/history/2.3.0/ivyfile/dependency.html
@@ -74,6 +75,18 @@ object MakePomSpec extends BasicTestSuite {
     beParsedAsError("foo+")
   }
 
+  test("repository id should not contain maven illegal repo id characters") {
+    val repository = mp.mavenRepository(
+      MavenRepository(
+        """repository-id-\with-/illegal:"<-chars>|?*-others~!@#$%^&`';{}[]=+_,.""",
+        "uri"
+      )
+    )
+    assert(
+      (repository \ "id").text == "repository-id-with-illegal-chars-others~!@#$%^&`';{}[]=+_,."
+    )
+  }
+
   val mp = new MakePom(ConsoleLogger())
   def convertTo(s: String, expected: String): Unit = {
     assert(MakePom.makeDependencyVersion(s) == expected)