This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new e22883c Fix ant package target: pom.template, zooinspector
e22883c is described below
commit e22883c6d2f6e9068e2105fc072d9b6a39ac9a2d
Author: Andor Molnar <[email protected]>
AuthorDate: Fri Feb 15 12:39:38 2019 +0100
Fix ant package target: pom.template, zooinspector
Quick fix for the release process.
Author: Andor Molnar <[email protected]>
Reviewers: [email protected], [email protected]
Closes #821 from anmolnar/fix_package and squashes the following commits:
170acfd2d [Andor Molnar] Added copy pom.template task to bin-package target
fe0b95b46 [Andor Molnar] Fix ant package target: pom.template, zooinspector
(cherry picked from commit a7b00ed47784f101cbd38efaecb89192ae9d3344)
Signed-off-by: Andor Molnar <[email protected]>
---
build.xml | 6 ++++++
zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index f1897a4..e7bfacb 100644
--- a/build.xml
+++ b/build.xml
@@ -833,6 +833,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
<include name="zookeeper-server/**"/>
<include name="zookeeper-it/**"/>
</fileset>
+ </copy>
+
+ <copy todir="${dist.dir}/zookeeper-server/src/main/resources">
<fileset file="${java.server.resources.dir}/pom.template"/>
</copy>
@@ -959,6 +962,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
<include name="zookeeper-server/**"/>
<include name="zookeeper-it/**"/>
</fileset>
+ </copy>
+
+ <copy todir="${dist.dir}/zookeeper-server/src/main/resources">
<fileset file="${java.server.resources.dir}/pom.template"/>
</copy>
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml
b/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml
index faa0b34..2bc1448 100644
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<project name="ZooInspector" default="jar">
+<project name="zooinspector" default="jar">
<import file="../build-contrib.xml" />
