This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new b1f2804 ZOOKEEPER-3122: fix files included in tarballs
b1f2804 is described below
commit b1f2804aae765bfb849a2a688ad11b0f9bf4dfe2
Author: Norbert Kalmar <[email protected]>
AuthorDate: Tue Apr 9 10:12:11 2019 +0200
ZOOKEEPER-3122: fix files included in tarballs
Author: Norbert Kalmar <[email protected]>
Reviewers: [email protected]
Closes #897 from nkalmar/ZK-3122
(cherry picked from commit 1e8286faed13e8d8abb2d5205f99440853e4b47d)
Signed-off-by: Andor Molnar <[email protected]>
---
.../src/main/assembly/bin-package.xml | 43 +---------------------
.../src/main/assembly/source-package.xml | 28 +++++++-------
2 files changed, 14 insertions(+), 57 deletions(-)
diff --git a/zookeeper-assembly/src/main/assembly/bin-package.xml
b/zookeeper-assembly/src/main/assembly/bin-package.xml
index 9048212..0a4bf9a 100644
--- a/zookeeper-assembly/src/main/assembly/bin-package.xml
+++ b/zookeeper-assembly/src/main/assembly/bin-package.xml
@@ -35,9 +35,6 @@
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
<include>org.apache.zookeeper:zookeeper</include>
- <include>org.apache.zookeeper:zookeeper-recipes-election</include>
- <include>org.apache.zookeeper:zookeeper-recipes-lock</include>
- <include>org.apache.zookeeper:zookeeper-recipes-queue</include>
</includes>
<binaries>
@@ -73,44 +70,6 @@
<outputDirectory>lib</outputDirectory>
<fileMode>${rw.file.permission}</fileMode>
</fileSet>
-
- <!-- Add source jars "manually", as the :source classiffier doesn't work
in moduleSets -->
- <fileSet>
- <directory>${project.basedir}/../zookeeper-server/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>zookeeper-*-sources.jar</include>
- </includes>
- </fileSet>
- <fileSet>
-
<directory>${project.basedir}/../zookeeper-recipes/zookeeper-recipes-election/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>zookeeper-*-sources.jar</include>
- </includes>
- </fileSet>
- <fileSet>
-
<directory>${project.basedir}/../zookeeper-recipes/zookeeper-recipes-lock/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>zookeeper-*-sources.jar</include>
- </includes>
- </fileSet>
- <fileSet>
-
<directory>${project.basedir}/../zookeeper-recipes/zookeeper-recipes-queue/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>zookeeper-*-sources.jar</include>
- </includes>
- </fileSet>
</fileSets>
- <files>
- <file>
-
<source>${project.basedir}/../zookeeper-server/src/main/resources/lib/cobertura/README.txt</source>
- <outputDirectory>lib/cobertura</outputDirectory>
- <fileMode>${rw.file.permission}</fileMode>
- </file>
- </files>
-
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/zookeeper-assembly/src/main/assembly/source-package.xml
b/zookeeper-assembly/src/main/assembly/source-package.xml
index 2c405ee..9a0f2a9 100644
--- a/zookeeper-assembly/src/main/assembly/source-package.xml
+++ b/zookeeper-assembly/src/main/assembly/source-package.xml
@@ -102,19 +102,17 @@
<fileMode>${rw.file.permission}</fileMode>
<directoryMode>${rwx.file.permission}</directoryMode>
</fileSet>
- </fileSets>
- <files>
- <file>
- <source>${project.basedir}/../pom.xml</source>
- <fileMode>${rw.file.permission}</fileMode>
- </file>
- <file>
- <source>${project.basedir}/src/main/assembly/source-package.xml</source>
- <fileMode>${rw.file.permission}</fileMode>
- </file>
- <file>
- <source>${project.basedir}/src/main/assembly/bin-package.xml</source>
+ <fileSet>
+ <directory>${project.basedir}/..</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>build.xml</include>
+ <include>ivy.xml</include>
+ <include>ivysettings.xml</include>
+ <include>excludeFindBugsFilter.xml</include>
+ <include>owaspSuppressions.xml</include>
+ </includes>
<fileMode>${rw.file.permission}</fileMode>
- </file>
- </files>
-</assembly>
\ No newline at end of file
+ </fileSet>
+ </fileSets>
+</assembly>
