hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1004093 - in /hbase/trunk: ./ src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/ src/main/java/org/apache/hadoop/hbase/client/ src/main/java/org/apache/hadoop/hbase/regionserver/wal/
Date Mon, 04 Oct 2010 03:19:28 GMT
Author: stack
Date: Mon Oct  4 03:19:26 2010
New Revision: 1004093

URL: http://svn.apache.org/viewvc?rev=1004093&view=rev
Log:
HBASE-2996 Fix and clean up Maven

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/pom.xml
    hbase/trunk/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java
    hbase/trunk/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/SampleUploader.java
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/package-info.java
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1004093&r1=1004092&r2=1004093&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Mon Oct  4 03:19:26 2010
@@ -969,6 +969,7 @@ Release 0.21.0 - Unreleased
                new master
    HBASE-2825  Scans respect row locks
    HBASE-3070  Add to hbaseadmin means of shutting down a regionserver
+   HBASE-2996  Fix and clean up Maven
 
   NEW FEATURES
    HBASE-1961  HBase EC2 scripts

Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1004093&r1=1004092&r2=1004093&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Mon Oct  4 03:19:26 2010
@@ -2,32 +2,26 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>7</version>
+  </parent>
+
   <groupId>org.apache.hbase</groupId>
   <artifactId>hbase</artifactId>
   <packaging>jar</packaging>
-  <version>${hbase.version}</version>
+  <version>0.89.0-SNAPSHOT</version>
   <name>HBase</name>
   <description>
-  HBase is the &amp;lt;a href="http://hadoop.apache.org"&amp;rt;Hadoop&lt;/a&amp;rt;
database. Use it when you need random, realtime read/write access to your Big Data.
+    HBase is the &amp;lt;a href="http://hadoop.apache.org"&amp;rt;Hadoop&lt;/a&amp;rt;
database. Use it when you need
+    random, realtime read/write access to your Big Data.
     This project's goal is the hosting of very large tables -- billions of rows X millions
of columns -- atop clusters
     of commodity hardware.
   </description>
   <url>http://hbase.apache.org</url>
 
-  <licenses>
-    <license>
-      <name>Apache 2</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-      <comments>A business-friendly OSS license</comments>
-    </license>
-  </licenses>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org</url>
-  </organization>
-
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/hbase/trunk</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/hbase/trunk</developerConnection>
@@ -36,12 +30,12 @@
 
   <issueManagement>
     <system>JIRA</system>
-    <url>http://issues.apache.org/jira/</url>
+    <url>http://issues.apache.org/jira/browse/HBASE</url>
   </issueManagement>
 
   <ciManagement>
     <system>hudson</system>
-    <url>http://hudson.zones.apache.org/hudson/view/HBase/</url>
+    <url>http://hudson.zones.apache.org/hudson/view/HBase/job/HBase-TRUNK/</url>
   </ciManagement>
 
   <mailingLists>
@@ -103,8 +97,8 @@
       <name>Jonathan Gray</name>
       <email>jgray@streamy.com</email>
       <timezone>-8</timezone>
-      <organization>Streamy</organization>
-      <organizationUrl>http://www.streamy.com</organizationUrl>
+      <organization>Facebook</organization>
+      <organizationUrl>http://www.facebook.com</organizationUrl>
     </developer>
     <developer>
       <id>larsgeorge</id>
@@ -142,11 +136,11 @@
 
   <repositories>
     <repository>
-      <id>mirror.facebook.net</id>
-      <name>facebook mirror</name>
-      <url>http://mirror.facebook.net/maven/repository/</url>
+      <id>temp-hadoop</id>
+      <name>Hadoop 0.20.1/2 packaging, thrift, zk</name>
+      <url>http://people.apache.org/~rawson/repo/</url>
       <snapshots>
-        <enabled>true</enabled>
+        <enabled>false</enabled>
       </snapshots>
       <releases>
         <enabled>true</enabled>
@@ -164,17 +158,6 @@
       </releases>
     </repository>
     <repository>
