erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Catch malformed id's.

Browse source
This commit is contained in:
Cedric Beust 2016-03-02 21:47:57 +04:00
parent a7a02d6981
commit 45747a841c
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/MavenId.kt
View file

@ -20,8 +20,12 @@ class MavenId private constructor(val groupId: String, val artifactId: String, v
size == 3 || size == 4
}
private fun isVersion(s: String): Boolean {
return s[0] == 'v' || Character.isDigit(s[0]) || isRangedVersion(s)
private fun isVersion(s: String, id: String): Boolean {
try {
return s[0] == 'v' || Character.isDigit(s[0]) || isRangedVersion(s)
} catch(ex: Exception) {
error("Illegal version found in id \"$id\"")
}
}
fun isRangedVersion(s: String): Boolean {
@ -45,7 +49,7 @@ class MavenId private constructor(val groupId: String, val artifactId: String, v
artifactId = c[1]
if (!c[2].isEmpty()) {
val split = c[2].split('@')
if (isVersion(split[0])) {
if (isVersion(split[0], id)) {
version = split[0]
}
packaging = if (split.size == 2) split[1] else null