Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ZOOKEEPER-3275: Fix release targets: package, tar, mvn-deploy (3.4) #818

Closed
wants to merge 3 commits into from
Closed

ZOOKEEPER-3275: Fix release targets: package, tar, mvn-deploy (3.4) #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5cc9e2
ZOOKEEPER-3275: Fix release targets: package, tar, mvn-deploy
anmolnar Feb 12, 2019
539951a
ZOOKEEPER-3275. Added some missing release audit excludes
anmolnar Feb 13, 2019
e04336f
ZOOKEEPER-3275. Fixed tiny copy-and-paste error
anmolnar Feb 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 56 additions & 47 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,12 +740,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
description="Build distribution">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/lib"/>
<mkdir dir="${dist.dir}/contrib"/>
<mkdir dir="${dist.dir}/recipes"/>
<mkdir dir="${dist.dir}/bin"/>
<mkdir dir="${dist.dir}/docs"/>
<mkdir dir="${dist.dir}/docs/jdiff"/>
<mkdir dir="${dist.dir}/docs/api"/>

<copy todir="${dist.dir}/lib" includeEmptyDirs="false">
<fileset dir="${lib.dir}">
Expand Down Expand Up @@ -809,7 +804,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
<fileset dir="${conf.dir}" excludes="**/*.template"/>
</copy>

<copy todir="${dist.dir}/docs">
<copy todir="${dist.dir}/zookeeper-docs">
<fileset dir="zookeeper-docs/src/main/resources/markdown/" includes="**">
<exclude name="html/**" />
</fileset>
Expand All @@ -825,23 +820,25 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
<fileset file="ivysettings.xml"/>
<fileset file="${java.server.resources.dir}/NOTICE.txt"/>
<fileset file="${java.server.resources.dir}/LICENSE.txt"/>
<fileset file="pom.xml"/>
</copy>

<copy todir="${dist.dir}/src" includeEmptyDirs="true">
<copy todir="${dist.dir}" includeEmptyDirs="true">
<fileset dir="${basedir}" excludes="**/*.template **/docs/build/**/* **/ivy*.jar">
<include name="zookeeper-recipes/**"/>
<include name="zookeeper-docs/**"/>
<include name="zookeeper-contrib/**"/>
<include name="zookeeper-client/**"/>
<include name="zookeeper-jute/**"/>
<include name="zookeeper-server/**"/>
<include name="zookeeper-it/**"/>
</fileset>
<fileset file="${java.server.resources.dir}/pom.template"/>
</copy>

<chmod perm="ugo+x" type="file" parallel="false">
<fileset dir="${dist.dir}/bin"/>
<fileset dir="${dist.dir}/src/zookeeper-contrib/">
<fileset dir="${dist.dir}/zookeeper-contrib/">
<include name="*/bin/*" />
</fileset>
</chmod>
Expand All @@ -857,9 +854,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
<mkdir dir="${dist.dir}/share/zookeeper/contrib"/>
<mkdir dir="${dist.dir}/share/zookeeper/recipes"/>
<mkdir dir="${dist.dir}/bin"/>
<mkdir dir="${dist.dir}/docs"/>
<mkdir dir="${dist.dir}/docs/jdiff"/>
<mkdir dir="${dist.dir}/docs/api"/>
<mkdir dir="${dist.dir}/share/zookeeper/templates/conf"/>
<mkdir dir="${dist.dir}/sbin"/>

Expand Down Expand Up @@ -955,8 +949,16 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
<fileset file="${java.server.resources.dir}/LICENSE.txt"/>
</copy>

<copy todir="${dist.dir}/src" includeEmptyDirs="true">
<fileset dir="src" excludes="**/*.template **/docs/build/**/* **/ivy*.jar"/>
<copy todir="${dist.dir}" includeEmptyDirs="true">
<fileset dir="${basedir}" excludes="**/*.template **/docs/build/**/* **/ivy*.jar">
<include name="zookeeper-recipes/**"/>
<include name="zookeeper-docs/**"/>
<include name="zookeeper-contrib/**"/>
<include name="zookeeper-client/**"/>
<include name="zookeeper-jute/**"/>
<include name="zookeeper-server/**"/>
<include name="zookeeper-it/**"/>
</fileset>
<fileset file="${java.server.resources.dir}/pom.template"/>
</copy>

Expand All @@ -973,7 +975,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
<chmod perm="ugo+x" type="file" parallel="false">
<fileset dir="${dist.dir}/bin"/>
<fileset dir="${dist.dir}/sbin"/>
<fileset dir="${dist.dir}/contrib/">
<fileset dir="${dist.dir}/zookeeper-contrib/">
<include name="**/*.sh" />
<include name="**/*.py" />
</fileset>
Expand All @@ -990,7 +992,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
however that's the only way ant currently supports afaik -->
<tarfileset dir="${build.dir}" mode="664">
<exclude name="${final.name}/bin/*" />
<exclude name="${final.name}/contrib/*/bin/*" />
<exclude name="${final.name}/zookeeper-contrib/*/bin/*" />