-      <id>googlecode</id>
-      <name>Google Code</name>
-      <url>http://google-maven-repository.googlecode.com/svn/repository/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
       <id>codehaus</id>
       <name>Codehaus Public</name>
       <url>http://repository.codehaus.org/</url>
@@ -185,31 +168,8 @@
         <enabled>true</enabled>
       </releases>
     </repository>
-    <repository>
-      <id>temp-hadoop</id>
-      <name>Hadoop 0.20.1/2 packaging, thrift, zk</name>
-      <url>http://people.apache.org/~rawson/repo/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>ibiblio.org</id>
-      <name>ibiblio mirror</name>
-      <url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
   </repositories>
 
-
   <build>
     <!-- Some plugins (javadoc for example) can be used in the normal build- and the site
phase.
          These plugins inherit their options from the <reporting> section below. These
settings
@@ -218,7 +178,6 @@
       <plugins>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.1</version>
           <configuration>
             <source>${compileSource}</source>
             <target>${compileSource}</target>
@@ -227,20 +186,7 @@
           </configuration>
         </plugin>
         <plugin>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2-beta-5</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.3</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.1.1</version>
-        </plugin>
-        <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.5</version>
           <configuration>
             <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
             <argLine>-Xmx512m</argLine>
@@ -248,25 +194,21 @@
           </configuration>
         </plugin>
         <plugin>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.6.1</version>
-        </plugin>
-        <plugin>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>2.4</version>
-            <configuration>
-              <filesets>
-                <fileset>
-                  <!--dfs tests have build dir hardcoded. Clean it as part of
-                      clean target-->
-                  <directory>build</directory>
-                </fileset>
-              </filesets>
-            </configuration>
+          <configuration>
+            <filesets>
+              <fileset>
+                <!--dfs tests have build dir hardcoded. Clean it as part of
+               clean target-->
+                <directory>build</directory>
+              </fileset>
+            </filesets>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
+          <version>0.6</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -279,18 +221,18 @@
         </includes>
       </resource>
       <resource>
-          <directory>${project.build.directory}</directory>
+        <directory>${project.build.directory}</directory>
         <includes>
-            <include>hbase-webapps/**</include>
+          <include>hbase-webapps/**</include>
         </includes>
       </resource>
     </resources>
 
     <plugins>
       <plugin>
-          <groupId>com.agilejava.docbkx</groupId>
-          <artifactId>docbkx-maven-plugin</artifactId>
-          <version>2.0.11</version>
+        <groupId>com.agilejava.docbkx</groupId>
+        <artifactId>docbkx-maven-plugin</artifactId>
+        <version>2.0.11</version>
         <executions>
           <execution>
             <goals>
@@ -312,25 +254,11 @@
           <xincludeSupported>true</xincludeSupported>
           <chunkedOutput>true</chunkedOutput>
           <useIdAsFilename>true</useIdAsFilename>
-          <targetDirectory>
-
-          ${basedir}/target/site/
-
-          </targetDirectory>
+          <targetDirectory>${basedir}/target/site/</targetDirectory>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <!-- THIS might not be doable
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-        -->
         <configuration>
           <tarLongFileMode>gnu</tarLongFileMode>
           <descriptors>
@@ -400,18 +328,18 @@
             <configuration>
               <tasks>
                 <property name="build.webapps"
-                  location="${project.build.directory}/hbase-webapps" />
+                          location="${project.build.directory}/hbase-webapps"/>
                 <property name="src.webapps"
-                  location="${basedir}/src/main/resources/hbase-webapps" />
+                          location="${basedir}/src/main/resources/hbase-webapps"/>
                 <property name="generated.sources"
-                  location="${project.build.directory}/generated-sources" />
+                          location="${project.build.directory}/generated-sources"/>
 
                 <mkdir dir="${build.webapps}"/>
                 <copy todir="${build.webapps}">
                   <fileset dir="${src.webapps}">
-                    <exclude name="**/*.jsp" />
-                    <exclude name="**/.*" />
-                    <exclude name="**/*~" />
+                    <exclude name="**/*.jsp"/>
+                    <exclude name="**/.*"/>
+                    <exclude name="**/*~"/>
                   </fileset>
                 </copy>
 
