diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-06-14 21:36:27 -0400 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-06-15 01:13:47 -0400 |
| commit | 8794d3ce0ca7f92df24c317c9a9b7025aa0e3dee (patch) | |
| tree | 60dc3f90c8936ccdaad56a5482a534efdc441eee | |
| parent | 10dbafc2117ba7b8e0183ac402176e7e815a5280 (diff) | |
| download | cbt-8794d3ce0ca7f92df24c317c9a9b7025aa0e3dee.tar.gz cbt-8794d3ce0ca7f92df24c317c9a9b7025aa0e3dee.tar.bz2 cbt-8794d3ce0ca7f92df24c317c9a9b7025aa0e3dee.zip | |
adjust organization part of pom data model to better match the spec
| -rw-r--r-- | stage2/Lib.scala | 13 | ||||
| -rw-r--r-- | stage2/PublishBuild.scala | 6 | ||||
| -rw-r--r-- | stage2/pom.scala | 5 |
3 files changed, 14 insertions, 10 deletions
diff --git a/stage2/Lib.scala b/stage2/Lib.scala index 71568b5..2a108ab 100644 --- a/stage2/Lib.scala +++ b/stage2/Lib.scala @@ -307,8 +307,7 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{ scmUrl: String, // seems like invalid URLs are used here in pom files scmConnection: String, inceptionYear: Int, - organizationName: String, - organizationUrl: URL, + organization: Option[Organization], dependencies: Seq[Dependency], jarTarget: File ): File = { @@ -346,10 +345,12 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{ <connection>{scmConnection}</connection> </scm> <inceptionYear>{inceptionYear}</inceptionYear> - <organization> - <name>{organizationName}</name> - <url>{organizationUrl}</url> - </organization> + {organization.map{ org => + <organization> + <name>{org.name}</name> + {org.url.map( url => <url>url</url> )} + </organization> + }} <dependencies> { dependencies.map{ diff --git a/stage2/PublishBuild.scala b/stage2/PublishBuild.scala index 208a166..d744a08 100644 --- a/stage2/PublishBuild.scala +++ b/stage2/PublishBuild.scala @@ -12,8 +12,7 @@ abstract class PublishBuild(context: Context) extends PackageBuild(context){ def scmUrl: String def scmConnection: String def inceptionYear: Int - def organizationName: String - def organizationUrl: URL + def organization: Option[Organization] // ========== package ========== @@ -31,8 +30,7 @@ abstract class PublishBuild(context: Context) extends PackageBuild(context){ scmUrl = scmUrl, scmConnection = scmConnection, inceptionYear, - organizationName, - organizationUrl, + organization, dependencies = dependencies, jarTarget = jarTarget ) diff --git a/stage2/pom.scala b/stage2/pom.scala new file mode 100644 index 0000000..610f9f6 --- /dev/null +++ b/stage2/pom.scala @@ -0,0 +1,5 @@ +package cbt +case class Organization( + name: String, + url: Option[String] +) |