ZOOKEEPER-3695: Source release tarball does not match repository in 3.6.0

- use the same configuration as in Apache Parent Pom to generate the source tarball
- drop the custom made configuration for the source tarball

Author: Enrico Olivelli <enrico.olivelli@diennea.com>

Reviewers: andor@apache.org

Closes #1226 from eolivelli/fix/ZOOKEEPER-3695-source-tarball and squashes the following commits:

781d95e5c [Enrico Olivelli] Fix typo
21eac30dd [Enrico Olivelli] Fix formatting and add comment
7eca978f6 [Enrico Olivelli] ZOOKEEPER-3695 Source release tarball does not match repository in 3.6.0 - use the same configuration as in Apache Parent Pom to generate the source tarball - drop the custom made configuration for the source tarball

pom.xml

@@ -267,6 +267,45 @@
         <activeByDefault>true</activeByDefault>
       </activation>
     </profile>
+    <profile>
+        <id>apache-release</id>
+        <build>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.apache.resources</groupId>
+                            <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                            <version>1.0.6</version>
+                        </dependency>
+                    </dependencies>
+                    <executions>
+                        <execution>
+                            <id>source-release-assembly-tar-gz</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>single</goal>
+                            </goals>
+                            <configuration>
+                                <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                                <descriptorRefs>
+                                    <!-- defined in Apache Parent Pom -->
+                                    <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+                                </descriptorRefs>
+                                <finalName>apache-zookeeper-${project.version}</finalName>
+                                <formats>
+                                    <format>tar.gz</format>
+                                </formats>
+                                <tarLongFileMode>posix</tarLongFileMode>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </build>
+    </profile>
   </profiles>
 
   <properties>
@@ -681,7 +720,6 @@
           </execution>
         </executions>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>

zookeeper-assembly/pom.xml

@@ -123,21 +123,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
-          <execution>
-            <id>source-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>${project.basedir}/src/main/assembly/source-package.xml</descriptor>
-              </descriptors>
-              <finalName>apache-zookeeper-${project.version}</finalName>
-              <appendAssemblyId>false</appendAssemblyId>
-              <tarLongFileMode>posix</tarLongFileMode>
-            </configuration>
-          </execution>
           <execution>
             <id>bin-assembly</id>
             <phase>package</phase>
@@ -190,4 +175,4 @@
     </plugins>
   </build>
 
-</project>
+</project>

zookeeper-assembly/src/main/assembly/source-package.xml

@@ -1,118 +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">
-<!--
-/**
- * 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>true</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>
-    <fileSet>
-      <directory>${project.basedir}/..</directory>
-      <outputDirectory>.</outputDirectory>
-      <includes>
-        <include>pom.xml</include>
-        <include>excludeFindBugsFilter.xml</include>
-        <include>owaspSuppressions.xml</include>
-        <include>checktyle.xml</include>
-        <include>checktyleSuppressions.xml</include>
-      </includes>
-      <fileMode>${rw.file.permission}</fileMode>
-    </fileSet>
-  </fileSets>
-</assembly>