zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject [zookeeper] branch branch-3.5 updated: Fix ant package target: pom.template, zooinspector
Date Fri, 15 Feb 2019 11:40:09 GMT
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 e0ffee9  Fix ant package target: pom.template, zooinspector
e0ffee9 is described below

commit e0ffee99187cacce9fc10880993c6f60a1750e08
Author: Andor Molnar <andor@apache.org>
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 <andor@apache.org>
    
    Reviewers: nkalmar@yahoo.com, eolivelli@gmail.com
    
    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 <andor@apache.org>
---
 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 183e5a2..eb7d7af 100644
--- a/build.xml
+++ b/build.xml
@@ -879,6 +879,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
           <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>
   	  
@@ -1003,6 +1006,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
           <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 7290b18..7eb5e27 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" />
 
 


Mime
View raw message