You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2015/05/01 23:57:07 UTC
[11/11] [lang] Merge branch 'branch-3.4-fix-json-style-rebase'
Merge branch 'branch-3.4-fix-json-style-rebase'
LANG-1128: JsonToStringStyle doesn't handle chars and objects correctly.
This also fixes #74 from github. Thanks to github user jacktan1991.
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/4a882e76
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/4a882e76
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/4a882e76
Branch: refs/heads/master
Commit: 4a882e76d9c9940ac561e8f17ede77c85e3dbeda
Parents: 1cf8af4 e8db723
Author: Benedikt Ritter <br...@apache.org>
Authored: Fri May 1 23:55:25 2015 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Fri May 1 23:55:25 2015 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 1 +
.../commons/lang3/builder/ToStringStyle.java | 32 +++++++--
.../lang3/builder/JsonToStringStyleTest.java | 72 ++++++++++++++++++++
3 files changed, 101 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4a882e76/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index 1ecfd8f,28e8947..4e5e15a
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -22,12 -22,7 +22,13 @@@
<body>
<release version="3.5" date="tba" description="tba">
+ <action issue="LANG-1128" type="fix" dev="britter" due-to="jacktan1991">JsonToStringStyle doesn't handle chars and objects correctly</action>
+ <action issue="LANG-456" type="fix" dev="britter" due-to="Bob Fields, Woosan Ko, Bruno P. Kinoshita">HashCodeBuilder throws StackOverflowError in bidirectional navigable association</action>
+ <action issue="LANG-1126" type="fix" dev="britter">DateFormatUtilsTest.testSMTP depends on the default Locale</action>
+ <action issue="LANG-1123" type="fix" dev="chas" due-to="Christian P. Momon">Unit test FastDatePrinterTimeZonesTest needs a timezone set</action>
+ <action issue="LANG-916" type="fix" dev="chas" due-to="Christian P. Momon">CLONE - DateFormatUtils.format does not correctly change Calendar TimeZone in certain situations</action>
+ <action issue="LANG-1116" type="fix" dev="chas" due-to="Aaron Sheldon">DateUtilsTest.testLang530 fails for some timezones</action>
+ <action issue="LANG-1114" type="fix" dev="britter" due-to="Andy Coates">TypeUtils.ParameterizedType#equals doesn't work with wildcard types</action>
<action issue="LANG-1119" type="add" dev="britter" due-to="Loic Guibert">Add rotate(string, int) method to StringUtils</action>
<action issue="LANG-1118" type="fix" dev="britter" due-to="Loic Guibert">StringUtils.repeat('z', -1) throws NegativeArraySizeException</action>
<action issue="LANG-1099" type="add" dev="britter" due-to="Adrian Ber">Add swap and shift operations for arrays to ArrayUtils</action>