Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

publishing code under two licenses

  • Loading branch information...
commit 52708e94227232a3906f358e1d3f62c22315acdb 1 parent 9679f57
Steve Jenson authored
Showing with 9 additions and 3 deletions.
  1. +2 −2 README
  2. +7 −1 project/build/ScalaJsonProject.scala
View
4 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).
View
8 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>
}
Please sign in to comment.
Something went wrong with that request. Please try again.