<exclude name="${final.name}/**/compile" />
<exclude name="${final.name}/**/config.guess" />
Expand All @@ -1008,7 +1010,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
<tarfileset dir="${build.dir}" mode="755">
<!-- be sure to add to exclude list above if you add here -->
<include name="${final.name}/bin/*" />
<include name="${final.name}/contrib/*/bin/*" />
<include name="${final.name}/zookeeper-contrib/*/bin/*" />

<!-- autotools related commands -->
<include name="${final.name}/**/compile" />
Expand Down Expand Up @@ -1779,6 +1781,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
<target name="releaseaudit" depends="package,rats-taskdef" description="Release Audit activities">
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks">
<fileset dir="${dist.dir}">
<exclude name="**/*.cer"/>
<exclude name="**/*.m4"/>
<exclude name="**/*.md5"/>
<exclude name="**/*.pom"/>
Expand All @@ -1799,44 +1802,50 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
<exclude name="CHANGES.txt"/>
<exclude name="**/README.md"/>
<exclude name="README_packaging.txt"/>
<exclude name="**/TODO"/>
<exclude name="**/VERSION"/>
<exclude name="**/ChangeLog"/>
<exclude name="**/Changes"/>
<exclude name="**/contrib/zkperl/MANIFEST"/>
<exclude name="**/zookeeper-contrib/zookeeper-contrib-zkperl/MANIFEST"/>
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/date.format.js"/>
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.bar.js"/>
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.dot.js"/>
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.line.js"/>
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.pie.js"/>
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js"/>
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js"/>
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/yui-min.js"/>
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/date.format.js"/>
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.bar.js"/>
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.dot.js"/>
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.line.js"/>
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.pie.js"/>
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js"/>
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js"/>
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/yui-min.js"/>
<exclude name="src/zookeeper-contrib/zookeeper-contrib-monitoring/JMX-RESOURCES"/>
<exclude name="src/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java"/>
<exclude name="src/zookeeper-contrib/zookeeper-contrib-fatjar/src/main/resources/mainClasses"/>
<exclude name="contrib/ZooInspector/licences/epl-v10.html"/>
<exclude name="**/conf/*"/>
<exclude name="**/docs/"/>
<exclude name="**/zookeeper-docs/"/>
<exclude name="**/lib/jdiff/"/>
<exclude name="src/zookeeper-client/zookeeper-client-c/autom4te.cache/**"/>
<exclude name="src/zookeeper-client/zookeeper-client-c/config**"/>
<exclude name="src/zookeeper-client/zookeeper-client-c/src/hashtable/"/>
<exclude name="src/zookeeper-jute/target/main/java/.generated/"/>
<exclude name="src/zookeeper-server/src/test/resources/checkstyle*.xml"/>
<exclude name="src/zookeeper-server/src/test/resources/checkstyle*.xsl"/>
<exclude name="src/zookeeper-server/src/test/resources/findbugs*.xml"/>
<exclude name="src/**/*.vcproj"/>
<exclude name="src/**/*.sln"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-ZooInspector/src/main/java/com/nitido/utils/toaster/Toaster.java"/>
<exclude name="zookeeper-client/zookeeper-client-c/*.la"/>
<exclude name="zookeeper-client/zookeeper-client-c/*.lo"/>
<exclude name="zookeeper-client/zookeeper-client-c/.libs/"/>
<exclude name="zookeeper-client/zookeeper-client-c/autom4te.cache/**"/>
<exclude name="zookeeper-client/zookeeper-client-c/config**"/>
<exclude name="zookeeper-client/zookeeper-client-c/include/winstdint.h"/>
<exclude name="zookeeper-client/zookeeper-client-c/src/hashtable/"/>
<exclude name="zookeeper-client/zookeeper-client-c/test-driver"/>
<exclude name="zookeeper-client/zookeeper-client-c/tests/quorum.cfg"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/date.format.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.bar.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.dot.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.line.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.pie.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/yui-min.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/date.format.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.bar.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.dot.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.line.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.pie.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/yui-min.js"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-monitoring/JMX-RESOURCES"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java"/>
<exclude name="zookeeper-contrib/zookeeper-contrib-fatjar/src/main/resources/mainClasses"/>
<exclude name="zookeeper-jute/target/main/java/.generated/"/>
<exclude name="zookeeper-server/src/test/resources/checkstyle*.xml"/>
<exclude name="zookeeper-server/src/test/resources/checkstyle*.xsl"/>
<exclude name="zookeeper-server/src/test/resources/findbugs*.xml"/>
<exclude name="**/*.vcproj"/>
<exclude name="**/*.vcxproj*"/>
<exclude name="**/*.sln"/>
</fileset>
</rat:report>
</target>
Expand Down
6 changes: 3 additions & 3 deletions zookeeper-contrib/build-contrib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<property name="lib.dir" location="${zk.root}/zookeeper-server/src/main/resources/lib"/>