@@ -420,19 +348,19 @@
 
                 <mkdir dir="${build.webapps}/master/WEB-INF"/>
                 <jspcompiler uriroot="${src.webapps}/master"
-                    outputdir="${generated.sources}"
-                  package="org.apache.hadoop.hbase.generated.master"
-                  webxml="${build.webapps}/master/WEB-INF/web.xml"/>
+                             outputdir="${generated.sources}"
+                             package="org.apache.hadoop.hbase.generated.master"
+                             webxml="${build.webapps}/master/WEB-INF/web.xml"/>
 
                 <mkdir dir="${build.webapps}/regionserver/WEB-INF"/>
                 <jspcompiler uriroot="${src.webapps}/regionserver"
-                    outputdir="${generated.sources}"
-                  package="org.apache.hadoop.hbase.generated.regionserver"
-                  webxml="${build.webapps}/regionserver/WEB-INF/web.xml"/>
-
-                <exec executable="sh">
-                    <arg line="${basedir}/src/saveVersion.sh ${project.version} ${generated.sources}"/>
-                </exec>
+                             outputdir="${generated.sources}"
+                             package="org.apache.hadoop.hbase.generated.regionserver"
+                             webxml="${build.webapps}/regionserver/WEB-INF/web.xml"/>
+
+                <!--<exec executable="sh">
+                  <arg line="${basedir}/src/saveVersion.sh ${project.version} ${generated.sources}"/>
+                </exec>-->
               </tasks>
             </configuration>
             <goals>
@@ -444,6 +372,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.5</version>
         <executions>
           <execution>
             <id>add-jspc-source</id>
@@ -476,125 +405,63 @@
 
   <properties>
     <compileSource>1.6</compileSource>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <hbase.version>0.89.0-SNAPSHOT</hbase.version>
-    <hadoop.version>0.20.3-append-r964955-1240</hadoop.version>
 
+    <!-- Dependencies -->
+    <avro.version>1.3.3</avro.version>
     <commons-cli.version>1.2</commons-cli.version>
-    <commons-logging.version>1.1.1</commons-logging.version>
-    <jetty.version>6.1.24</jetty.version>
-    <jetty.jspapi.version>6.1.14</jetty.jspapi.version>
-    <junit.version>4.8.1</junit.version>
-    <mockito-all.version>1.8.4</mockito-all.version>
-    <log4j.version>1.2.15</log4j.version>
-    <zookeeper.version>3.3.1</zookeeper.version>
-
-    <commons-httpclient.version>3.1</commons-httpclient.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>
+    <commons-logging.version>1.1.1</commons-logging.version>
     <commons-math.version>2.1</commons-math.version>
+    <guava.version>r06</guava.version>
+    <hadoop.version>0.20.3-append-r964955-1240</hadoop.version>
     <jasper.version>5.5.23</jasper.version>
     <jaxb-api.version>2.1</jaxb-api.version>
-    <jersey.version>1.1.5.1</jersey.version>
-    <jruby.version>1.4.0</jruby.version>
+    <jetty.version>6.1.25</jetty.version>
+    <jetty.jspapi.version>6.1.14</jetty.jspapi.version>
+    <jersey.version>1.4</jersey.version>
+    <jruby.version>1.5.2</jruby.version>
     <jsr311.version>1.1.1</jsr311.version>
+    <junit.version>4.8.1</junit.version>
+    <log4j.version>1.2.16</log4j.version>
+    <mockito-all.version>1.8.5</mockito-all.version>
     <protobuf.version>2.3.0</protobuf.version>
