hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject svn commit: r949921 - in /hbase/trunk: CHANGES.txt pom.xml
Date Tue, 01 Jun 2010 04:01:06 GMT
Author: apurtell
Date: Tue Jun  1 04:01:06 2010
New Revision: 949921

URL: http://svn.apache.org/viewvc?rev=949921&view=rev
Log:
HBASE-2636 Upgrade Jetty to 6.1.24

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/pom.xml

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=949921&r1=949920&r2=949921&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Jun  1 04:01:06 2010
@@ -653,6 +653,7 @@ Release 0.21.0 - Unreleased
                and over for same region
    HBASE-2630  HFile should use toStringBinary in various places
    HBASE-2632  Shell should autodetect terminal width
+   HBASE-2636  Upgrade Jetty to 6.1.24
 
   NEW FEATURES
    HBASE-1961  HBase EC2 scripts

Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=949921&r1=949920&r2=949921&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Tue Jun  1 04:01:06 2010
@@ -430,7 +430,8 @@
 
     <commons-cli.version>1.2</commons-cli.version>
     <commons-logging.version>1.1.1</commons-logging.version>
-    <jetty.version>6.1.14</jetty.version>
+    <jetty.version>6.1.24</jetty.version>
+    <jetty.jspapi.version>6.1.14</jetty.jspapi.version>
     <junit.version>4.8.1</junit.version>
     <log4j.version>1.2.15</log4j.version>
     <zookeeper.version>3.3.1</zookeeper.version>
@@ -512,7 +513,7 @@
       <dependency>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>servlet-api-2.5</artifactId>
-        <version>${jetty.version}</version>
+        <version>${jetty.jspapi.version}</version>
       </dependency>
 
       <!-- Test dependencies -->
@@ -618,12 +619,12 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1</artifactId>
-      <version>${jetty.version}</version>
+      <version>${jetty.jspapi.version}</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1</artifactId>
-      <version>${jetty.version}</version>
+      <version>${jetty.jspapi.version}</version>
     </dependency>
     <dependency>
       <groupId>tomcat</groupId>



Mime
View raw message