You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ps...@apache.org on 2023/09/25 19:37:40 UTC
[commons-pool] branch POOL_2_X updated: Update assembly descriptors to drop no longer existing files and include src/conf so the site can be built from the source distro.
This is an automated email from the ASF dual-hosted git repository.
psteitz pushed a commit to branch POOL_2_X
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
The following commit(s) were added to refs/heads/POOL_2_X by this push:
new 2c63f76f Update assembly descriptors to drop no longer existing files and include src/conf so the site can be built from the source distro.
2c63f76f is described below
commit 2c63f76f634bd692d38dcdfbfbcb49c1ae2aa18f
Author: Phil Steitz <ph...@gmail.com>
AuthorDate: Mon Sep 25 12:37:32 2023 -0700
Update assembly descriptors to drop no longer existing files and include src/conf so the site can be built from the source distro.
---
src/assembly/src-tar-gz.xml | 11 ++++++-----
src/assembly/src-zip.xml | 11 ++++++-----
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/assembly/src-tar-gz.xml b/src/assembly/src-tar-gz.xml
index b2b9bfcd..909892a8 100644
--- a/src/assembly/src-tar-gz.xml
+++ b/src/assembly/src-tar-gz.xml
@@ -24,15 +24,12 @@
<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>
@@ -40,6 +37,10 @@
<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
index 5fafe189..7819dced 100644
--- a/src/assembly/src-zip.xml
+++ b/src/assembly/src-zip.xml
@@ -24,15 +24,12 @@
<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>
@@ -40,6 +37,10 @@
<directory>doc</directory>
<lineEnding>crlf</lineEnding>
</fileSet>
+ <fileSet>
+ <directory>src/conf</directory>
+ <lineEnding>crlf</lineEnding>
+ </fileSet>
<fileSet>
<directory>src/site/resources</directory>
</fileSet>