Merge remote-tracking branch 'origin/POOL_2_X' into release_2_x

Merge updated assembly descriptors.
apache · Sep 25, 2023 · 1cfcd53 · 1cfcd53
2 parents 1978939 + 2c63f76
commit 1cfcd53
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 64 deletions.
diff --git a/pool-RC.sh b/pool-RC.sh
diff --git a/src/assembly/src-tar-gz.xml b/src/assembly/src-tar-gz.xml
@@ -24,22 +24,23 @@
         <fileSet>
             <includes>
                 <include>build.xml</include>
-                <include>checkstyle.xml</include>
                 <include>LICENSE.txt</include>
-                <include>license-header.txt</include>
                 <include>NOTICE.txt</include>
                 <include>pom.xml</include>
-                <include>README.txt</include>
+                <include>README.md</include>
                 <include>RELEASE-NOTES.txt</include>
-                <include>findbugs-exclude-filter.xml</include>
-                <include>build.properties.sample</include>
+                <include>SECURITY.md</include>
             </includes>
             <lineEnding>lf</lineEnding>
         </fileSet>
         <fileSet>
             <directory>doc</directory>
             <lineEnding>lf</lineEnding>
         </fileSet>
+        <fileSet>
+            <directory>src/conf</directory>
+            <lineEnding>lf</lineEnding>
+        </fileSet>
         <fileSet>
             <directory>src/site/resources</directory>
         </fileSet>

diff --git a/src/assembly/src-zip.xml b/src/assembly/src-zip.xml
@@ -24,22 +24,23 @@
         <fileSet>
             <includes>
                 <include>build.xml</include>
-                <include>checkstyle.xml</include>
                 <include>LICENSE.txt</include>
-                <include>license-header.txt</include>
                 <include>NOTICE.txt</include>
                 <include>pom.xml</include>
-                <include>README.txt</include>
+                <include>README.md</include>
                 <include>RELEASE-NOTES.txt</include>
-                <include>findbugs-exclude-filter.xml</include>
-                <include>build.properties.sample</include>
+                <include>SECURITY.md</include>
             </includes>
             <lineEnding>crlf</lineEnding>
         </fileSet>
         <fileSet>
             <directory>doc</directory>
             <lineEnding>crlf</lineEnding>
         </fileSet>
+        <fileSet>
+            <directory>src/conf</directory>
+            <lineEnding>crlf</lineEnding>
+        </fileSet>
         <fileSet>
             <directory>src/site/resources</directory>
         </fileSet>