Return-Path: 
 <chukwa-commits-return-775-apmail-incubator-chukwa-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-chukwa-commits-archive@www.apache.org
Delivered-To: apmail-incubator-chukwa-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id F1C2DDDAC
	for <apmail-incubator-chukwa-commits-archive@www.apache.org>;
 Mon,  9 Jul 2012 00:04:45 +0000 (UTC)
Received: (qmail 12939 invoked by uid 500); 9 Jul 2012 00:04:45 -0000
Delivered-To: apmail-incubator-chukwa-commits-archive@incubator.apache.org
Received: (qmail 12916 invoked by uid 500); 9 Jul 2012 00:04:45 -0000
Mailing-List: contact chukwa-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:chukwa-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:chukwa-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:chukwa-commits@incubator.apache.org>
List-Id: <chukwa-commits.incubator.apache.org>
Reply-To: chukwa-dev@incubator.apache.org
Delivered-To: mailing list chukwa-commits@incubator.apache.org
Received: (qmail 12906 invoked by uid 99); 9 Jul 2012 00:04:45 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2012 00:04:45 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2012 00:04:44 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 2E9902388860;
	Mon,  9 Jul 2012 00:04:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1358883 - in /incubator/chukwa/trunk: CHANGES.txt
 lib/jsr311-api-1.0.jar pom.xml
 src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java
Date: Mon, 09 Jul 2012 00:04:25 -0000
To: chukwa-commits@incubator.apache.org
From: eyang@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120709000425.2E9902388860@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: eyang
Date: Mon Jul  9 00:04:24 2012
New Revision: 1358883

URL: http://svn.apache.org/viewvc?rev=1358883&view=rev
Log:
CHUKWA-645. Updated Hadoop and HBase dependency. (Eric Yang)

Removed:
    incubator/chukwa/trunk/lib/jsr311-api-1.0.jar
Modified:
    incubator/chukwa/trunk/CHANGES.txt
    incubator/chukwa/trunk/pom.xml
    incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java

Modified: incubator/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/CHANGES.txt?rev=1358883&r1=1358882&r2=1358883&view=diff
==============================================================================
--- incubator/chukwa/trunk/CHANGES.txt (original)
+++ incubator/chukwa/trunk/CHANGES.txt Mon Jul  9 00:04:24 2012
@@ -6,6 +6,8 @@ Trunk (unreleased changes)
 
   IMPROVEMENTS
 
+    CHUKWA-645. Updated Hadoop and HBase dependency. (Eric Yang)
+
     CHUKWA-630. Added chukwa user setup to rpm package. (Noel Duffy via Eric Yang)
 
     CHUKWA-639. Updated to HBase 0.92.1. (Eric Yang)

Modified: incubator/chukwa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/pom.xml?rev=1358883&r1=1358882&r2=1358883&view=diff
==============================================================================
--- incubator/chukwa/trunk/pom.xml (original)
+++ incubator/chukwa/trunk/pom.xml Mon Jul  9 00:04:24 2012
@@ -196,11 +196,6 @@
             <artifactId>commons-beanutils</artifactId>
             <version>1.8.0</version>
           </dependency>
-<!--          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>jasper</artifactId>
-            <version>6.0.33</version>
-          </dependency> -->
           <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
@@ -227,6 +222,11 @@
             <version>2.0.8</version>
           </dependency>
           <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>3.3.1</version>
+          </dependency>
+          <dependency>
             <groupId>jdiff</groupId>
             <artifactId>jdiff</artifactId>
             <version>1.0.9</version>
@@ -244,8 +244,7 @@
           <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase</artifactId>
-            <version>0.92.1</version>
-            <scope>compile</scope>
+            <version>0.94.0</version>
             <exclusions>
               <exclusion>
                 <groupId>com.sun.jersey</groupId>
@@ -259,28 +258,22 @@
                 <groupId>com.sun.jersey</groupId>
                 <artifactId>jersey-json</artifactId>
               </exclusion>
+              <exclusion>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>jasper-compiler</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>jasper-runtime</artifactId>
+              </exclusion>
             </exclusions>
           </dependency>
           <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase</artifactId>
             <classifier>tests</classifier>
-            <version>0.92.1</version>
-            <scope>compile</scope>
-            <exclusions>
-              <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-server</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-core</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-json</artifactId>
-              </exclusion>
-            </exclusions>
+            <version>0.94.0</version>
+            <scope>test</scope>
           </dependency>
           <dependency>
             <groupId>org.apache.hadoop</groupId>
@@ -295,12 +288,18 @@
           <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-bundle</artifactId>
-            <version>1.10</version>
+            <version>1.4</version>
           </dependency>
           <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>10.0.1</version>
+            <exclusions>
+              <exclusion>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+              </exclusion>
+            </exclusions>
           </dependency>
           <dependency>
             <groupId>com.googlecode.json-simple</groupId>
@@ -310,12 +309,22 @@
           <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-core</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.3</version>
+            <exclusions>
+              <exclusion>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>jasper-compiler</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>jasper-runtime</artifactId>
+              </exclusion>
+            </exclusions>
           </dependency>
           <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-test</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.3</version>
           </dependency>
     </dependencies>
 

Modified: incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java?rev=1358883&r1=1358882&r2=1358883&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java (original)
+++ incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java Mon Jul  9 00:04:24 2012
@@ -96,7 +96,7 @@ public class TestHBaseWriter extends Tes
       if(hbw.add(chunks)!=ChukwaWriter.COMMIT_OK) {
         Assert.fail("Commit status is not OK.");
       }
-      HTable testTable = new HTable(table);
+      HTable testTable = new HTable(conf, table);
       ResultScanner scanner = testTable.getScanner(columnFamily, qualifier);
       for(Result res : scanner) {
         Assert.assertEquals(new String(expectedValue), new String(res.getValue(columnFamily, qualifier)));