From b4fa53e2aa0f31601cba4570aa94fa6f5589cb60 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Sat, 17 Jul 2010 22:17:16 -0400 Subject: [PATCH 1/7] Upgrade ScalaTest to 1.2 release. --- project/build/src/ScalatraProject.scala | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/project/build/src/ScalatraProject.scala b/project/build/src/ScalatraProject.scala index c8e50eeca..29524ab49 100644 --- a/project/build/src/ScalatraProject.scala +++ b/project/build/src/ScalatraProject.scala @@ -10,7 +10,7 @@ class ScalatraProject(info: ProjectInfo) extends ParentProject(info) lazy val core = project("core", "scalatra", new CoreProject(_)) class CoreProject(info: ProjectInfo) extends DefaultProject(info) { val jettytester = jettyGroupId % "jetty-servlet-tester" % jettyVersion % "provided" - val scalatest = "org.scalatest" % "scalatest" % scalatestVersion(crossScalaVersionString) % "provided->default" + val scalatest = "org.scalatest" % "scalatest" % "1.2" % "provided->default" val mockito = "org.mockito" % "mockito-core" % "1.8.2" % "test" } @@ -19,19 +19,5 @@ class ScalatraProject(info: ProjectInfo) extends ParentProject(info) val jetty6 = jettyGroupId % "jetty" % jettyVersion % "test" } - def scalatestVersion(scalaVersion: String) = { - scalaVersion match { - case "2.8.0.Beta1" => - "1.0.1-for-scala-2.8.0.Beta1-with-test-interfaces-0.3-SNAPSHOT" - case "2.8.0.RC1" => - "1.0.1-for-scala-2.8.0.RC1-SNAPSHOT" - case "2.8.0" => - // Temporary until ScalaTest is released for 2.8.0 - "1.2-for-scala-2.8.0.RC7-SNAPSHOT" - case x => - "1.2-for-scala-"+x+"-SNAPSHOT" - } - } - val scalaToolsSnapshots = "Scala-Tools Maven2 Snapshots Repository" at "http://scala-tools.org/repo-snapshots" } From ad79be48f29ab739ec5c4f95fcc74b7d2bc6f090 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Sat, 17 Jul 2010 23:18:08 -0400 Subject: [PATCH 2/7] Bump version number to 1.2.1. --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 8b3e70737..712bc1bd1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -2,7 +2,7 @@ #Tue Mar 16 23:42:48 EDT 2010 project.name=scalatra-parent project.organization=org.scalatra -project.version=1.2.0 +project.version=1.2.1 sbt.version=0.7.2 def.scala.version=2.7.7 build.scala.versions=2.7.7 From df05d265fc4247da6b5a1545bfca5f86183d8108 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Sat, 17 Jul 2010 23:18:20 -0400 Subject: [PATCH 3/7] Backport Maven build from master branch. --- core/pom.xml | 64 +++++++ example/pom.xml | 70 ++++++++ pom.xml | 165 +++++++++++++++++ project/build.properties | 2 +- project/build/src/ScalatraProject.scala | 226 +++++++++++++++++++++++- 5 files changed, 522 insertions(+), 5 deletions(-) create mode 100644 core/pom.xml create mode 100644 example/pom.xml create mode 100644 pom.xml diff --git a/core/pom.xml b/core/pom.xml new file mode 100644 index 000000000..a381c1c32 --- /dev/null +++ b/core/pom.xml @@ -0,0 +1,64 @@ + + + 4.0.0 + + org.scalatra + scalatra-parent_2.7.7 + 1.2.0 + + org.scalatra + scalatra_2.7.7 + 1.2.0 + jar + scalatra + The core Scalatra library + + + org.mortbay.jetty + jetty-servlet-tester + 6.1.22 + provided + + + org.mockito + mockito-core + 1.8.2 + test + + + org.scala-tools.sbt + test-compat_2.7.7 + 0.4.1 + test + + + org.scalatest + scalatest + 1.0 + provided + + + org.mortbay.jetty + servlet-api + 2.5-20081211 + provided + + + org.scala-lang + scala-library + 2.7.7 + compile + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + false + + + + + \ No newline at end of file diff --git a/example/pom.xml b/example/pom.xml new file mode 100644 index 000000000..d08229487 --- /dev/null +++ b/example/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + org.scalatra + scalatra-parent_2.7.7 + 1.2.0 + + org.scalatra + scalatra-example_2.7.7 + 1.2.0 + war + scalatra-example + An example Scalatra application + + + org.mortbay.jetty + jetty-servlet-tester + 6.1.22 + provided + + + org.scalatest + scalatest + 1.0 + test + + + org.mortbay.jetty + jetty + 6.1.22 + test + + + org.scala-tools.sbt + test-compat_2.7.7 + 0.4.1 + test + + + org.mortbay.jetty + servlet-api + 2.5-20081211 + provided + + + org.scalatra + scalatra_2.7.7 + 1.2.0 + compile + + + org.scala-lang + scala-library + 2.7.7 + compile + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..2b46e5404 --- /dev/null +++ b/pom.xml @@ -0,0 +1,165 @@ + + + 4.0.0 + org.scalatra + scalatra-parent_2.7.7 + 1.2.0 + pom + scalatra-parent + Step Project POM + + 2.2.1 + + + UTF-8 + 2.7.7 + + http://www.scalatra.org/ + 2009 + + Scalatra Project + http://www.scalatra.org/ + + + + BSD + http://github.com/alandipert/step/raw/HEAD/LICENSE + repo + + + + + Scalatra user group + http://groups.google.com/group/scalatra-user + scalatra-user@googlegroups.com + scalatra-user+subscribe@googlegroups.com + scalatra-user+unsubscribe@googlegroups.com + + + + scm:git:git://github.com/alandipert/step.git + scm:git:ssh://git@github.com:alandipert/step.git + http://github.com/alandipert/step + + + + sonatype-nexus-staging + Nexus Release Repository + http://oss.sonatype.org/service/local/staging/deploy/maven2 + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + http://oss.sonatype.org/content/repositories/snapshots + + + + + riffraff + Gabriele Renzi + http://www.riffraff.info + + + alandipert + Alan Dipert + http://alan.dipert.org + + + rossabaker + Ross A. Baker + http://www.rossabaker.com/ + + + chirino + Hiram Chirino + http://hiramchirino.com/blog/ + + + + core + example + + + + + org.scala-tools + maven-scala-plugin + 2.14 + + + + compile + testCompile + + + + + scala.tools.nsc.ScalaDoc + + -Xmx1024m + + + -deprecation + + ${scala-version} + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + + download + + + ScalaToolsMaven2SnapshotsRepository + Scala-Tools Maven2 Snapshots Repository + http://scala-tools.org/repo-snapshots/ + + + ScalaToolsMaven2Repository + Scala-Tools Maven2 Repository + http://scala-tools.org/repo-releases/ + + + + + scalatools.releases + http://scala-tools.org/repo-releases + + false + + + true + + + + scalatools.snapshots + http://scala-tools.org/repo-snapshots + + true + + + false + + + + + + \ No newline at end of file diff --git a/project/build.properties b/project/build.properties index 712bc1bd1..be445c1c0 100644 --- a/project/build.properties +++ b/project/build.properties @@ -3,7 +3,7 @@ project.name=scalatra-parent project.organization=org.scalatra project.version=1.2.1 -sbt.version=0.7.2 +sbt.version=0.7.4 def.scala.version=2.7.7 build.scala.versions=2.7.7 project.initialize=false diff --git a/project/build/src/ScalatraProject.scala b/project/build/src/ScalatraProject.scala index 21ed09bbc..6db50e899 100644 --- a/project/build/src/ScalatraProject.scala +++ b/project/build/src/ScalatraProject.scala @@ -1,5 +1,7 @@ import sbt._ +import scala.xml._ + class ScalatraProject(info: ProjectInfo) extends ParentProject(info) { override def shouldCheckOutputDirectories = false @@ -7,15 +9,231 @@ class ScalatraProject(info: ProjectInfo) extends ParentProject(info) val jettyGroupId = "org.mortbay.jetty" val jettyVersion = "6.1.22" - lazy val core = project("core", "scalatra", new CoreProject(_)) - class CoreProject(info: ProjectInfo) extends DefaultProject(info) { + trait ScalatraSubProject extends BasicManagedProject { + def description: String + def skipDeploy: Boolean = false + val jettytester = jettyGroupId % "jetty-servlet-tester" % jettyVersion % "provided" - val scalatest = "org.scalatest" % "scalatest" % "1.0" % "provided->default" + val servletApi = "org.mortbay.jetty" % "servlet-api" % "2.5-20081211" % "provided" + val scalatest = "org.scalatest" % "scalatest" % "1.0" % "test" + + override def pomPostProcess(pom: Node) = + + 4.0.0 + + {organization} + {crossScalaName(ScalatraProject.this.name)} + {version} + + {organization} + {crossScalaName(name)} + {version} + {pom \ "packaging"} + {name} + {description} + {pom \ "properties"} + {pom \ "dependencies"} + + + + org.apache.maven.plugins + maven-deploy-plugin + + {skipDeploy} + + + + + + + override def makePomConfiguration = + new MakePomConfiguration(deliverProjectDependencies, + Some(Configurations.defaultMavenConfigurations), + pomExtra, pomPostProcess, pomIncludeRepository) + + override def pomPath = "pom.xml" + } + + + lazy val core = project("core", "scalatra", new CoreProject(_)) + class CoreProject(info: ProjectInfo) extends DefaultProject(info) with ScalatraSubProject { + override val scalatest = "org.scalatest" % "scalatest" % "1.0" % "provided" val mockito = "org.mockito" % "mockito-core" % "1.8.2" % "test" + val description = "The core Scalatra library" } lazy val example = project("example", "scalatra-example", new ExampleProject(_), core) - class ExampleProject(info: ProjectInfo) extends DefaultWebProject(info) { + class ExampleProject(info: ProjectInfo) extends DefaultWebProject(info) with ScalatraSubProject { val jetty6 = jettyGroupId % "jetty" % jettyVersion % "test" + val description = "An example Scalatra application" + override val skipDeploy = true // Do not deploy to Maven repo } + + val scalaToolsSnapshots = "Scala-Tools Maven2 Snapshots Repository" at "http://scala-tools.org/repo-snapshots" + + override def pomPostProcess(pom: Node) = + + 4.0.0 + {organization} + {crossScalaName(name)} + {version} + pom + + {name} + Step Project POM + + + 2.2.1 + + + + UTF-8 + {crossScalaVersionString} + + + http://www.scalatra.org/ + 2009 + + + Scalatra Project + http://www.scalatra.org/ + + + + + BSD + http://github.com/alandipert/step/raw/HEAD/LICENSE + repo + + + + + + Scalatra user group + http://groups.google.com/group/scalatra-user + scalatra-user@googlegroups.com + scalatra-user+subscribe@googlegroups.com + scalatra-user+unsubscribe@googlegroups.com + + + + + scm:git:git://github.com/alandipert/step.git + scm:git:ssh://git@github.com:alandipert/step.git + http://github.com/alandipert/step + + + + + sonatype-nexus-staging + Nexus Release Repository + http://oss.sonatype.org/service/local/staging/deploy/maven2 + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + http://oss.sonatype.org/content/repositories/snapshots + + + + + + riffraff + Gabriele Renzi + http://www.riffraff.info + + + alandipert + Alan Dipert + http://alan.dipert.org + + + rossabaker + Ross A. Baker + http://www.rossabaker.com/ + + + chirino + Hiram Chirino + http://hiramchirino.com/blog/ + + + + + core + example + + + + + + org.scala-tools + maven-scala-plugin + 2.14 + + + + compile + testCompile + + + + + scala.tools.nsc.ScalaDoc + + -Xmx1024m + + + -deprecation + + ${{scala-version}} + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + + + download + {pom \ "repositories"} + + + + scalatools.releases + http://scala-tools.org/repo-releases + false + true + + + scalatools.snapshots + http://scala-tools.org/repo-snapshots + true + false + + + + + + + def crossScalaName(name: String) = name+"_"+crossScalaVersionString + + override def pomPath = "pom.xml" } From db168a29b113fbc6869b96527eff511c12a03bdd Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Sat, 17 Jul 2010 23:37:27 -0400 Subject: [PATCH 4/7] Support running ScalaTest tests from maven-surefire-plugin. --- core/pom.xml | 28 +++++++++++-------- .../scala/org/scalatra/ScalatraSuite.scala | 3 ++ .../scala/org/scalatra/RequestBodyTest.scala | 5 +++- .../scala/org/scalatra/UrlSupportTest.scala | 5 +++- example/pom.xml | 24 ++++++++++------ pom.xml | 2 +- project/build/src/ScalatraProject.scala | 2 ++ 7 files changed, 46 insertions(+), 23 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index a381c1c32..0ac0791ed 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,15 +4,21 @@ org.scalatra scalatra-parent_2.7.7 - 1.2.0 + 1.2.1 org.scalatra scalatra_2.7.7 - 1.2.0 + 1.2.1 jar scalatra The core Scalatra library + + org.scalatest + scalatest + 1.0 + provided + org.mortbay.jetty jetty-servlet-tester @@ -26,15 +32,9 @@ test - org.scala-tools.sbt - test-compat_2.7.7 - 0.4.1 - test - - - org.scalatest - scalatest - 1.0 + junit + junit + 4.8.1 provided @@ -43,6 +43,12 @@ 2.5-20081211 provided + + org.scala-tools.sbt + test-compat_2.7.7 + 0.4.1 + test + org.scala-lang scala-library diff --git a/core/src/main/scala/org/scalatra/ScalatraSuite.scala b/core/src/main/scala/org/scalatra/ScalatraSuite.scala index b50e5a21b..fc40f43ed 100644 --- a/core/src/main/scala/org/scalatra/ScalatraSuite.scala +++ b/core/src/main/scala/org/scalatra/ScalatraSuite.scala @@ -1,5 +1,8 @@ package org.scalatra import org.scalatest.FunSuite +import org.scalatest.junit.JUnitRunner +import org.junit.runner.RunWith +@RunWith(classOf[JUnitRunner]) class ScalatraSuite extends FunSuite with ScalatraTests diff --git a/core/src/test/scala/org/scalatra/RequestBodyTest.scala b/core/src/test/scala/org/scalatra/RequestBodyTest.scala index 5845cf6c5..e8682a0e6 100644 --- a/core/src/test/scala/org/scalatra/RequestBodyTest.scala +++ b/core/src/test/scala/org/scalatra/RequestBodyTest.scala @@ -4,6 +4,8 @@ import org.scalatest.FunSuite import org.scalatest.matchers.ShouldMatchers import io.Source import org.mortbay.jetty.testing.{ServletTester, HttpTester} +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner class RequestBodyTestServlet extends ScalatraServlet { get("/request-body") { @@ -15,6 +17,7 @@ class RequestBodyTestServlet extends ScalatraServlet { } } +@RunWith(classOf[JUnitRunner]) class RequestBodyTest extends FunSuite with ShouldMatchers { val tester = new ServletTester tester.addServlet(classOf[RequestBodyTestServlet], "/") @@ -44,4 +47,4 @@ class RequestBodyTest extends FunSuite with ShouldMatchers { res.parse(tester.getResponses(req.generate)) res.getContent should equal ("My cat's breath smells like fish!") } -} \ No newline at end of file +} diff --git a/core/src/test/scala/org/scalatra/UrlSupportTest.scala b/core/src/test/scala/org/scalatra/UrlSupportTest.scala index abc5e56af..a2f395150 100644 --- a/core/src/test/scala/org/scalatra/UrlSupportTest.scala +++ b/core/src/test/scala/org/scalatra/UrlSupportTest.scala @@ -8,7 +8,10 @@ import org.mockito.Mockito._ import org.mockito.Matchers._ import org.mockito.stubbing.Answer import org.mockito.invocation.InvocationOnMock +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner +@RunWith(classOf[JUnitRunner]) class UrlSupportTest extends FunSuite with ShouldMatchers { private val urlSupport = new UrlSupport { def contextPath = "/context" @@ -56,4 +59,4 @@ class UrlSupportTest extends FunSuite with ShouldMatchers { url("foo") should equal ("foo;jsessionid=1234") } } -} \ No newline at end of file +} diff --git a/example/pom.xml b/example/pom.xml index d08229487..afedf7581 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -4,15 +4,21 @@ org.scalatra scalatra-parent_2.7.7 - 1.2.0 + 1.2.1 org.scalatra scalatra-example_2.7.7 - 1.2.0 + 1.2.1 war scalatra-example An example Scalatra application + + junit + junit + 4.8.1 + test + org.mortbay.jetty jetty-servlet-tester @@ -31,22 +37,22 @@ 6.1.22 test - - org.scala-tools.sbt - test-compat_2.7.7 - 0.4.1 - test - org.mortbay.jetty servlet-api 2.5-20081211 provided + + org.scala-tools.sbt + test-compat_2.7.7 + 0.4.1 + test + org.scalatra scalatra_2.7.7 - 1.2.0 + 1.2.1 compile diff --git a/pom.xml b/pom.xml index 2b46e5404..ab296f174 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.scalatra scalatra-parent_2.7.7 - 1.2.0 + 1.2.1 pom scalatra-parent Step Project POM diff --git a/project/build/src/ScalatraProject.scala b/project/build/src/ScalatraProject.scala index 6db50e899..84ea0af0d 100644 --- a/project/build/src/ScalatraProject.scala +++ b/project/build/src/ScalatraProject.scala @@ -16,6 +16,7 @@ class ScalatraProject(info: ProjectInfo) extends ParentProject(info) val jettytester = jettyGroupId % "jetty-servlet-tester" % jettyVersion % "provided" val servletApi = "org.mortbay.jetty" % "servlet-api" % "2.5-20081211" % "provided" val scalatest = "org.scalatest" % "scalatest" % "1.0" % "test" + val junit = "junit" % "junit" % "4.8.1" % "test" override def pomPostProcess(pom: Node) = @@ -58,6 +59,7 @@ class ScalatraProject(info: ProjectInfo) extends ParentProject(info) lazy val core = project("core", "scalatra", new CoreProject(_)) class CoreProject(info: ProjectInfo) extends DefaultProject(info) with ScalatraSubProject { override val scalatest = "org.scalatest" % "scalatest" % "1.0" % "provided" + override val junit = "junit" % "junit" % "4.8.1" % "provided" val mockito = "org.mockito" % "mockito-core" % "1.8.2" % "test" val description = "The core Scalatra library" } From ef6b7150d39381f05ac15b05aa520783f1dc3c88 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Sat, 17 Jul 2010 23:44:37 -0400 Subject: [PATCH 5/7] Create a *-sources.jar for each submodule. --- core/pom.xml | 32 ++++++++++++------------- example/pom.xml | 24 +++++++++---------- pom.xml | 11 +++++++++ project/build/src/ScalatraProject.scala | 12 ++++++++++ 4 files changed, 51 insertions(+), 28 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 0ac0791ed..ea46b694b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -14,16 +14,16 @@ The core Scalatra library - org.scalatest - scalatest - 1.0 + junit + junit + 4.8.1 provided - org.mortbay.jetty - jetty-servlet-tester - 6.1.22 - provided + org.scala-tools.sbt + test-compat_2.7.7 + 0.4.1 + test org.mockito @@ -32,22 +32,22 @@ test - junit - junit - 4.8.1 + org.scalatest + scalatest + 1.0 provided org.mortbay.jetty - servlet-api - 2.5-20081211 + jetty-servlet-tester + 6.1.22 provided - org.scala-tools.sbt - test-compat_2.7.7 - 0.4.1 - test + org.mortbay.jetty + servlet-api + 2.5-20081211 + provided org.scala-lang diff --git a/example/pom.xml b/example/pom.xml index afedf7581..e827c77f5 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -13,12 +13,24 @@ scalatra-example An example Scalatra application + + org.scala-tools.sbt + test-compat_2.7.7 + 0.4.1 + test + junit junit 4.8.1 test + + org.mortbay.jetty + jetty + 6.1.22 + test + org.mortbay.jetty jetty-servlet-tester @@ -31,24 +43,12 @@ 1.0 test - - org.mortbay.jetty - jetty - 6.1.22 - test - org.mortbay.jetty servlet-api 2.5-20081211 provided - - org.scala-tools.sbt - test-compat_2.7.7 - 0.4.1 - test - org.scalatra scalatra_2.7.7 diff --git a/pom.xml b/pom.xml index ab296f174..7ff84af1e 100644 --- a/pom.xml +++ b/pom.xml @@ -118,6 +118,17 @@ + + maven-source-plugin + + + attach-sources + + jar + + + + diff --git a/project/build/src/ScalatraProject.scala b/project/build/src/ScalatraProject.scala index 84ea0af0d..804f4b31b 100644 --- a/project/build/src/ScalatraProject.scala +++ b/project/build/src/ScalatraProject.scala @@ -206,6 +206,18 @@ class ScalatraProject(info: ProjectInfo) extends ParentProject(info) + + + maven-source-plugin + + + attach-sources + + jar + + + + From 1a09d2166f7911244ef5682bfedd019939a3948a Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Sun, 18 Jul 2010 00:07:11 -0400 Subject: [PATCH 6/7] Configure maven-jetty-plugin for example module. --- core/pom.xml | 26 ++++++++++++------------- example/pom.xml | 17 ++++++++++------ project/build/src/ScalatraProject.scala | 8 ++++++++ 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index ea46b694b..3984d9b55 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -13,12 +13,6 @@ scalatra The core Scalatra library - - junit - junit - 4.8.1 - provided - org.scala-tools.sbt test-compat_2.7.7 @@ -26,10 +20,10 @@ test - org.mockito - mockito-core - 1.8.2 - test + org.mortbay.jetty + jetty-servlet-tester + 6.1.22 + provided org.scalatest @@ -38,9 +32,15 @@ provided - org.mortbay.jetty - jetty-servlet-tester - 6.1.22 + org.mockito + mockito-core + 1.8.2 + test + + + junit + junit + 4.8.1 provided diff --git a/example/pom.xml b/example/pom.xml index e827c77f5..2d1fb85f2 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -26,9 +26,9 @@ test - org.mortbay.jetty - jetty - 6.1.22 + org.scalatest + scalatest + 1.0 test @@ -38,9 +38,9 @@ provided - org.scalatest - scalatest - 1.0 + org.mortbay.jetty + jetty + 6.1.22 test @@ -71,6 +71,11 @@ true + + org.mortbay.jetty + maven-jetty-plugin + 6.1.22 + \ No newline at end of file diff --git a/project/build/src/ScalatraProject.scala b/project/build/src/ScalatraProject.scala index 804f4b31b..41ecad24f 100644 --- a/project/build/src/ScalatraProject.scala +++ b/project/build/src/ScalatraProject.scala @@ -12,6 +12,7 @@ class ScalatraProject(info: ProjectInfo) extends ParentProject(info) trait ScalatraSubProject extends BasicManagedProject { def description: String def skipDeploy: Boolean = false + def extraPlugins: NodeSeq = Seq.empty val jettytester = jettyGroupId % "jetty-servlet-tester" % jettyVersion % "provided" val servletApi = "org.mortbay.jetty" % "servlet-api" % "2.5-20081211" % "provided" @@ -43,6 +44,7 @@ class ScalatraProject(info: ProjectInfo) extends ParentProject(info) {skipDeploy} + {extraPlugins} @@ -69,6 +71,12 @@ class ScalatraProject(info: ProjectInfo) extends ParentProject(info) val jetty6 = jettyGroupId % "jetty" % jettyVersion % "test" val description = "An example Scalatra application" override val skipDeploy = true // Do not deploy to Maven repo + override val extraPlugins = + + org.mortbay.jetty + maven-jetty-plugin + {jettyVersion} + } val scalaToolsSnapshots = "Scala-Tools Maven2 Snapshots Repository" at "http://scala-tools.org/repo-snapshots" From 8308665c707917a8d248b95e8a828c6191efed48 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Sun, 18 Jul 2010 00:23:20 -0400 Subject: [PATCH 7/7] Link to Maven repositories. --- README.markdown | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.markdown b/README.markdown index 6b0cf3a99..e6c1b55ed 100644 --- a/README.markdown +++ b/README.markdown @@ -105,6 +105,14 @@ Quick Start You should see "Hello world." You can poke around the example code in example/src/main/scala/TemplateExample.scala to see what's going on. +Maven Repository +================ + +To make usage of Scalatra as a dependency convenient, Maven hosting is now available courtesy of [Sonatype](https://docs.sonatype.com/display/NX/OSS+Repository+Hosting). + +* [Releases](https://oss.sonatype.org/content/repositories/releases) +* [Snapshots](https://oss.sonatype.org/content/repositories/snapshots) + Supported Methods =================