<property name="build.dir" location="${zk.root}/build/contrib/${name}"/>
<property name="build.dir" location="${zk.root}/build/zookeeper-contrib/zookeeper-contrib-${name}"/>
<property name="build.classes" location="${build.dir}/classes"/>
<property name="build.test" location="${build.dir}/test"/>

Expand Down Expand Up @@ -144,8 +144,8 @@
<target name="package" depends="jar" unless="skip.contrib">
<echo message="contrib: ${name}"/>

<mkdir dir="${dist.dir}${package.share}/contrib/${name}"/>
<copy todir="${dist.dir}${package.share}/contrib/${name}" includeEmptyDirs="false"
<mkdir dir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}"/>
<copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}" includeEmptyDirs="false"
flatten="true">
<fileset dir="${build.dir}">
<include name="zookeeper-${version}-${name}.jar" />
Expand Down
10 changes: 5 additions & 5 deletions zookeeper-contrib/zookeeper-contrib-fatjar/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@
<target name="package" depends="jar, zookeeperbuildcontrib.package"
unless="skip.contrib">

<copy file="${basedir}/build.xml" todir="${dist.dir}/contrib/${name}"/>
<copy file="${basedir}/build.xml" todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>

<mkdir dir="${dist.dir}/contrib/${name}/conf"/>
<copy todir="${dist.dir}/contrib/${name}/conf">
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/conf"/>
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/conf">
<fileset dir="${basedir}/src/main/resources"/>
</copy>

<mkdir dir="${dist.dir}/contrib/${name}/src"/>
<copy todir="${dist.dir}/contrib/${name}/src">
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src"/>
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src">
<fileset dir="${basedir}/src"/>
</copy>
</target>
Expand Down
6 changes: 3 additions & 3 deletions zookeeper-contrib/zookeeper-contrib-loggraph/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
<target name="package" depends="compile, zookeeperbuildcontrib.package" unless="skip.contrib">
<echo message="contrib: ${name}"/>

<copy file="${basedir}/build.xml" todir="${dist.dir}/contrib/${name}"/>
<copy file="${basedir}/build.xml" todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>

<mkdir dir="${dist.dir}/contrib/${name}/src"/>
<copy todir="${dist.dir}/contrib/${name}/src">
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src"/>
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src">
<fileset dir="${basedir}/src/main"/>
</copy>

Expand Down
8 changes: 4 additions & 4 deletions zookeeper-contrib/zookeeper-contrib-rest/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@

<target name="package" depends="jar" unless="skip.contrib">
<echo message="contrib: ${name}"/>
<mkdir dir="${dist.dir}${package.share}/contrib/${name}"/>
<copy todir="${dist.dir}${package.share}/contrib/${name}">
<mkdir dir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}"/>
<copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}">
<fileset dir="${build.dir}">
<include name="zookeeper-${version}-${name}.jar" />
</fileset>
</copy>
<copy todir="${dist.dir}${package.share}/contrib/${name}/lib">
<copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}/lib">
<fileset dir="${build.dir}/lib" />
</copy>
<copy todir="${dist.dir}${package.share}/contrib/${name}/conf">
<copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}/conf">
<fileset dir="conf" />
</copy>
</target>
Expand Down
4 changes: 2 additions & 2 deletions zookeeper-contrib/zookeeper-contrib-zkfuse/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
<target name="package" depends="compile" unless="skip.contrib">
<echo message="contrib: ${name}"/>

<mkdir dir="${dist.dir}/contrib/${name}"/>
<copy todir="${dist.dir}/contrib/${name}">
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
<fileset dir="${build.dir}"/>
</copy>
</target>
Expand Down
4 changes: 2 additions & 2 deletions zookeeper-contrib/zookeeper-contrib-zkperl/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
<target name="package" depends="compile" unless="skip.contrib">
<echo message="contrib: ${name}"/>

<mkdir dir="${dist.dir}/contrib/${name}"/>
<copy todir="${dist.dir}/contrib/${name}">
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
<fileset dir="${build.dir}"/>
</copy>
</target>
Expand Down
4 changes: 2 additions & 2 deletions zookeeper-contrib/zookeeper-contrib-zkpython/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@
<arg line="${version}" />
</exec>

<mkdir dir="${dist.dir}/contrib/${name}"/>
<copy todir="${dist.dir}/contrib/${name}">
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
<fileset dir="${build.dir}">
<exclude name="**/temp*"/>
</fileset>
Expand Down
4 changes: 2 additions & 2 deletions zookeeper-contrib/zookeeper-contrib-zktreeutil/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
<target name="package" depends="compile" unless="skip.contrib">
<echo message="contrib: ${name}"/>

<mkdir dir="${dist.dir}/contrib/${name}"/>
<copy todir="${dist.dir}/contrib/${name}">
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
<fileset dir="${build.dir}"/>
</copy>
</target>
Expand Down
Loading