You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by to...@apache.org on 2011/03/03 23:11:15 UTC

svn commit: r1076829 - in /hbase/branches/0.90: ./ src/ src/assembly/ src/main/java/ src/main/javadoc/ src/main/javadoc/org/apache/hadoop/hbase/io/hfile/ src/main/javadoc/org/apache/hadoop/hbase/ipc/ src/main/javadoc/org/apache/hadoop/hbase/thrift/ src...

Author: todd
Date: Thu Mar  3 22:11:15 2011
New Revision: 1076829

URL: http://svn.apache.org/viewvc?rev=1076829&view=rev
Log:
Revert HBASE-3525 due to HBASE-3594 - rest server failing because of missing asm jar

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/pom.xml
    hbase/branches/0.90/src/assembly/all.xml   (contents, props changed)
    hbase/branches/0.90/src/main/java/   (props changed)
    hbase/branches/0.90/src/main/javadoc/org/apache/hadoop/hbase/io/hfile/package.html   (props changed)
    hbase/branches/0.90/src/main/javadoc/org/apache/hadoop/hbase/ipc/package.html   (props changed)
    hbase/branches/0.90/src/main/javadoc/org/apache/hadoop/hbase/thrift/doc-files/Hbase.html   (props changed)
    hbase/branches/0.90/src/main/javadoc/org/apache/hadoop/hbase/thrift/doc-files/index.html   (props changed)
    hbase/branches/0.90/src/main/javadoc/org/apache/hadoop/hbase/thrift/doc-files/style.css   (props changed)
    hbase/branches/0.90/src/main/javadoc/org/apache/hadoop/hbase/thrift/package.html   (props changed)
    hbase/branches/0.90/src/main/javadoc/overview.html   (props changed)
    hbase/branches/0.90/src/main/resources/hbase-default.xml   (props changed)
    hbase/branches/0.90/src/main/resources/org/apache/hadoop/hbase/mapred/RowCounter_Counters.properties   (props changed)
    hbase/branches/0.90/src/main/resources/org/apache/hadoop/hbase/mapreduce/RowCounter_Counters.properties   (props changed)
    hbase/branches/0.90/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift   (props changed)
    hbase/branches/0.90/src/saveVersion.sh   (props changed)
    hbase/branches/0.90/src/test/java/   (props changed)
    hbase/branches/0.90/src/test/resources/hbase-site.xml   (props changed)
    hbase/branches/0.90/src/test/resources/log4j.properties   (props changed)
    hbase/branches/0.90/src/test/resources/mapred-queues.xml   (props changed)
    hbase/branches/0.90/src/test/resources/org/apache/hadoop/hbase/PerformanceEvaluation_Counter.properties   (props changed)

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1076829&r1=1076828&r2=1076829&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Thu Mar  3 22:11:15 2011
@@ -52,7 +52,6 @@ Release 0.90.1 - February 9th, 2011
                aborts. Instead, should just cancel region open.
    HBASE-3517  Store build version in hbase-default.xml and verify at runtime
    HBASE-3524  NPE from CompactionChecker
-   HBASE-3525  mvn assembly is over-filling the hbase lib dir
    HBASE-3531  When under global memstore pressure, dont try to flush
                unflushable regions.
    HBASE-3550  FilterList reports false positives (Bill Graham via Andrew

Modified: hbase/branches/0.90/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/pom.xml?rev=1076829&r1=1076828&r2=1076829&view=diff
==============================================================================
--- hbase/branches/0.90/pom.xml (original)
+++ hbase/branches/0.90/pom.xml Thu Mar  3 22:11:15 2011
@@ -442,7 +442,6 @@
     <!-- Dependencies -->
     <avro.version>1.3.3</avro.version>
     <commons-cli.version>1.2</commons-cli.version>
-    <commons-el.version>1.0</commons-el.version>
     <commons-codec.version>1.4</commons-codec.version>
     <commons-httpclient.version>3.1</commons-httpclient.version><!-- pretty outdated -->
     <commons-lang.version>2.5</commons-lang.version>
@@ -493,11 +492,6 @@
       <version>${guava.version}</version>
     </dependency>
     <dependency>
-      <groupId>commons-el</groupId>
-      <artifactId>commons-el</artifactId>
-      <version>${commons-el.version}</version>
-    </dependency>
-    <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
       <version>${commons-cli.version}</version>

Modified: hbase/branches/0.90/src/assembly/all.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/assembly/all.xml?rev=1076829&r1=1076828&r2=1076829&view=diff
==============================================================================
--- hbase/branches/0.90/src/assembly/all.xml (original)
+++ hbase/branches/0.90/src/assembly/all.xml Thu Mar  3 22:11:15 2011
@@ -54,12 +54,8 @@
   <dependencySets>
     <dependencySet>
       <outputDirectory>/lib</outputDirectory>
-      <excludes>
-        <exclude>org.apache.hbase:hbase</exclude>
-      </excludes>
       <unpack>false</unpack>
       <scope>runtime</scope>
-      <useTransitiveDependencies>false</useTransitiveDependencies>
     </dependencySet>
   </dependencySets>
 </assembly>

Propchange: hbase/branches/0.90/src/assembly/all.xml
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/main/java/
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/main/javadoc/org/apache/hadoop/hbase/io/hfile/package.html
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/main/javadoc/org/apache/hadoop/hbase/ipc/package.html
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/main/javadoc/org/apache/hadoop/hbase/thrift/doc-files/Hbase.html
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/main/javadoc/org/apache/hadoop/hbase/thrift/doc-files/index.html
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/main/javadoc/org/apache/hadoop/hbase/thrift/doc-files/style.css
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/main/javadoc/org/apache/hadoop/hbase/thrift/package.html
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/main/javadoc/overview.html
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/main/resources/hbase-default.xml
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/main/resources/org/apache/hadoop/hbase/mapred/RowCounter_Counters.properties
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/main/resources/org/apache/hadoop/hbase/mapreduce/RowCounter_Counters.properties
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/saveVersion.sh
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/test/java/
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/test/resources/hbase-site.xml
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/test/resources/log4j.properties
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/test/resources/mapred-queues.xml
            ('svn:mergeinfo' removed)

Propchange: hbase/branches/0.90/src/test/resources/org/apache/hadoop/hbase/PerformanceEvaluation_Counter.properties
            ('svn:mergeinfo' removed)