Author: michim
Date: Sun May 24 06:37:32 2015
New Revision: 1681418
URL: http://svn.apache.org/r1681418
Log:
ZOOKEEPER-2124 Allow Zookeeper version string to have underscore '_' (Chris
Nauroth via michim)
Modified:
zookeeper/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/build.xml
zookeeper/branches/branch-3.4/src/contrib/zkpython/build.xml
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1681418&r1=1681417&r2=1681418&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Sun May 24 06:37:32 2015
@@ -97,6 +97,9 @@ IMPROVEMENTS:
ZOOKEEPER-2126 Improve exit log messsage of EventThread and SendThread by
adding SessionId (surendra singh lilhore via rakeshr)
+ ZOOKEEPER-2124 Allow Zookeeper version string to have underscore '_'
+ (Chris Nauroth via michim)
+
Release 3.4.6 - 2014-03-10
Backward compatible changes:
Modified: zookeeper/branches/branch-3.4/build.xml
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/build.xml?rev=1681418&r1=1681417&r2=1681418&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/build.xml (original)
+++ zookeeper/branches/branch-3.4/build.xml Sun May 24 06:37:32 2015
@@ -981,10 +981,21 @@ xmlns:maven="antlib:org.apache.maven.art
</target>
<target name="rpm" depends="package-native, tar" description="Make rpm
package">
+ <!--The RPM spec file format disallows hyphen in the version. Replace
with
+ underscore to support version tags like -alpha or -SNAPSHOT.-->
+ <loadresource property="rpm.version">
+ <propertyresource name="version" />
+ <filterchain>
+ <tokenfilter>
+ <replacestring from="-" to="_" />
+ </tokenfilter>
+ </filterchain>
+ </loadresource>
<subant target="rpm">
<!--Pass down the version in case its needed again and the target
distribution directory so contribs know where to install to.-->
<property name="version" value="${version}"/>
+ <property name="rpm.version" value="${rpm.version}"/>
<property name="dist.dir" value="${dist.dir}"/>
<fileset file="${contrib.dir}/build.xml"/>
<fileset file="${recipes.dir}/build.xml"/>
@@ -1010,7 +1021,7 @@ xmlns:maven="antlib:org.apache.maven.art
<filterchain>
<replacetokens>
<token key="final.name" value="${final.name}" />
- <token key="version" value="${version}" />
+ <token key="version" value="${rpm.version}" />
<token key="package.release" value="${package.release}" />
<token key="package.build.dir" value="${package.build.dir}" />
<token key="package.prefix" value="${package.prefix}" />
Modified: zookeeper/branches/branch-3.4/src/contrib/zkpython/build.xml
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/contrib/zkpython/build.xml?rev=1681418&r1=1681417&r2=1681418&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/zkpython/build.xml (original)
+++ zookeeper/branches/branch-3.4/src/contrib/zkpython/build.xml Sun May 24
06:37:32 2015
@@ -132,7 +132,7 @@
<filterchain>
<replacetokens>
<token key="final.name" value="${name}" />
- <token key="version" value="${version}" />
+ <token key="version" value="${rpm.version}" />
<token key="package.release" value="${package.release}" />
<token key="package.build.dir" value="${package.build.dir}" />
<token key="package.prefix" value="${package.prefix}" />
