Have assembly produce one tgz with source that is buildable rather than a bin and src.

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1034559 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

@@ -11,14 +11,14 @@
     pom not being found.  To fix, I've downloaded apache's pom
     from here https://repository.apache.org/content/repositories/releases/org/apache/apache/7/apache-7.pom
     saving it as 'pom.xml' into a directory named 'apache-7.pom'.  I then uncommented the below.
-    <relativePath>../apache-7.pom/</relativePath>
     -->
+    <relativePath>../apache-7.pom/</relativePath>
   </parent>
 
   <groupId>org.apache.hbase</groupId>
   <artifactId>hbase</artifactId>
   <packaging>jar</packaging>
-  <version>0.90.0-SNAPSHOT</version>
+  <version>0.90.0</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
@@ -307,8 +307,7 @@
         <configuration>
           <tarLongFileMode>gnu</tarLongFileMode>
           <descriptors>
-            <descriptor>src/assembly/bin.xml</descriptor>
-            <descriptor>src/assembly/src.xml</descriptor>
+            <descriptor>src/assembly/all.xml</descriptor>
           </descriptors>
         </configuration>
       </plugin>

src/assembly/all.xml

@@ -2,7 +2,7 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
-  <id>bin</id>
+  <id>all</id>
   <formats>
     <format>tar.gz</format>
   </formats>
@@ -12,6 +12,14 @@
         <include>${basedir}/*.txt</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <includes>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src</directory>
+    </fileSet>
     <fileSet>
       <directory>conf</directory>
     </fileSet>
@@ -29,7 +37,6 @@
       <includes>
           <include>hbase-${project.version}.jar</include>
           <include>hbase-${project.version}-tests.jar</include>
-          <include>hbase-${project.version}-sources.jar</include>
       </includes>
     </fileSet>
     <fileSet>

src/assembly/src.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
-  <id>src</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <includes>
-        <include>${basedir}/*.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <includes>
-        <include>pom.xml</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src</directory>
-    </fileSet>
-    <fileSet>
-      <directory>conf</directory>
-    </fileSet>
-    <fileSet>
-      <directory>bin</directory>
-      <fileMode>755</fileMode>
-    </fileSet>
-  </fileSets>
-</assembly>

src/site/site.xml

@@ -5,11 +5,11 @@
     xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
   <bannerLeft>
     <name>HBase</name>
-    <src>http://hbase.apache.org/images/hbase_logo_med.gif</src>
+    <src>images/hbase_logo_med.gif</src>
     <href>http://hbase.apache.org/</href>
   </bannerLeft>
   <bannerRight>
-    <src>http://hbase.apache.org/images/asf_logo_wide.png</src>
+      <src>images/asf_logo_wide.png</src>
     <href>http://www.apache.org/</href>
   </bannerRight>
   <version position="right" />