diff --git a/pom.xml b/pom.xml
index fae7a8ef1f..c9100d931f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,8 +195,7 @@
             <configuration>
               <descriptors>
                 <descriptor>src/assembly/bin.xml</descriptor>
-                <descriptor>src/assembly/src-tar-gz.xml</descriptor>
-                <descriptor>src/assembly/src-zip.xml</descriptor>
+                <descriptor>src/assembly/src.xml</descriptor>
               </descriptors>
               <tarLongFileMode>gnu</tarLongFileMode>
             </configuration>
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index 0a598cb5f4..327a457976 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -14,34 +14,33 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
-    <id>bin</id>
-    <formats>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
-    <includeSiteDirectory>false</includeSiteDirectory>
-    <fileSets>
-        <fileSet>
-            <includes>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
-                <include>RELEASE-NOTES.txt</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-        <fileSet>
-            <directory>target/site/apidocs</directory>
-            <outputDirectory>apidocs</outputDirectory>
-        </fileSet>
-    </fileSets>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
+  <id>bin</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <includeSiteDirectory>false</includeSiteDirectory>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>LICENSE.txt</include>
+        <include>NOTICE.txt</include>
+        <include>RELEASE-NOTES.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+      <fileMode>644</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>target/site/apidocs</directory>
+      <outputDirectory>apidocs</outputDirectory>
+    </fileSet>
+  </fileSets>
 </assembly>
diff --git a/src/assembly/src-tar-gz.xml b/src/assembly/src-tar-gz.xml
deleted file mode 100644
index e34c0794e2..0000000000
--- a/src/assembly/src-tar-gz.xml
+++ /dev/null
@@ -1,71 +0,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.
--->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
-    <id>src</id>
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-    <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
-    <fileSets>
-        <fileSet>
-            <includes>
-                <include>LICENSE.txt</include>
-                <include>license-header.txt</include>
-                <include>NOTICE.txt</include>
-                <include>pom.xml</include>
-                <include>README.txt</include>
-                <include>RELEASE-NOTES.txt</include>
-            </includes>
-            <lineEnding>lf</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>doc</directory>
-            <lineEnding>lf</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>src/site/resources</directory>
-        </fileSet>
-        <fileSet>
-            <directory>src/site/xdoc</directory>
-            <lineEnding>lf</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>src/site</directory>
-            <includes>
-              <include>site.xml</include>
-            </includes>
-            <lineEnding>lf</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>src/changes</directory>
-            <lineEnding>lf</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>src/main</directory>
-            <lineEnding>lf</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>src/test/java</directory>
-            <lineEnding>lf</lineEnding>
-        </fileSet> 
-        <fileSet>
-            <directory>src/test/resources</directory>
-        </fileSet> 
-    </fileSets>
-</assembly>
diff --git a/src/assembly/src-zip.xml b/src/assembly/src-zip.xml
deleted file mode 100644
index 60f54727ae..0000000000
--- a/src/assembly/src-zip.xml
+++ /dev/null
@@ -1,71 +0,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.
--->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
-    <id>src</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
-    <fileSets>
-        <fileSet>
-            <includes>
-                <include>LICENSE.txt</include>
-                <include>license-header.txt</include>
-                <include>NOTICE.txt</include>
-                <include>pom.xml</include>
-                <include>README.txt</include>
-                <include>RELEASE-NOTES.txt</include>
-            </includes>
-            <lineEnding>crlf</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>doc</directory>
-            <lineEnding>crlf</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>src/site/resources</directory>
-        </fileSet>
-        <fileSet>
-            <directory>src/site/xdoc</directory>
-            <lineEnding>crlf</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>src/site</directory>
-            <includes>
-              <include>site.xml</include>
-            </includes>
-            <lineEnding>crlf</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>src/changes</directory>
-            <lineEnding>crlf</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>src/main</directory>
-            <lineEnding>crlf</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>src/test/java</directory>
-            <lineEnding>crlf</lineEnding>
-        </fileSet> 
-        <fileSet>
-            <directory>src/test/resources</directory>
-        </fileSet> 
-    </fileSets>
-</assembly>
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
new file mode 100644
index 0000000000..25bc90cca7
--- /dev/null
+++ b/src/assembly/src.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<assembly
+  xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
+  <id>src</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>BUILDING.txt</include>
+        <include>CODE_OF_CONDUCT.md</include>
+        <include>CONTRIBUTING.md</include>
+        <include>LICENSE.txt</include>
+        <include>NOTICE.txt</include>
+        <include>pom.xml</include>
+        <include>README.md</include>
+        <include>RELEASE-NOTES.txt</include>
+        <include>SECURITY.md</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src</directory>
+    </fileSet>
+  </fileSets>
+</assembly>