You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by nk...@apache.org on 2020/02/10 07:13:34 UTC
[zookeeper] branch branch-3.5.7 updated: ZOOKEEPER-3718: The
tarball generated by assembly is missing some files
This is an automated email from the ASF dual-hosted git repository.
nkalmar pushed a commit to branch branch-3.5.7
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.5.7 by this push:
new bc85887 ZOOKEEPER-3718: The tarball generated by assembly is missing some files
bc85887 is described below
commit bc85887bbe3ad829212cf7cf0e2dac38fb00e03f
Author: Norbert Kalmar <nk...@yahoo.com>
AuthorDate: Mon Feb 10 08:13:05 2020 +0100
ZOOKEEPER-3718: The tarball generated by assembly is missing some files
There were missing files from the generated source tarball, namely:
-checkstyleSuppressions.xml, .travis.yml and "dev" directory missing
-the generated jute was included with the C client code
Author: Norbert Kalmar <nk...@yahoo.com>
Reviewers: Enrico Olivelli <eo...@apache.org>
Closes #1250 from nkalmar/ZOOKEEPER-3718
(cherry picked from commit 24240107d0d6cdf8ab9a676b74a48b4e7663bbed)
Signed-off-by: Norbert Kalmar <nk...@apache.org>
---
zookeeper-assembly/src/main/assembly/source-package.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/zookeeper-assembly/src/main/assembly/source-package.xml b/zookeeper-assembly/src/main/assembly/source-package.xml
index 1978afb..7140424 100644
--- a/zookeeper-assembly/src/main/assembly/source-package.xml
+++ b/zookeeper-assembly/src/main/assembly/source-package.xml
@@ -41,6 +41,7 @@
<directory>${project.basedir}/../zookeeper-client</directory>
<excludes>
<exclude>**/target/**</exclude>
+ <exclude>**/generated/**</exclude>
</excludes>
<outputDirectory>zookeeper-client</outputDirectory>
</fileSet>
@@ -87,6 +88,10 @@
<outputDirectory>zookeeper-server</outputDirectory>
</fileSet>
<fileSet>
+ <directory>${project.basedir}/../dev</directory>
+ <outputDirectory>dev</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>${project.basedir}/..</directory>
<outputDirectory>.</outputDirectory>
<includes>
@@ -97,7 +102,8 @@
<include>excludeFindBugsFilter.xml</include>
<include>owaspSuppressions.xml</include>
<include>checktyle.xml</include>
- <include>checktyleSuppressions.xml</include>
+ <include>checkstyleSuppressions.xml</include>
+ <include>.travis.yml</include>
</includes>
</fileSet>
</fileSets>