Browse Source

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
Andor Molnar 6 years ago
parent
commit
a7b00ed477
2 changed files with 7 additions and 1 deletions
  1. 6 0
      build.xml
  2. 1 1
      zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml

+ 6 - 0
build.xml

@@ -886,6 +886,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>
   	  
@@ -1010,6 +1013,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>
 

+ 1 - 1
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" />