diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index 17126ab55..1196a7506 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -15,10 +15,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 https://maven.apache.org/xsd/assembly-1.1.0.xsd">
+<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>
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
index b4d1c3098..a42d1727e 100644
--- a/src/assembly/src.xml
+++ b/src/assembly/src.xml
@@ -15,10 +15,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 https://maven.apache.org/xsd/assembly-1.1.0.xsd">
+<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>
@@ -28,16 +27,15 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   <fileSets>
     <fileSet>
       <includes>
-        <include>.travis.yml</include>
         <include>BUILDING.txt</include>
-        <include>checkstyle*.xml</include>
+        <include>CODE_OF_CONDUCT.md</include>
         <include>CONTRIBUTING.md</include>
-        <include>findbugs-exclude-filter.xml</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
+        <include>LICENSE.txt</include>
+        <include>NOTICE.txt</include>
         <include>pom.xml</include>
-        <include>README*</include>
+        <include>README.md</include>
         <include>RELEASE-NOTES.txt</include>
+        <include>SECURITY.md</include>
       </includes>
     </fileSet>
     <fileSet>
@@ -45,4 +43,3 @@ Licensed to the Apache Software Foundation (ASF) under one or more
     </fileSet>
   </fileSets>
 </assembly>
-