Skip to content

Commit bf4ff88

Browse files
authored
Merge pull request #317 from SethTisue/fix-sonatype
fix POM so Sonatype will accept it
2 parents 5892d96 + c2f5879 commit bf4ff88

File tree

1 file changed

+5
-26
lines changed

1 file changed

+5
-26
lines changed

project/Common.scala

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,17 @@ object Common extends AutoPlugin {
2323

2424
override def requires = plugins.JvmPlugin && HeaderPlugin
2525

26-
// sonatype
27-
object sonatype extends PublishToSonatype {
28-
def projectUrl = "https://github.com/lightbend/ssl-config"
29-
def scmUrl = "git://github.com/lightbend/ssl-config.git"
30-
def developers = List(
31-
Developer("wsargent", "Will Sargent", "https://tersesystems.com"),
32-
Developer("ktoso", "Konrad Malawski", "https://project13.pl"))
33-
}
34-
3526
// AutomateHeaderPlugin is not an allRequirements-AutoPlugin, so explicitly add settings here:
3627
override def projectSettings =
3728
AutomateHeaderPlugin.projectSettings ++
38-
sonatype.settings ++
3929
Seq(
4030
scalariformAutoformat := true,
4131
organization := "com.typesafe",
32+
homepage := Some(url("https://github.com/lightbend/ssl-config")),
33+
developers := List(
34+
Developer("wsargent", "Will Sargent", "", url("https://tersesystems.com")),
35+
Developer("ktoso", "Konrad Malawski", "", url("https://project13.pl")),
36+
),
4237
updateOptions := updateOptions.value.withCachedResolution(true),
4338
scalacOptions ++= Seq("-encoding", "UTF-8", "-unchecked", "-deprecation", "-feature"),
4439
scalacOptions ++= {
@@ -81,19 +76,3 @@ object Common extends AutoPlugin {
8176
)
8277

8378
}
84-
85-
// from https://github.com/lightbend/config/blob/master/project/PublishToSonatype.scala
86-
abstract class PublishToSonatype {
87-
case class Developer(id: String, name: String, url: String)
88-
def projectUrl: String
89-
90-
def developers: List[Developer]
91-
def licenseDistribution = "repo"
92-
def scmUrl: String
93-
def scmConnection = "scm:git:" + scmUrl
94-
95-
def settings = Seq(
96-
Test / publishArtifact := false,
97-
pomIncludeRepository := (_ => false),
98-
)
99-
}

0 commit comments

Comments
 (0)