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

Fix snapshot downloads.

Browse source 
Fix #131.
This commit is contained in:
Cedric Beust 2016-02-17 02:38:01 +04:00
parent 261f3311a8
commit 6ebc0b458b
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,7 +35,18 @@ class RepoFinder @Inject constructor(val executors: KobaltExecutors) {
val archiveUrl: String? = null, val snapshotVersion: Version? = null) { val archiveUrl: String? = null, val snapshotVersion: Version? = null) {
val found = archiveUrl != null val found = archiveUrl != null
val path = archiveUrl?.substring(hostConfig.url.length) val localPath = archiveUrl?.substring(hostConfig.url.length)
// If it's a snapshot, we download a specific timestamped jar file but we need to save it under
// the SNAPSHOT-3.2.jar name.
val path = if (snapshotVersion != null && snapshotVersion.snapshotTimestamp != null && localPath != null) {
val ind = localPath.indexOf(snapshotVersion.snapshotTimestamp)
val lastDot = localPath.lastIndexOf(".")
val result = localPath.substring(0, ind) + "SNAPSHOT" +
localPath.substring(lastDot)
result
} else {
localPath
}
} }
private val FOUND_REPOS: LoadingCache<String, RepoResult> = CacheBuilder.newBuilder() private val FOUND_REPOS: LoadingCache<String, RepoResult> = CacheBuilder.newBuilder()
@ -113,8 +124,9 @@ class RepoFinder @Inject constructor(val executors: KobaltExecutors) {
if (isLocal) version if (isLocal) version
else findSnapshotVersion(metadataXmlPath, repoUrl, mavenId.version) else findSnapshotVersion(metadataXmlPath, repoUrl, mavenId.version)
if (snapshotVersion != null) { if (snapshotVersion != null) {
val url = repoUrl + metadataXmlPath val url = repoUrl + dep.toDirectory(fileSystem = false, v = dep.version) +
val kurl = Kurl(HostConfig(url)) dep.artifactId + "-" + snapshotVersion.noSnapshotVersion +
"-" + snapshotVersion.snapshotTimestamp + ".jar"
return RepoResult(repo, version, url, snapshotVersion) return RepoResult(repo, version, url, snapshotVersion)
} else { } else {
return RepoResult(repo) return RepoResult(repo)