publishing code under two licenses

README

@@ -2,5 +2,5 @@ Scala JSON toolkit originally lifted from Martin Odersky et al's
 Programming Scala book. We tightened up some edge cases and added
 complete test coverage.
 
-Thanks,
-Twitter, Inc.
+Original code is under the Scala license (LICENSE.scala) and Twitter modifications
+are available under the Apache 2 license (LICENSE).

project/build/ScalaJsonProject.scala

@@ -7,7 +7,8 @@ class ScalaJsonProject(info: ProjectInfo) extends StandardProject(info) {
   val vscaladoc = "org.scala-tools" % "vscaladoc" % "1.1-md-3"
   val configgy = "net.lag" % "configgy" % "1.5.3"
 
-  val publishTo = Resolver.sftp("green.lag.net", "green.lag.net", "/web/repo")
+  Credentials(Path.userHome / ".ivy2" / "credentials", log)
+  val publishTo = "nexus" at "http://nexus.scala-tools.org/content/repositories/releases/"
 
   override def pomExtra =
     <licenses>
@@ -16,5 +17,10 @@ class ScalaJsonProject(info: ProjectInfo) extends StandardProject(info) {
         <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
         <distribution>repo</distribution>
       </license>
+      <license>
+        <name>Scala License</name>
+        <url>http://www.scala-lang.org/node/146</url>
+        <distribution>repo</distribution>
+      </license>
     </licenses>
 }