Merge branch '112-branch'

Conflicts:
        src/changes/changes.xml

LANG-1175: Remove Ant-based build
This closes #112 from github. Thanks to wikier@.


Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/242e1f54
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/242e1f54
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/242e1f54

Branch: refs/heads/master
Commit: 242e1f5498c9e02f64643ef1c5a9e939e642514d
Parents: 69e97c8 c786009
Author: Hen <h...@flamefew.com>
Authored: Thu Feb 25 20:58:23 2016 -0800
Committer: Hen <h...@flamefew.com>
Committed: Thu Feb 25 20:58:23 2016 -0800

----------------------------------------------------------------------
 .gitignore                                |   3 +-
 build.properties.sample                   |  28 ---
 build.xml                                 | 233 -------------------------
 default.properties                        |  90 ----------
 src/assembly/src.xml                      |   3 -
 src/changes/changes.xml                   |   1 +
 src/release-tools/build.properties.sample |  25 ---
 src/release-tools/build.xml               | 161 -----------------
 8 files changed, 3 insertions(+), 541 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-lang/blob/242e1f54/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index 2b2d53c,f73c2e0..c981921
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -22,16 -22,7 +22,17 @@@
    <body>
  
    <release version="3.5" date="tba" description="tba">
+     <action issue="LANG-1175" type="fix" dev="wikier" due-to="Benedikt 
Ritter">Remove Ant-based build</action>
 +    <action issue="LANG-1192" type="add" dev="chas" due-to="Dominik 
Stadler">FastDateFormat support of the week-year component (uppercase 
'Y')</action>
 +    <action issue="LANG-1194" type="fix" dev="chas">Limit max heap memory for 
consistent Travis CI build</action>
 +    <action issue="LANG-1186" type="fix" dev="chas" due-to="NickManley">Fix 
NullPointerException in FastDateParser$TimeZoneStrategy</action>
 +    <action issue="LANG-1193" type="fix" dev="sebb" due-to="Qin 
Li">ordinalIndexOf("abc", "ab", 1) gives incorrect answer of -1 (correct answer 
should be 0); revert fix for LANG-1077</action>
 +    <action issue="LANG-1182" type="update" dev="britter" due-to="Larry West, 
Pascal Schumacher">Clarify JavaDoc of StringUtils.containsAny()</action>
 +    <action issue="LANG-1169" type="add" dev="lguibert" due-to="Rafal 
Glowinski, Robert Parr, Arman Sharif">Add StringUtils methods to compare a 
string to multiple strings</action>
 +    <action issue="LANG-1185" type="add" dev="lguibert">Add remove by regular 
expression methods in StringUtils</action>
 +    <action issue="LANG-1183" type="update" dev="lguibert">Making 
replacePattern/removePattern methods null safe in StringUtils</action>
 +    <action issue="LANG-1139" type="add" dev="lguibert">Add replace by 
regular expression methods in StringUtils</action>
 +    <action issue="LANG-1171" type="add" dev="lguibert">Add compare methods 
in StringUtils</action>
      <action issue="LANG-1174" type="add" dev="britter" 
due-to="Punkratz312">Add sugar to RandomUtils</action>
      <action issue="LANG-1057" type="update" dev="chas" due-to="Otávio 
Santana">Replace StringBuilder with String concatenation for better 
optimization</action>
      <action issue="LANG-1075" type="update" dev="chas">Deprecate 
SystemUtils.FILE_SEPARATOR and SystemUtils.PATH_SEPARATOR</action>

Reply via email to