-    <slf4j.version>1.5.8</slf4j.version>
-    <stax-api>1.0.1</stax-api>
-    <thrift.version>0.2.0</thrift.version>
-    <guava.version>r05</guava.version>
+    <slf4j.version>1.5.8</slf4j.version><!-- newer version available -->
+    <stax-api.version>1.0.1</stax-api.version>
+    <thrift.version>0.2.0</thrift.version><!-- newer version available -->
+    <zookeeper.version>3.3.1</zookeeper.version>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
-        <version>${commons-cli.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>${commons-logging.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>${log4j.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>javax.jms</groupId>
-            <artifactId>jms</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>com.sun.jmx</groupId>
-            <artifactId>jmxri</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>com.sun.jdmk</groupId>
-            <artifactId>jmxtools</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-core</artifactId>
-        <version>${hadoop.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>hbase</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>hbase</artifactId>
-        <version>${project.version}</version>
-        <classifier>tests</classifier>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>zookeeper</artifactId>
-        <version>${zookeeper.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>servlet-api-2.5</artifactId>
-        <version>${jetty.jspapi.version}</version>
-      </dependency>
-
-      <!-- Test dependencies -->
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-test</artifactId>
-        <version>${hadoop.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-all</artifactId>
-        <version>${mockito-all.version}</version>
-        <scope>test</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+  <!-- Sorted by groups of dependencies then groupId and artifactId -->
   <dependencies>
+    <!--
+      Note: There are a few exclusions to prevent duplicate code in different jars to be
included:
+        * org.mortbay.jetty:servlet-api, javax.servlet:servlet-api: These are excluded because
they are
+          the same implementations. I chose org.mortbay.jetty:servlet-api-2.5 instead, which
is a third
+          implementation of the same, because Hadoop also uses this version
+        * javax.servlet:jsp-api in favour of org.mortbay.jetty:jsp-api-2.1
+        * javax.xml.stream:stax-api in favour of stax:stax-api
+
+      Note: Both org.apache.avro:avro and com.sun.jersey:jersey-json depend on Jackson so
the version
+        is chosen which comes first in the list of dependencies (jersey in this case)
+    -->
+
+    <!-- General dependencies -->
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>${guava.version}</version>
+    </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
+      <version>${commons-cli.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>${commons-codec.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
@@ -609,10 +476,27 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
+      <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>avro</artifactId>
+      <version>${avro.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-core</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>zookeeper</artifactId>
+      <version>${zookeeper.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>
@@ -626,37 +510,20 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4j.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>${slf4j.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>${guava.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>zookeeper</artifactId>
+      <groupId>org.jruby</groupId>
+      <artifactId>jruby-complete</artifactId>
+      <version>${jruby.version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
       <version>${jetty.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
@@ -665,22 +532,29 @@
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
-      <artifactId>servlet-api-2.5</artifactId>
+      <artifactId>jsp-2.1</artifactId>
+      <version>${jetty.jspapi.version}</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-2.1</artifactId>
+      <artifactId>jsp-api-2.1</artifactId>
       <version>${jetty.jspapi.version}</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
+      <artifactId>servlet-api-2.5</artifactId>
       <version>${jetty.jspapi.version}</version>
     </dependency>
     <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jasper-runtime</artifactId>
-      <version>${jasper.version}</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <!--If this is not in the runtime lib, we get odd
@@ -692,12 +566,29 @@
       <groupId>tomcat</groupId>
       <artifactId>jasper-compiler</artifactId>
       <version>${jasper.version}</version>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
-
     <dependency>
-      <groupId>org.jruby</groupId>
-      <artifactId>jruby-complete</artifactId>
-      <version>${jruby.version}</version>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-runtime</artifactId>
+      <version>${jasper.version}</version>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- REST dependencies -->
@@ -722,56 +613,39 @@
       <version>${jersey.version}</version>
     </dependency>
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>${jaxb-api.version}</version>
-    </dependency>
-    <dependency>
       <groupId>javax.ws.rs</groupId>
       <artifactId>jsr311-api</artifactId>
       <version>${jsr311.version}</version>
     </dependency>
     <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax-api</artifactId>
-      <version>1.0.1</version>
-    </dependency>
-
-    <!-- Avro dependencies -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>${slf4j.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>avro</artifactId>
-      <version>1.3.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4j.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-      <version>1.5.2</version>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-api.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.stream</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>1.5.2</version>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+      <version>${stax-api.version}</version>
     </dependency>
 
     <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
+      <version>${mockito-all.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -779,15 +653,12 @@
       <version>${commons-math.version}</version>
       <scope>test</scope>
     </dependency>
-     <dependency>
+    <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-test</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>${guava.version}</version>
-   </dependency>
   </dependencies>
 
   <!--
@@ -816,17 +687,8 @@
 
   -->
   <distributionManagement>
-    <repository>
-      <id>apache.releases.https</id>
-      <name>Apache Release Distribution Repository</name>
-      <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
-    </repository>
-    <snapshotRepository>
-      <id>apache.snapshots.https</id>
-      <name>Apache Development Snapshot Repository</name>
-      <url>https://repository.apache.org/content/repositories/snapshots</url>
-    </snapshotRepository>
     <!-- Private Site Repository -->
+    <!-- TODO -->
     <site>
       <id>HBase Site</id>
       <url>scp://people.apache.org/home/psmith/public_html/hbase/sandbox/hbase/</url>

Modified: hbase/trunk/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java?rev=1004093&r1=1004092&r2=1004093&view=diff
==============================================================================
--- hbase/trunk/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java
(original)
+++ hbase/trunk/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java
Mon Oct  4 03:19:26 2010
@@ -141,7 +141,7 @@ public class IndexBuilder {
   }
 
   public static void main(String[] args) throws Exception {
-    HBaseConfiguration conf = new HBaseConfiguration();
+    Configuration conf = HBaseConfiguration.create();
     String[] otherArgs = new GenericOptionsParser(conf, args).getRemainingArgs();
     if(otherArgs.length < 3) {
       System.err.println("Only " + otherArgs.length + " arguments supplied, required: 3");

Modified: hbase/trunk/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/SampleUploader.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/SampleUploader.java?rev=1004093&r1=1004092&r2=1004093&view=diff
==============================================================================
--- hbase/trunk/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/SampleUploader.java
(original)
+++ hbase/trunk/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/SampleUploader.java
Mon Oct  4 03:19:26 2010
@@ -135,7 +135,7 @@ public class SampleUploader {
    * @throws Exception When running the job fails.
    */
   public static void main(String[] args) throws Exception {
-    HBaseConfiguration conf = new HBaseConfiguration();
+    Configuration conf = HBaseConfiguration.create();
     String[] otherArgs = new GenericOptionsParser(conf, args).getRemainingArgs();
     if(otherArgs.length != 2) {
       System.err.println("Wrong number of arguments: " + otherArgs.length);
@@ -145,4 +145,4 @@ public class SampleUploader {
     Job job = configureJob(conf, otherArgs);
     System.exit(job.waitForCompletion(true) ? 0 : 1);
   }
-}
\ No newline at end of file
+}

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/package-info.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/package-info.java?rev=1004093&r1=1004092&r2=1004093&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/package-info.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/package-info.java Mon Oct  4
03:19:26 2010
@@ -86,7 +86,7 @@ public class MyLittleHBaseClient {
     // When you create a HBaseConfiguration, it reads in whatever you've set
     // into your hbase-site.xml and in hbase-default.xml, as long as these can
     // be found on the CLASSPATH
-    HBaseConfiguration config = new HBaseConfiguration();
+    Configuration config = HBaseConfiguration.create();
 
     // This instantiates an HTable object that connects you to
     // the "myLittleHBaseTable" table.

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java?rev=1004093&r1=1004092&r2=1004093&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java Mon
Oct  4 03:19:26 2010
@@ -45,7 +45,6 @@ import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.RemoteExceptionHandler;
 import org.apache.hadoop.hbase.regionserver.HRegion;
@@ -55,7 +54,6 @@ import org.apache.hadoop.hbase.regionser
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.FSUtils;
 
-import com.google.common.util.concurrent.NamingThreadFactory;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 /**



Mime
View raw message