luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix missing artifacts for snapshot versioning 

Regression since recent overhaul of artifact type handling
This commit is contained in:
Alexandre Archambault 2017-03-23 14:07:48 +01:00
parent 1fbf06e0b0
commit 729c62278a
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/shared/src/main/scala/coursier/maven/MavenRepository.scala
View File

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

25
tests/shared/src/test/scala/coursier/test/CentralTests.scala
View File

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