Merge pull request #471 from coursier/topic/fix-snapshot-versioning-artifacts

Fix missing artifacts for snapshot versioning
This commit is contained in:
Alexandre Archambault 2017-03-23 16:52:14 +01:00 committed by GitHub
commit 11a3773a11
2 changed files with 20 additions and 13 deletions

View File

@ -292,13 +292,7 @@ final case class MavenRepository(
val files = WebPage.listFiles(listFilesUrl, rawListFilesPage)
val versioning = proj0
.snapshotVersioning
.flatMap(versioning =>
mavenVersioning(versioning, "", "")
)
val prefix = s"${module.name}-${versioning.getOrElse(version)}"
val prefix = s"${module.name}-${versioningValue.getOrElse(version)}"
val packagingTpeMap = proj0.packagingOpt
.map { packaging =>

View File

@ -152,9 +152,10 @@ object CentralTests extends TestSuite {
version: String,
artifactType: String,
extension: String,
attributes: Attributes = Attributes()
attributes: Attributes = Attributes(),
extraRepo: Option[Repository] = None
): Future[Unit] =
withArtifact(module, version, artifactType, attributes = attributes) { artifact =>
withArtifact(module, version, artifactType, attributes = attributes, extraRepo = extraRepo) { artifact =>
assert(artifact.url.endsWith("." + extension))
}
@ -228,11 +229,23 @@ object CentralTests extends TestSuite {
'snapshotMetadata - {
// Let's hope this one won't change too much
resolutionCheck(
Module("com.github.fommil", "java-logging"),
"1.2-SNAPSHOT",
val mod = Module("com.github.fommil", "java-logging")
val version = "1.2-SNAPSHOT"
val extraRepo = MavenRepository("https://oss.sonatype.org/content/repositories/public/")
* - resolutionCheck(
mod,
version,
configuration = "runtime",
extraRepo = Some(MavenRepository("https://oss.sonatype.org/content/repositories/public/"))
extraRepo = Some(extraRepo)
)
* - ensureHasArtifactWithExtension(
mod,
version,
"jar",
"jar",
extraRepo = Some(extraRepo)
)
}