Merge branch 'release/0.0.9'

dropwizard · Aug 12, 2011 · ce084bc · ce084bc
2 parents b08af67 + ee67ded
commit ce084bc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.yammer</groupId>
     <artifactId>dropwizard_2.9.0-1</artifactId>
-    <version>0.0.8</version>
+    <version>0.0.9</version>
     <name>Dropwizard for Scala ${scala.version}</name>
 
     <properties>
@@ -89,7 +89,7 @@
         <dependency>
             <groupId>com.codahale</groupId>
             <artifactId>jersey-scala_${scala.version}</artifactId>
-            <version>0.1.7</version>
+            <version>0.1.8</version>
         </dependency>
         <dependency>
             <groupId>com.codahale</groupId>
@@ -99,12 +99,12 @@
         <dependency>
             <groupId>com.codahale</groupId>
             <artifactId>jerkson_${scala.version}</artifactId>
-            <version>0.3.2</version>
+            <version>0.4.0</version>
         </dependency>
         <dependency>
             <groupId>com.codahale</groupId>
             <artifactId>fig_${scala.version}</artifactId>
-            <version>1.1.5</version>
+            <version>1.1.6</version>
         </dependency>
         <dependency>
             <groupId>com.yammer.metrics</groupId>
@@ -156,11 +156,6 @@
             <artifactId>jetty-servlet</artifactId>
             <version>7.4.1.v20110513</version>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlets</artifactId>
-            <version>7.4.1.v20110513</version>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
@@ -169,7 +164,7 @@
         <dependency>
             <groupId>com.codahale</groupId>
             <artifactId>simplespec_${scala.version}</artifactId>
-            <version>0.3.4</version>
+            <version>0.4.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/pom_2.8.1.xml b/pom_2.8.1.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.yammer</groupId>
     <artifactId>dropwizard_2.8.1</artifactId>
-    <version>0.0.8</version>
+    <version>0.0.9</version>
     <name>Dropwizard for Scala ${scala.version}</name>
 
     <properties>
@@ -89,7 +89,7 @@
         <dependency>
             <groupId>com.codahale</groupId>
             <artifactId>jersey-scala_${scala.version}</artifactId>
-            <version>0.1.7</version>
+            <version>0.1.8</version>
         </dependency>
         <dependency>
             <groupId>com.codahale</groupId>
@@ -99,12 +99,12 @@
         <dependency>
             <groupId>com.codahale</groupId>
             <artifactId>jerkson_${scala.version}</artifactId>
-            <version>0.3.2</version>
+            <version>0.4.0</version>
         </dependency>
         <dependency>
             <groupId>com.codahale</groupId>
             <artifactId>fig_${scala.version}</artifactId>
-            <version>1.1.5</version>
+            <version>1.1.6</version>
         </dependency>
         <dependency>
             <groupId>com.yammer.metrics</groupId>
@@ -156,11 +156,6 @@
             <artifactId>jetty-servlet</artifactId>
             <version>7.4.1.v20110513</version>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlets</artifactId>
-            <version>7.4.1.v20110513</version>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
@@ -169,7 +164,7 @@
         <dependency>
             <groupId>com.codahale</groupId>
             <artifactId>simplespec_${scala.version}</artifactId>
-            <version>0.3.4</version>
+            <version>0.4.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/scala/com/yammer/dropwizard/tasks/TaskServlet.scala b/src/main/scala/com/yammer/dropwizard/tasks/TaskServlet.scala
@@ -10,6 +10,7 @@ class TaskServlet(tasks: Set[Task]) extends HttpServlet with Logging {
     tasksByName.get(req.getPathInfo) match {
       case Some(task) => {
         try {
+          resp.setContentType("text/plain")
           val output = resp.getWriter
           task.execute(params(req), output)
           output.close()