diff --git a/pom.xml b/pom.xml index 354a8e6..088b3bd 100644 --- a/pom.xml +++ b/pom.xml @@ -601,8 +601,8 @@ - + maven-assembly-plugin ${maven.assembly.version} @@ -617,12 +617,7 @@ - - - org.apache.maven.plugins - maven-javadoc-plugin - - + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${project.build.finalName}.tar.gz diff --git a/src/assembly/components.xml b/src/assembly/components.xml new file mode 100644 index 0000000..d1f7f7e --- /dev/null +++ b/src/assembly/components.xml @@ -0,0 +1,108 @@ + + + + + + target/site + docs + + + + / + + *.txt + pom.xml + + + + + conf + conf + 0644 + 0755 + + + + bin + bin + 0755 + 0755 + + + conf + conf + 0644 + 0755 + + + + src + src + 0644 + 0755 + + + + dev-support + dev-support + 0755 + 0755 + + + + hbase-server/src/main/ruby + lib/ruby + 0644 + 0755 + + + + hbase-server/target/hbase-webapps + hbase-webapps + 0644 + 0755 + + + + hbase-server/target/native + native + 0755 + 0755 + + *.so + + + + + hbase-server/target/ + lib + + ${server.test.jar} + + 0644 + + + \ No newline at end of file diff --git a/src/assembly/hadoop-one-compat.xml b/src/assembly/hadoop-one-compat.xml index c3b6610..b604239 100644 --- a/src/assembly/hadoop-one-compat.xml +++ b/src/assembly/hadoop-one-compat.xml @@ -22,112 +22,26 @@ */ --> - + all tar.gz - - - - target/site - docs - - - - / - - *.txt - pom.xml - - - - - conf - conf - 0644 - 0755 - - - - bin - bin - 0755 - 0755 - - - conf - conf - 0644 - 0755 - - - - src - src - 0644 - 0755 - - - - dev-support - dev-support - 0755 - 0755 - - - - hbase-server/src/main/ruby - lib/ruby - 0644 - 0755 - - - - hbase-server/target/hbase-webapps - hbase-webapps - 0644 - 0755 - - - - hbase-server/target/native - native - 0755 - 0755 - - *.so - - - - - ${parent.basedir}/hbase-server/target/ - lib - - ${server.test.jar} - - 0644 - - + + src/assembly/components.xml + true - - + org.apache.hbase:hbase-common org.apache.hbase:hbase-hadoop-compat - org.apache.hbase:hbase-hadoop1-compat org.apache.hbase:hbase-server + org.apache.hbase:hbase-hadoop1-compat @@ -143,14 +57,14 @@ - + lib false - + - + \ No newline at end of file diff --git a/src/assembly/hadoop-two-compat.xml b/src/assembly/hadoop-two-compat.xml index 9f5a844..b328383 100644 --- a/src/assembly/hadoop-two-compat.xml +++ b/src/assembly/hadoop-two-compat.xml @@ -22,99 +22,14 @@ */ --> - + all tar.gz - - - - target/site - docs - - - - / - - *.txt - pom.xml - - - - - conf - conf - 0644 - 0755 - - - - bin - bin - 0755 - 0755 - - - conf - conf - 0644 - 0755 - - - - src - src - 0644 - 0755 - - - - dev-support - dev-support - 0755 - 0755 - - - - hbase-server/src/main/ruby - lib/ruby - 0644 - 0755 - - - - hbase-server/target/hbase-webapps - hbase-webapps - 0644 - 0755 - - - - hbase-server/target/native - native - 0755 - 0755 - - *.so - - - - - ${parent.basedir}/hbase-server/target/ - lib - - ${server.test.jar} - - 0644 - - + + src/assembly/components.xml + @@ -148,9 +63,9 @@ lib false - + - + \ No newline at end of file