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

Merge pull request #4300 from Philippus/default-maven-configs 

Set default maven configurations in pom configuration, fixes #1380
This commit is contained in:
eugene yokota 2018-08-14 15:56:45 -04:00 committed by GitHub
parent ad346f529a 1c5fd5bece
commit 74f5cdc630
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/scala/sbt/Defaults.scala
View File

@ -2031,7 +2031,8 @@ object Classpaths {
.withExtra(pomExtra.value) .withExtra(pomExtra.value)
.withProcess(pomPostProcess.value) .withProcess(pomPostProcess.value)
.withFilterRepositories(pomIncludeRepository.value) .withFilterRepositories(pomIncludeRepository.value)
.withAllRepositories(pomAllRepositories.value), .withAllRepositories(pomAllRepositories.value)
.withConfigurations(Configurations.defaultMavenConfigurations),
makeIvyXmlConfiguration := { makeIvyXmlConfiguration := {
makeIvyXmlConfig( makeIvyXmlConfig(
publishMavenStyle.value, publishMavenStyle.value,

4
sbt/src/sbt-test/dependency-management/pom-scope/build.sbt
View File

@ -4,6 +4,10 @@ lazy val root = (project in file(".")).
configs(Custom). configs(Custom).
settings( settings(
TaskKey[Unit]("checkPom") := checkPom.value, TaskKey[Unit]("checkPom") := checkPom.value,
makePomConfiguration := {
val p = makePomConfiguration.value
p.withConfigurations(Configurations.defaultMavenConfigurations :+ Custom)
},
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"a" % "a" % "1.0", "a" % "a" % "1.0",
"b" % "b" % "1.0" % "runtime,optional", "b" % "b" % "1.0" % "runtime,optional",