From 15e6cdfd68b15128b2cf4d9e972ca6f7c15aeae7 Mon Sep 17 00:00:00 2001 From: Philippus Date: Sun, 5 Aug 2018 09:25:33 +0200 Subject: [PATCH 1/2] Set default maven configurations in pom configuration, fixes #1380 --- main/src/main/scala/sbt/Defaults.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index aa5a81853..f74c579be 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -2031,7 +2031,8 @@ object Classpaths { .withExtra(pomExtra.value) .withProcess(pomPostProcess.value) .withFilterRepositories(pomIncludeRepository.value) - .withAllRepositories(pomAllRepositories.value), + .withAllRepositories(pomAllRepositories.value) + .withConfigurations(Configurations.defaultMavenConfigurations), makeIvyXmlConfiguration := { makeIvyXmlConfig( publishMavenStyle.value, From 1c5fd5bece7e360727b1513d0eb871e422f652c1 Mon Sep 17 00:00:00 2001 From: Philippus Date: Mon, 13 Aug 2018 22:37:55 +0200 Subject: [PATCH 2/2] Add Custom scope to pom configuration --- sbt/src/sbt-test/dependency-management/pom-scope/build.sbt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbt/src/sbt-test/dependency-management/pom-scope/build.sbt b/sbt/src/sbt-test/dependency-management/pom-scope/build.sbt index 4083978d9..a1df43ecb 100644 --- a/sbt/src/sbt-test/dependency-management/pom-scope/build.sbt +++ b/sbt/src/sbt-test/dependency-management/pom-scope/build.sbt @@ -4,6 +4,10 @@ lazy val root = (project in file(".")). configs(Custom). settings( TaskKey[Unit]("checkPom") := checkPom.value, + makePomConfiguration := { + val p = makePomConfiguration.value + p.withConfigurations(Configurations.defaultMavenConfigurations :+ Custom) + }, libraryDependencies ++= Seq( "a" % "a" % "1.0", "b" % "b" % "1.0" % "runtime,optional",