This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new dc9b90b ZOOKEEPER-3285: Maven migration - add convenience tar,
assembly module and sha512 generation
dc9b90b is described below
commit dc9b90bb17576ef61eb53f08eebe50d58736a2be
Author: Norbert Kalmar <[email protected]>
AuthorDate: Tue Feb 26 17:03:51 2019 +0100
ZOOKEEPER-3285: Maven migration - add convenience tar, assembly module and
sha512 generation
Author: Norbert Kalmar <[email protected]>
Reviewers: [email protected]
Closes #828 from nkalmar/master and squashes the following commits:
817077f5c [Norbert Kalmar] ZOOKEEPER-3285 - add some info on 3rd party
plugin
af1fcd508 [Norbert Kalmar] ZOOKEEPER-3285 - remove zip generation and fix
versions
c19d18605 [Norbert Kalmar] ZOOKEEPER-3285 - add Apache license headers
4e7b65945 [Norbert Kalmar] ZOOKEEPER-3285 - add auto sha512 checksum
generation for all maven generated artifact
915d53084 [Norbert Kalmar] ZOOKEEPER-3285 - create convenience tar and
assembly sub-module
(cherry picked from commit 54b4f8aa1ab23a175d460347d250fb9497a28a09)
Signed-off-by: Andor Molnar <[email protected]>
---
build.xml | 2 +
pom.xml | 30 ++---
source-package.xml | 91 ---------------
zookeeper-assembly/pom.xml | 105 +++++++++++++++++
.../src/main/assembly/bin-package.xml | 128 +++++++++++++++++++++
.../src/main/assembly/components.xml | 49 ++++++++
.../src/main/assembly/source-package.xml | 120 +++++++++++++++++++
zookeeper-client/pom.xml | 21 ----
zookeeper-contrib/pom.xml | 19 ---
zookeeper-docs/pom.xml | 16 ---
zookeeper-jute/pom.xml | 16 ---
zookeeper-recipes/pom.xml | 21 ----
zookeeper-server/pom.xml | 17 ---
13 files changed, 420 insertions(+), 215 deletions(-)
diff --git a/build.xml b/build.xml
index eb7d7af..d5e40e6 100644
--- a/build.xml
+++ b/build.xml
@@ -871,6 +871,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
<copy todir="${dist.dir}" includeEmptyDirs="true">
<fileset dir="${basedir}" excludes="**/*.template **/docs/build/**/*
**/ivy*.jar">
+ <include name="zookeeper-assembly/**"/>
<include name="zookeeper-recipes/**"/>
<include name="zookeeper-docs/**"/>
<include name="zookeeper-contrib/**"/>
@@ -998,6 +999,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
<copy todir="${dist.dir}" includeEmptyDirs="true">
<fileset dir="${basedir}" excludes="**/*.template **/docs/build/**/*
**/ivy*.jar">
+ <include name="zookeeper-assembly/**"/>
<include name="zookeeper-recipes/**"/>
<include name="zookeeper-docs/**"/>
<include name="zookeeper-contrib/**"/>
diff --git a/pom.xml b/pom.xml
index 8103897..06ac59f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,7 @@
<module>zookeeper-server</module>
<module>zookeeper-client</module>
<module>zookeeper-recipes</module>
+ <module>zookeeper-assembly</module>
</modules>
<scm>
@@ -510,6 +511,11 @@
<version>3.0.0</version>
</plugin>
<plugin>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>1.8</version>
+ </plugin>
+ <plugin>
<groupId>org.openclover</groupId>
<artifactId>clover-maven-plugin</artifactId>
<version>4.3.1</version>
@@ -648,26 +654,22 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
+ <!-- Maven's deploy plugin only creates checksums during the
deployment of the jar artifacts to repo. -->
+ <!-- We also want to sign tarballs. Nicoulaj's plugin is the
recommended solution by the community. -->
+ <groupId>net.nicoulaj.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
<executions>
<execution>
- <id>source-package</id>
- <phase>package</phase>
<goals>
- <goal>
- single
- </goal>
+ <goal>artifacts</goal>
</goals>
- <configuration>
- <descriptors>
- <descriptor>${project.basedir}/source-package.xml</descriptor>
- </descriptors>
- <finalName>zookeeper-${project.version}</finalName>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
</execution>
</executions>
+ <configuration>
+ <algorithms>
+ <algorithm>SHA-512</algorithm>
+ </algorithms>
+ </configuration>
</plugin>
<plugin>
diff --git a/source-package.xml b/source-package.xml
deleted file mode 100644
index 139f99f..0000000
--- a/source-package.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd";>
-
- <id>source-package</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/bin</directory>
- <outputDirectory>bin</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/conf</directory>
- <outputDirectory>conf</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/zookeeper-client</directory>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- <outputDirectory>zookeeper-client</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/zookeeper-contrib</directory>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- <outputDirectory>zookeeper-contrib</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/zookeeper-docs</directory>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- <outputDirectory>zookeeper-docs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/zookeeper-it</directory>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- <outputDirectory>zookeeper-it</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/zookeeper-jute</directory>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- <outputDirectory>zookeeper-jute</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/zookeeper-recipes</directory>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- <outputDirectory>zookeeper-recipes</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/zookeeper-server</directory>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- <outputDirectory>zookeeper-server</outputDirectory>
- </fileSet>
- </fileSets>
- <files>
- <file>
- <source>${project.basedir}/pom.xml</source>
- </file>
- <file>
- <source>${project.basedir}/source-package.xml</source>
- </file>
- <file>
- <source>${project.basedir}/LICENSE.txt</source>
- </file>
- <file>
- <source>${project.basedir}/NOTICE.txt</source>
- </file>
- <file>
- <source>${project.basedir}/README.md</source>
- </file>
- <file>
- <source>${project.basedir}/README_packaging.txt</source>
- </file>
-
- </files>
-</assembly>
\ No newline at end of file
diff --git a/zookeeper-assembly/pom.xml b/zookeeper-assembly/pom.xml
new file mode 100755
index 0000000..ed0dca3
--- /dev/null
+++ b/zookeeper-assembly/pom.xml
@@ -0,0 +1,105 @@
+<?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";>
+ <!--
+ /**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper-assembly</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache ZooKeeper - Assembly</name>
+ <description>ZooKeeper Assembly</description>
+
+ <properties>
+ <rw.file.permission>0644</rw.file.permission>
+ <rwx.file.permission>0755</rwx.file.permission>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper-docs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper-jute</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper-client</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper-recipes</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>${project.basedir}/src/main/assembly/source-package.xml</descriptor>
+
<descriptor>${project.basedir}/src/main/assembly/bin-package.xml</descriptor>
+ </descriptors>
+ <finalName>zookeeper-${project.version}</finalName>
+ <tarLongFileMode>posix</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/zookeeper-assembly/src/main/assembly/bin-package.xml
b/zookeeper-assembly/src/main/assembly/bin-package.xml
new file mode 100644
index 0000000..5083ed6
--- /dev/null
+++ b/zookeeper-assembly/src/main/assembly/bin-package.xml
@@ -0,0 +1,128 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd";>
+<!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+ <id>bin-package</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <componentDescriptors>
+ <componentDescriptor>src/main/assembly/components.xml</componentDescriptor>
+ </componentDescriptors>
+
+ <moduleSets>
+ <!-- ZooKeeper jars (excluding pom projects) including 3rd party
dependencies -->
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.apache.zookeeper:zookeeper-server</include>
+ <include>org.apache.zookeeper:zookeeper-recipes-election</include>
+ <include>org.apache.zookeeper:zookeeper-recipes-lock</include>
+ <include>org.apache.zookeeper:zookeeper-recipes-queue</include>
+ </includes>
+
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <excludes>
+ <exclude>org.apache.zookeeper:zookeeper-recipes</exclude>
+ <exclude>org.apache.zookeeper:zookeeper-client</exclude>
+ <exclude>org.apache.zookeeper:zookeeper-docs</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+ <fileSets>
+ <fileSet>
+ <!-- ZooKeeper generated documents -->
+ <directory>${project.basedir}/../zookeeper-docs/target/html</directory>
+ <outputDirectory>docs</outputDirectory>
+ <fileMode>${rw.file.permission}</fileMode>
+ <directoryMode>${rwx.file.permission}</directoryMode>
+ </fileSet>
+ <fileSet>
+ <!-- License files for 3rd party libs -->
+
<directory>${project.basedir}/../zookeeper-server/src/main/resources/lib</directory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ <outputDirectory>lib</outputDirectory>
+ <fileMode>${rw.file.permission}</fileMode>
+ </fileSet>
+
+ <!-- Add source jars "manually", as the :source classiffier doesn't work
in moduleSets -->
+ <fileSet>
+ <directory>${project.basedir}/../zookeeper-server/target</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>zookeeper-*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../zookeeper-jute/target</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>zookeeper-*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/../zookeeper-recipes/zookeeper-recipes-election/target</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>zookeeper-*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/../zookeeper-recipes/zookeeper-recipes-lock/target</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>zookeeper-*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/../zookeeper-recipes/zookeeper-recipes-queue/target</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>zookeeper-*-sources.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <files>
+ <file>
+
<source>${project.basedir}/../zookeeper-server/src/main/resources/lib/cobertura/README.txt</source>
+ <outputDirectory>lib/cobertura</outputDirectory>
+ <fileMode>${rw.file.permission}</fileMode>
+ </file>
+ <file>
+
<source>${project.basedir}/../zookeeper-server/src/main/resources/lib/jdiff/zookeeper_3.1.1.xml</source>
+ <outputDirectory>lib/jdiff</outputDirectory>
+ <fileMode>${rw.file.permission}</fileMode>
+ </file>
+ </files>
+
+</assembly>
\ No newline at end of file
diff --git a/zookeeper-assembly/src/main/assembly/components.xml
b/zookeeper-assembly/src/main/assembly/components.xml
new file mode 100644
index 0000000..2510db1
--- /dev/null
+++ b/zookeeper-assembly/src/main/assembly/components.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<component>
+ <!-- Resources that both bin and source package include -->
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/..</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ <include>README.md</include>
+ <include>README_packaging.txt</include>
+ </includes>
+ <fileMode>${rw.file.permission}</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <fileMode>${rw.file.permission}</fileMode>
+ <directoryMode>${rwx.file.permission}</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>${rwx.file.permission}</fileMode>
+ <directoryMode>${rwx.file.permission}</directoryMode>
+ </fileSet>
+ </fileSets>
+</component>
diff --git a/zookeeper-assembly/src/main/assembly/source-package.xml
b/zookeeper-assembly/src/main/assembly/source-package.xml
new file mode 100644
index 0000000..8190ba5
--- /dev/null
+++ b/zookeeper-assembly/src/main/assembly/source-package.xml
@@ -0,0 +1,120 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd";>
+<!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+ <id>source-package</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <componentDescriptors>
+ <componentDescriptor>src/main/assembly/components.xml</componentDescriptor>
+ </componentDescriptors>
+
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/../zookeeper-assembly</directory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ <outputDirectory>zookeeper-assembly</outputDirectory>
+ <fileMode>${rw.file.permission}</fileMode>
+ <directoryMode>${rwx.file.permission}</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../zookeeper-client</directory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ <outputDirectory>zookeeper-client</outputDirectory>
+ <fileMode>${rw.file.permission}</fileMode>
+ <directoryMode>${rwx.file.permission}</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../zookeeper-contrib</directory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ <outputDirectory>zookeeper-contrib</outputDirectory>
+ <fileMode>${rw.file.permission}</fileMode>
+ <directoryMode>${rwx.file.permission}</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../zookeeper-docs</directory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ <outputDirectory>zookeeper-docs</outputDirectory>
+ <fileMode>${rw.file.permission}</fileMode>
+ <directoryMode>${rwx.file.permission}</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../zookeeper-it</directory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ <outputDirectory>zookeeper-it</outputDirectory>
+ <fileMode>${rw.file.permission}</fileMode>
+ <directoryMode>${rwx.file.permission}</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../zookeeper-jute</directory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ <outputDirectory>zookeeper-jute</outputDirectory>
+ <fileMode>${rw.file.permission}</fileMode>
+ <directoryMode>${rwx.file.permission}</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../zookeeper-recipes</directory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ <outputDirectory>zookeeper-recipes</outputDirectory>
+ <fileMode>${rw.file.permission}</fileMode>
+ <directoryMode>${rwx.file.permission}</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../zookeeper-server</directory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ <outputDirectory>zookeeper-server</outputDirectory>
+ <fileMode>${rw.file.permission}</fileMode>
+ <directoryMode>${rwx.file.permission}</directoryMode>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>${project.basedir}/../pom.xml</source>
+ <fileMode>${rw.file.permission}</fileMode>
+ </file>
+ <file>
+ <source>${project.basedir}/src/main/assembly/source-package.xml</source>
+ <fileMode>${rw.file.permission}</fileMode>
+ </file>
+ <file>
+ <source>${project.basedir}/src/main/assembly/bin-package.xml</source>
+ <fileMode>${rw.file.permission}</fileMode>
+ </file>
+ </files>
+</assembly>
\ No newline at end of file
diff --git a/zookeeper-client/pom.xml b/zookeeper-client/pom.xml
index 68a3fc3..f389319 100755
--- a/zookeeper-client/pom.xml
+++ b/zookeeper-client/pom.xml
@@ -48,25 +48,4 @@
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>source-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git a/zookeeper-contrib/pom.xml b/zookeeper-contrib/pom.xml
index d458daa..aba6b63 100755
--- a/zookeeper-contrib/pom.xml
+++ b/zookeeper-contrib/pom.xml
@@ -55,25 +55,6 @@
</plugin>
</plugins>
</pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>source-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
</project>
\ No newline at end of file
diff --git a/zookeeper-docs/pom.xml b/zookeeper-docs/pom.xml
index e271053..b4a4884 100644
--- a/zookeeper-docs/pom.xml
+++ b/zookeeper-docs/pom.xml
@@ -53,22 +53,6 @@
<copyDirectories>images,skin</copyDirectories>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>source-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/zookeeper-jute/pom.xml b/zookeeper-jute/pom.xml
index 92cf94e..e269fc9 100755
--- a/zookeeper-jute/pom.xml
+++ b/zookeeper-jute/pom.xml
@@ -146,22 +146,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>source-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<!-- spotbugs does not make sense for generated code -->
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
diff --git a/zookeeper-recipes/pom.xml b/zookeeper-recipes/pom.xml
index 99bc63d..1662f26 100755
--- a/zookeeper-recipes/pom.xml
+++ b/zookeeper-recipes/pom.xml
@@ -62,25 +62,4 @@
<module>zookeeper-recipes-queue</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>source-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index d104979..b3c1414 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -256,23 +256,6 @@
</systemPropertyVariables>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>source-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
