diff --git a/HBASE-2099.14.patch b/HBASE-2099.14.patch
deleted file mode 100644
index 344c0212b77..00000000000
--- a/HBASE-2099.14.patch
+++ /dev/null
@@ -1,764 +0,0 @@
-Index: contrib/pom.xml
-===================================================================
---- contrib/pom.xml	(revision 0)
-+++ contrib/pom.xml	(revision 0)
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<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>
-+  <groupId>org.apache.hbase</groupId>
-+  <artifactId>hbase-contrib</artifactId>
-+  <packaging>pom</packaging>
-+  <name>HBase Contrib</name>
-+  <parent>
-+    <groupId>org.apache.hbase</groupId>
-+    <artifactId>hbase</artifactId>
-+    <version>0.20.2-SNAPSHOT</version>
-+  </parent>
-+  <modules>
-+    <module>stargate</module>
-+    <module>transactional</module>
-+  </modules>
-+  <build>
-+    <!-- TODO really all the modules in HBase probably should have a consistent directory structure -->
-+    <sourceDirectory>${basedir}/src/java</sourceDirectory>
-+    <testSourceDirectory>${basedir}/src/test/</testSourceDirectory>
-+  </build>
-+</project>
-Index: contrib/stargate/pom.xml
-===================================================================
---- contrib/stargate/pom.xml	(revision 0)
-+++ contrib/stargate/pom.xml	(revision 0)
-@@ -0,0 +1,70 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<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>
-+  <groupId>org.apache.hbase</groupId>
-+  <artifactId>hbase-contrib-stargate</artifactId>
-+  <packaging>war</packaging>
-+  <name>HBase Contrib - Stargate</name>
-+  <parent>
-+    <groupId>org.apache.hbase</groupId>
-+    <artifactId>hbase-contrib</artifactId>
-+    <version>0.20.2-SNAPSHOT</version>
-+  </parent>
-+  <properties>
-+    <jsr311.version>1.1.1</jsr311.version>
-+    <protobuf.version>2.1.0</protobuf.version>
-+    <jersey.version>1.1.4.1</jersey.version>
-+    <hadoop-hdfs.version>0.22.0-SNAPSHOT</hadoop-hdfs.version>
-+  </properties>
-+  <build>
-+    <plugins>
-+      <plugin>
-+        <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-war-plugin</artifactId>
-+        <configuration>
-+          <webXml>conf/web.xml</webXml>
-+        </configuration>
-+      </plugin>
-+    </plugins>
-+  </build>
-+  <dependencies>
-+    <dependency>
-+      <groupId>org.apache.hbase</groupId>
-+      <artifactId>hbase-core</artifactId>
-+      <version>${project.version}</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.hbase</groupId>
-+      <artifactId>hbase-core</artifactId>
-+      <version>${project.version}</version>
-+      <classifier>tests</classifier>
-+      <scope>test</scope>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.hadoop</groupId>
-+      <artifactId>hadoop-hdfs-test</artifactId>
-+      <version>${hadoop-hdfs.version}</version>
-+      <scope>test</scope>
-+    </dependency>
-+    <dependency>
-+      <groupId>javax.ws.rs</groupId>
-+      <artifactId>jsr311-api</artifactId>
-+      <version>${jsr311.version}</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>com.google.protobuf</groupId>
-+      <artifactId>protobuf-java</artifactId>
-+      <version>${protobuf.version}</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>com.sun.jersey</groupId>
-+      <artifactId>jersey-json</artifactId>
-+      <version>${jersey.version}</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>com.sun.jersey</groupId>
-+      <artifactId>jersey-server</artifactId>
-+      <version>${jersey.version}</version>
-+    </dependency>
-+  </dependencies>
-+</project>
-Index: contrib/transactional/pom.xml
-===================================================================
---- contrib/transactional/pom.xml	(revision 0)
-+++ contrib/transactional/pom.xml	(revision 0)
-@@ -0,0 +1,37 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<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>
-+  <groupId>org.apache.hbase</groupId>
-+  <artifactId>hbase-contrib-transactional</artifactId>
-+  <packaging>jar</packaging>
-+  <name>HBase Contrib - Transactional</name>
-+  <parent>
-+    <groupId>org.apache.hbase</groupId>
-+    <artifactId>hbase-contrib</artifactId>
-+    <version>0.20.2-SNAPSHOT</version>
-+  </parent>
-+  <properties>
-+  </properties>
-+  <build>
-+  </build>
-+  <dependencies>
-+    <dependency>
-+      <groupId>org.apache.hbase</groupId>
-+      <artifactId>hbase-core</artifactId>
-+      <version>${project.version}</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.hbase</groupId>
-+      <artifactId>hbase-core</artifactId>
-+      <version>${project.version}</version>
-+      <classifier>tests</classifier>
-+      <scope>test</scope>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.hadoop</groupId>
-+      <artifactId>hadoop-hdfs-test</artifactId>
-+      <version>${hadoop-hdfs.version}</version>
-+      <scope>test</scope>
-+    </dependency>
-+  </dependencies>
-+</project>
-Index: core/pom.xml
-===================================================================
---- core/pom.xml	(revision 0)
-+++ core/pom.xml	(revision 0)
-@@ -0,0 +1,252 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<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>
-+  <groupId>org.apache.hbase</groupId>
-+  <artifactId>hbase-core</artifactId>
-+  <packaging>jar</packaging>
-+  <name>HBase Core</name>
-+  <parent>
-+    <groupId>org.apache.hbase</groupId>
-+    <artifactId>hbase</artifactId>
-+    <version>0.20.2-SNAPSHOT</version>
-+  </parent>
-+
-+  <!-- TODO still need Repositories defined-->
-+  <build>
-+    <!--  TODO this may affect the contrib dependency resolution, commenting out for now
-+    <finalName>hbase-${project.version}</finalName>
-+    -->
-+    <resources>
-+      <resource>
-+        <directory>src/main/resources</directory>
-+      </resource>
-+      <resource>
-+        <directory>src/main/</directory>
-+        <includes>
-+          <include>webapps/**/*.gif</include>
-+          <include>webapps/**/*.css</include>
-+          <include>webapps/**/*.html</include>
-+          <include>webapps/**/*.xml</include>
-+        </includes>
-+      </resource>
-+    </resources>
-+    <plugins>
-+      <!-- Run with -Dmaven.test.skip.exec=true to build -tests.jar without running tests (this is needed for upstream projects whose tests need this jar simply for compilation)-->
-+      <plugin>
-+        <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-jar-plugin</artifactId>
-+        <executions>
-+          <execution>
-+            <goals>
-+              <goal>test-jar</goal>
-+            </goals>
-+          </execution>
-+        </executions>
-+        <configuration>
-+          <archive>
-+            <manifest>
-+              <mainClass>org/apache/hadoop/hbase/mapreduce/Driver</mainClass>
-+            </manifest>
-+          </archive>
-+          <!-- Exclude these 2 packages, because their dependency _binary_ files include the sources, and Maven 2.2 appears to add them to the sources to compile, weird-->
-+          <excludes>
-+            <exclude>org/apache/jute/**</exclude>
-+            <exclude>org/apache/zookeeper/**</exclude>
-+          </excludes>
-+        </configuration>
-+      </plugin>
-+      <plugin>
-+        <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-source-plugin</artifactId>
-+        <version>2.1.1</version>
-+        <executions>
-+          <execution>
-+            <id>attach-sources</id>
-+            <phase>package</phase>
-+            <goals>
-+              <goal>jar-no-fork</goal>
-+            </goals>
-+          </execution>
-+        </executions>
-+      </plugin>
-+      <plugin>
-+        <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-surefire-plugin</artifactId>
-+        <configuration>
-+          <forkMode>always</forkMode>
-+          <argLine>-Xmx512m</argLine>
-+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
-+          <excludes>
-+            <exclude>**/SoftValueSortedMapTest.java</exclude>
-+            <exclude>**/*$*</exclude>
-+          </excludes>
-+        </configuration>
-+      </plugin>
-+      <plugin>
-+        <artifactId>maven-antrun-plugin</artifactId>
-+        <executions>
-+          <execution>
-+            <id>JSPC</id>
-+            <phase>generate-sources</phase>
-+            <configuration>n
-+              <tasks><taskdef classname="org.apache.jasper.JspC" name="jspcompiler" classpathref="maven.compile.classpath"/><jspcompiler uriroot="${basedir}/src/main/resources/webapps/master" outputdir="${project.build.directory}/jspc" package="org.apache.hadoop.hbase.generated.master" webxml="${basedir}/src/main/resources/webapps/master/WEB-INF/web.xml"/><jspcompiler uriroot="${basedir}/src/main/resources/webapps/regionserver" outputdir="${project.build.directory}/jspc" package="org.apache.hadoop.hbase.generated.regionserver" webxml="${basedir}/src/main/resources/webapps/regionserver/WEB-INF/web.xml"/></tasks>
-+            </configuration>
-+            <goals>
-+              <goal>run</goal>
-+            </goals>
-+          </execution>
-+          <execution>
-+            <id>package-info</id>
-+            <phase>generate-sources</phase>
-+            <configuration>
-+              <tasks>
-+                <exec executable="sh">
-+                  <arg line="${basedir}/src/saveVersion.sh ${project.version} ${project.build.directory}/generated-sources"/>
-+                </exec>
-+              </tasks>
-+            </configuration>
-+            <goals>
-+              <goal>run</goal>
-+            </goals>
-+          </execution>
-+        </executions>
-+      </plugin>
-+      <plugin>
-+        <groupId>org.codehaus.mojo</groupId>
-+        <artifactId>build-helper-maven-plugin</artifactId>
-+        <executions>
-+          <execution>
-+            <id>add-jspc-source</id>
-+            <phase>generate-sources</phase>
-+            <goals>
-+              <goal>add-source</goal>
-+            </goals>
-+            <configuration>
-+              <sources>
-+                <source>${basedir}/target/jspc</source>
-+              </sources>
-+            </configuration>
-+          </execution>
-+          <execution>
-+            <id>add-package-info</id>
-+            <phase>generate-sources</phase>
-+            <goals>
-+              <goal>add-source</goal>
-+            </goals>
-+            <configuration>
-+              <sources>
-+                <source>${project.build.directory}/generated-sources</source>
-+              </sources>
-+            </configuration>
-+          </execution>
-+        </executions>
-+      </plugin>
-+    </plugins>
-+  </build>
-+  <dependencies>
-+    <dependency>
-+      <groupId>log4j</groupId>
-+      <artifactId>log4j</artifactId>
-+      <version>${log4j.version}</version>
-+      <exclusions>
-+        <exclusion>
-+          <groupId>javax.jms</groupId>
-+          <artifactId>jms</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-mapred</artifactId>
-+      <version>${hadoop-mapred.version}</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.hadoop</groupId>
-+      <artifactId>hadoop-mapred-test</artifactId>
-+      <version>${hadoop-mapred.version}</version>
-+      <scope>test</scope>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.hadoop</groupId>
-+      <artifactId>hadoop-hdfs</artifactId>
-+      <version>${hadoop-hdfs.version}</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.hadoop</groupId>
-+      <artifactId>hadoop-hdfs-test</artifactId>
-+      <version>${hadoop-hdfs.version}</version>
-+      <scope>test</scope>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.hadoop</groupId>
-+      <artifactId>hadoop-core</artifactId>
-+      <version>${hadoop-core.version}</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.hadoop</groupId>
-+      <artifactId>hadoop-core-test</artifactId>
-+      <version>${hadoop-core.version}</version>
-+      <scope>test</scope>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.thrift</groupId>
-+      <artifactId>thrift</artifactId>
-+      <version>${thrift.version}</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.hadoop.zookeeper</groupId>
-+      <artifactId>zookeeper</artifactId>
-+      <version>${zookeeper.version}</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.commons</groupId>
-+      <artifactId>commons-math</artifactId>
-+      <version>${commons-math.version}</version>
-+      <scope>test</scope>
-+    </dependency>
-+    
-+    <dependency>
-+      <groupId>commons-lang</groupId>
-+      <artifactId>commons-lang</artifactId>
-+      <version>${commons-lang.version}</version>
-+    </dependency>
-+    
-+    <!-- 
-+    
-+      TODO mention to Hbase team to tell the avro team about this problem,
-+      hbase-core depends on hadoop, which then:
-+      [INFO] |  \- org.apache.hadoop:avro:jar:1.2.0:compile
-+      [INFO] |     +- org.slf4j:slf4j-simple:jar:1.5.8:compile
-+      [INFO] |     |  \- org.slf4j:slf4j-api:jar:1.5.2:compile
-+      
-+      see: https://forum.hibernate.org/viewtopic.php?p=2400801 and http://old.nabble.com/org.slf4j.impl.StaticLoggerBinder.SINGLETON-td20987705.html
-+      
-+      upgrading to 1.5.6 will fix this
-+    -->
-+    <dependency>
-+      <groupId>org.slf4j</groupId>
-+      <artifactId>slf4j-api</artifactId>
-+      <version>1.5.8</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.slf4j</groupId>
-+      <artifactId>slf4j-log4j12</artifactId>
-+      <version>${slf4j.version}</version>
-+    </dependency>
-+    <!-- TODO not sure jruby is needed for Hbase-core per se, maybe just for stargate? 
-+    <dependency>
-+      <groupId>org.jruby</groupId>
-+      <artifactId>jruby-complete</artifactId>
-+      <version>${jruby.version}</version>
-+    </dependency>
-+    -->
-+  </dependencies>
-+</project>
-Index: core/src/saveVersion.sh
-===================================================================
---- core/src/saveVersion.sh	(revision 0)
-+++ core/src/saveVersion.sh	(working copy)
-@@ -24,6 +24,7 @@
- unset LANG
- unset LC_CTYPE
- version=$1
-+outputDirectory=$2
- user=`whoami`
- date=`date`
- cwd=`pwd`
-@@ -44,12 +45,12 @@ else
-   branch="Unknown"
-   url="file://$cwd"
- fi
--mkdir -p build/src/org/apache/hadoop/hbase
-+mkdir -p $outputDirectory/org/apache/hadoop/hbase
- cat << EOF | \
-   sed -e "s/VERSION/$version/" -e "s/USER/$user/" -e "s/DATE/$date/" \
-       -e "s|URL|$url|" -e "s/REV/$revision/" \
-       -e "s|BRANCH|$branch|" \
--      > build/src/org/apache/hadoop/hbase/package-info.java
-+      > $outputDirectory/org/apache/hadoop/hbase/package-info.java
- /*
-  * Generated by src/saveVersion.sh
-  */
-Index: pom.xml
-===================================================================
---- pom.xml	(revision 0)
-+++ pom.xml	(revision 0)
-@@ -0,0 +1,235 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<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>
-+  <groupId>org.apache.hbase</groupId>
-+  <artifactId>hbase</artifactId>
-+  <packaging>pom</packaging>
-+  <version>0.20.2-SNAPSHOT</version>
-+  <name>HBase</name>
-+  <description>HBase is the Hadoop 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://hadoop.apache.org/hbase</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>
-+  <scm>
-+    <connection>scm:svn:http://svn.apache.org/repos/asf/hadoop/hbase/trunk</connection>
-+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/hadoop/hbase/trunk</developerConnection>
-+    <url>http://svn.apache.org/viewvc/hadoop/hbase/trunk</url>
-+  </scm>
-+  <developers>
-+    <developer>
-+      <id>stack</id>
-+      <name>Michael Stack</name>
-+      <email>stack@apache.org</email>
-+      <timezone>-8</timezone>
-+    </developer>
-+  </developers>
-+  <issueManagement>
-+    <system>JIRA</system>
-+    <url>http://issues.apache.org/jira/</url>
-+  </issueManagement>
-+  <properties>
-+    <compileSource>1.6</compileSource>
-+    <log4j.version>1.2.15</log4j.version>
-+    <commons-lang.version>2.4</commons-lang.version>
-+    <commons-math.version>2.0</commons-math.version>
-+    <hadoop-core.version>0.21.0-SNAPSHOT</hadoop-core.version>
-+    <hadoop-hdfs.version>0.21.0-SNAPSHOT</hadoop-hdfs.version>
-+    <hadoop-mapred.version>0.21.0-SNAPSHOT</hadoop-mapred.version>
-+    <!-- TODO specify external repositories - Note the following 2 resources are not downloadable from a public repository, you'll need to place these manually by using 'mvn install:file' or use something like Nexus as a repository manager -->
-+    <zookeeper.version>3.2.2</zookeeper.version>
-+    <thrift.version>0.2.0</thrift.version>
-+    <jruby.version>1.3.1</jruby.version>
-+    <slf4j.version>1.5.8</slf4j.version>
-+  </properties>
-+  <modules>
-+    <module>core</module>
-+    <module>contrib</module>
-+  </modules>
-+  <repositories>
-+    <repository>
-+      <id>asf-snapshots</id>
-+      <name>Apache Public Snapshots</name>
-+      <url>https://repository.apache.org/content/repositories/snapshots/</url>
-+      <snapshots>
-+        <enabled>true</enabled>
-+      </snapshots>
-+      <releases>
-+        <enabled>true</enabled>
-+      </releases>
-+    </repository>
-+    <repository>
-+      <id>java.net</id>
-+      <name>Java.Net</name>
-+      <url>http://download.java.net/maven/2/</url>
-+      <snapshots>
-+        <enabled>false</enabled>
-+      </snapshots>
-+      <releases>
-+        <enabled>true</enabled>
-+      </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>
-+      <snapshots>
-+        <enabled>false</enabled>
-+      </snapshots>
-+      <releases>
-+        <enabled>true</enabled>
-+      </releases>
-+    </repository>
-+    <!-- TODO replace this with a 'proper' repository, even if it's just @stacks version of this. -->
-+    <repository>
-+      <id>misc</id>
-+      <name>Miscellaneous (Stuff for Zookeeper and Thrift)</name>
-+      <url>http://people.apache.org/~psmith/hbase/repo</url>
-+      <snapshots>
-+        <enabled>false</enabled>
-+      </snapshots>
-+      <releases>
-+        <enabled>true</enabled>
-+      </releases>
-+    </repository>
-+  </repositories>
-+  <build>
-+    <directory>target</directory>
-+    <outputDirectory>target/classes</outputDirectory>
-+    <finalName>${artifactId}-${version}</finalName>
-+    <plugins>
-+      <plugin>
-+        <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-compiler-plugin</artifactId>
-+        <configuration>
-+          <source>${compileSource}</source>
-+          <target>${compileSource}</target>
-+          <encoding>UTF-8</encoding>
-+          <showWarnings>true</showWarnings>
-+          <showDeprecations>true</showDeprecations>
-+        </configuration>
-+      </plugin>
-+      <plugin>
-+        <artifactId>maven-assembly-plugin</artifactId>
-+        <!-- see http://jira.codehaus.org/browse/MASSEMBLY-109, beta-5 is out, but I'm having an error downloading that plugin, maybe Nexus related, not sure -->
-+        <version>2.2-beta-4</version>
-+        <!-- THIS might not be doable
-+        <executions>
-+          <execution>
-+            <phase>package</phase>
-+            <goals>
-+              <goal>single</goal>
-+            </goals>
-+          </execution>
-+        </executions>
-+        -->
-+        <configuration>
-+          <descriptors>
-+            <descriptor>src/assembly/bin.xml</descriptor>
-+          </descriptors>
-+          <descriptorRefs>
-+            <descriptorRef>src</descriptorRef>
-+            <descriptorRef>project</descriptorRef>
-+          </descriptorRefs>
-+        </configuration>
-+      </plugin>
-+    </plugins>
-+  </build>
-+  <distributionManagement>
-+    <repository>
-+      <id>Apache Public Releases</id>
-+      <url>scp://people.apache.org/home/psmith/public_html/hbase/repo/</url>
-+    </repository>
-+    <snapshotRepository>
-+      <id>Apache Public Snapshots</id>
-+      <name>Aconex Snapshots</name>
-+      <url>scp://people.apache.org/home/psmith/public_html/hbase/repo-snapshots/</url>
-+    </snapshotRepository>
-+    <site>
-+      <id>HBase Site</id>
-+      <url>scp://people.apache.org/home/psmith/public_html/hbase/sandbox/hbase/</url>
-+    </site>
-+  </distributionManagement>
-+  <reporting>
-+    <plugins>
-+      <plugin>
-+        <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-pmd-plugin</artifactId>
-+        <version>2.3</version>
-+        <configuration>
-+          <targetJdk>${compileSource}</targetJdk>
-+        </configuration>
-+      </plugin>
-+      <plugin>
-+        <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-checkstyle-plugin</artifactId>
-+      </plugin>
-+      <plugin>
-+        <groupId>org.codehaus.mojo</groupId>
-+        <artifactId>findbugs-maven-plugin</artifactId>
-+        <version>2.3</version>
-+      </plugin>
-+      <plugin>
-+        <artifactId>maven-site-plugin</artifactId>
-+        <configuration>
-+          <inputEncoding>UTF-8</inputEncoding>
-+          <outputEncoding>UTF-8</outputEncoding>
-+        </configuration>
-+      </plugin>
-+      <plugin>
-+        <artifactId>maven-javadoc-plugin</artifactId>
-+        <configuration>
-+          <encoding>UTF-8</encoding>
-+          <docencoding>UTF-8</docencoding>
-+          <charset>UTF-8</charset>
-+          <!--
-+This is probably not needed, given the smallness of the HBase source code, but left here in case
-+            <minmemory>128m</minmemory>
-+            <maxmemory>1024m</maxmemory>
-+-->
-+        </configuration>
-+      </plugin>
-+      <plugin>
-+        <groupId>org.codehaus.mojo</groupId>
-+        <artifactId>cobertura-maven-plugin</artifactId>
-+      </plugin>
-+      <plugin>
-+        <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-jxr-plugin</artifactId>
-+      </plugin>
-+      <plugin>
-+        <groupId>org.codehaus.mojo</groupId>
-+        <artifactId>jdepend-maven-plugin</artifactId>
-+      </plugin>
-+      <plugin>
-+        <artifactId>maven-changes-plugin</artifactId>
-+        <configuration>
-+          <issueLinkTemplate>%URL%/browse/%ISSUE%</issueLinkTemplate>
-+        </configuration>
-+        <reportSets>
-+          <reportSet>
-+            <reports>
-+              <report>changes-report</report>
-+            </reports>
-+          </reportSet>
-+        </reportSets>
-+      </plugin>
-+    </plugins>
-+  </reporting>
-+</project>
-Index: src/assembly/bin.xml
-===================================================================
---- src/assembly/bin.xml	(revision 0)
-+++ src/assembly/bin.xml	(revision 0)
-@@ -0,0 +1,91 @@
-+<?xml version="1.0"?>
-+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-+  <id>bin</id>
-+  <formats>
-+    <format>tar.gz</format>
-+  </formats>
-+  <includeBaseDirectory>false</includeBaseDirectory>
-+  <moduleSets>
-+    <moduleSet>
-+      <includes>
-+        <include>org.apache.hbase:hbase-core</include>
-+      </includes>
-+      <binaries>
-+        <outputDirectory>/</outputDirectory>
-+        <unpack>false</unpack>
-+        <outputFileNameMapping>hbase-${version}.jar</outputFileNameMapping>
-+        <dependencySets>
-+          <dependencySet>
-+            <outputDirectory>lib</outputDirectory>
-+          </dependencySet>
-+        </dependencySets>
-+      </binaries>
-+    </moduleSet>
-+    <!-- This ensures that the source jars are added-->
-+    <moduleSet>
-+      <includes>
-+        <include>org.apache.hbase:hbase-core</include>
-+      </includes>
-+      <binaries>
-+        <attachmentClassifier>sources</attachmentClassifier>
-+        <outputFileNameMapping>hbase-${version}${dashClassifier}.jar</outputFileNameMapping>
-+        <outputDirectory>/</outputDirectory>
-+        <unpack>false</unpack>
-+      </binaries>
-+    </moduleSet>
-+    <moduleSet>
-+      <includes>
-+        <include>org.apache.hbase:hbase-contrib-stargate</include>
-+      </includes>
-+      <binaries>
-+        <outputDirectory>contrib/stargate/</outputDirectory>
-+        <unpack>false</unpack>
-+        <dependencySets>
-+          <dependencySet>
-+            <outputDirectory>contrib/stargate/lib</outputDirectory>
-+          </dependencySet>
-+        </dependencySets>
-+      </binaries>
-+    </moduleSet>
-+    <moduleSet>
-+      <includes>
-+        <include>org.apache.hbase:hbase-contrib-transactional</include>
-+      </includes>
-+      <binaries>
-+        <outputDirectory>contrib/transactional/</outputDirectory>
-+        <unpack>false</unpack>
-+      </binaries>
-+    </moduleSet>
-+  </moduleSets>
-+  <fileSets>
-+    <fileSet>
-+      <includes>
-+        <include>${basedir}/README*</include>
-+        <include>${basedir}/LICENSE*</include>
-+        <include>${basedir}/NOTICE*</include>
-+      </includes>
-+    </fileSet>
-+    <fileSet>
-+      <directory>conf</directory>
-+    </fileSet>
-+    <fileSet>
-+      <directory>bin</directory>
-+      <fileMode>755</fileMode>
-+    </fileSet>
-+    <fileSet>
-+      <directory>contrib/ec2</directory>
-+      <outputDirectory>contrib/ec2</outputDirectory>
-+      <includes>
-+        <include>README*</include>
-+        <include>bin/**</include>
-+      </includes>
-+    </fileSet>
-+    <fileSet>
-+      <directory>contrib/transactional</directory>
-+      <outputDirectory>contrib/transactional</outputDirectory>
-+      <includes>
-+        <include>README*</include>
-+      </includes>
-+    </fileSet>
-+  </fileSets>
-+</assembly>