erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-06-16 21:30:51 -07:00
Code Releases Activity

Fix maven-metadata-local.xml.

Browse source
This commit is contained in:
Cedric Beust 2015-12-12 02:23:44 +04:00
parent 5468a380f2
commit 872a0d3961
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/kotlin/com/beust/kobalt/maven/RepoFinder.kt
View file

@ -91,7 +91,8 @@ public class RepoFinder @Inject constructor(val executors: KobaltExecutors) {
if (version!!.contains("SNAPSHOT")) { if (version!!.contains("SNAPSHOT")) {
val dep = SimpleDep(mavenId) val dep = SimpleDep(mavenId)
val isLocal = repoUrl.startsWith(FileDependency.PREFIX_FILE) val isLocal = repoUrl.startsWith(FileDependency.PREFIX_FILE)
val snapshotVersion = findSnapshotVersion(dep.toMetadataXmlPath(false, isLocal), repoUrl) val snapshotVersion = if (isLocal) version!!
else findSnapshotVersion(dep.toMetadataXmlPath(false, isLocal, version), repoUrl)
if (snapshotVersion != null) { if (snapshotVersion != null) {
return RepoResult(repo, true, version, true /* hasJar, potential bug here */, return RepoResult(repo, true, version, true /* hasJar, potential bug here */,
snapshotVersion) snapshotVersion)
@ -154,6 +155,12 @@ public class RepoFinder @Inject constructor(val executors: KobaltExecutors) {
val bn = buildNumber.evaluate(doc, XPathConstants.STRING) val bn = buildNumber.evaluate(doc, XPathConstants.STRING)
if (! Strings.isEmpty(ts.toString()) && ! Strings.isEmpty(bn.toString())) { if (! Strings.isEmpty(ts.toString()) && ! Strings.isEmpty(bn.toString())) {
return ts.toString() + "-" + bn.toString() return ts.toString() + "-" + bn.toString()
} else {
val lastUpdated = XPATH.compile("/metadata/versioning/lastUpdated")
if (! lastUpdated.toString().isEmpty()) {
return lastUpdated.toString()
}
} }
} catch(ex: Exception) { } catch(ex: Exception) {
log(2, "Couldn't find metadata at $url") log(2, "Couldn't find metadata at $url")

10
src/main/kotlin/com/beust/kobalt/maven/UnversionedDep.kt
View file

@ -8,8 +8,14 @@ import java.io.File
* eventually resolve to the latest version of the artifact. * eventually resolve to the latest version of the artifact.
*/ */
open class UnversionedDep(open val groupId: String, open val artifactId: String) { open class UnversionedDep(open val groupId: String, open val artifactId: String) {
open fun toMetadataXmlPath(fileSystem: Boolean = true, isLocal: Boolean) = open fun toMetadataXmlPath(fileSystem: Boolean = true, isLocal: Boolean, version: String? = null) : String {
toDirectory("", fileSystem) + if (isLocal) "maven-metadata-local.xml" else "maven-metadata.xml" var result = toDirectory("", fileSystem) + if (isLocal) "maven-metadata-local.xml" else "maven-metadata.xml"
if (! File(result).exists() && version != null) {
result = toDirectory("", fileSystem) + version + File.separator +
if (isLocal) "maven-metadata-local.xml" else "maven-metadata.xml"
}
return result
}
/** /**
* Turn this dependency to a directory. If fileSystem is true, use the file system * Turn this dependency to a directory. If fileSystem is true, use the file system