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

Add support for parent project POM properties 

Fixes https://github.com/alexarchambault/coursier/issues/120
This commit is contained in:
Alexandre Archambault 2016-01-23 15:42:08 +01:00
parent e74984da5d
commit a254b9c21c
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/shared/src/main/scala/coursier/core/Resolution.scala
View File

@ -335,7 +335,14 @@ object Resolution {
"project.groupId" -> project.module.organization,
"project.artifactId" -> project.module.name,
"project.version" -> project.version
)
) ++ project.parent.toSeq.flatMap {
case (parModule, parVersion) =>
Seq(
"project.parent.groupId" -> parModule.organization,
"project.parent.artifactId" -> parModule.name,
"project.parent.version" -> parVersion
)
}
val properties = propertiesMap(properties0)

17
tests/shared/src/test/resources/resolutions/com.github.fommil.netlib/all/1.1.2 Normal file
View File

@ -0,0 +1,17 @@
com.github.fommil.netlib:all:jar:1.1.2
com.github.fommil.netlib:core:jar:1.1.2
com.github.fommil.netlib:native_ref-java:jar:1.1
com.github.fommil.netlib:native_system-java:jar:1.1
com.github.fommil.netlib:netlib-native_ref-linux-armhf:jar:natives:1.1
com.github.fommil.netlib:netlib-native_ref-linux-i686:jar:natives:1.1
com.github.fommil.netlib:netlib-native_ref-linux-x86_64:jar:natives:1.1
com.github.fommil.netlib:netlib-native_ref-osx-x86_64:jar:natives:1.1
com.github.fommil.netlib:netlib-native_ref-win-i686:jar:natives:1.1
com.github.fommil.netlib:netlib-native_ref-win-x86_64:jar:natives:1.1
com.github.fommil.netlib:netlib-native_system-linux-armhf:jar:natives:1.1
com.github.fommil.netlib:netlib-native_system-linux-i686:jar:natives:1.1
com.github.fommil.netlib:netlib-native_system-linux-x86_64:jar:natives:1.1
com.github.fommil.netlib:netlib-native_system-osx-x86_64:jar:natives:1.1
com.github.fommil.netlib:netlib-native_system-win-i686:jar:natives:1.1
com.github.fommil.netlib:netlib-native_system-win-x86_64:jar:natives:1.1
com.github.fommil:jniloader:jar:1.1

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

@ -143,6 +143,12 @@ object CentralTests extends TestSuite {
extraRepo = Some(MavenRepository("https://oss.sonatype.org/content/repositories/public/"))
)
}
'parentProjectProperties - {
resolutionCheck(
Module("com.github.fommil.netlib", "all"),
"1.1.2"
)
}
}
}