groovy-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jochen Theodorou <blackd...@gmx.org>
Subject Re: 2_4_X branch question
Date Fri, 11 Dec 2015 07:56:11 GMT
The general policy I use is:

(1) only bug fixes into the maintanance branch
(2) no new features
(3) if a bugfix is interconnected with a new feature such that it really 
does not make sense to have those divided and this will not cause any 
breaking changes, then this is an exception and can go into the branch


bye blackdrag

Am 10.12.2015 um 22:17 schrieb John Wagenleitner:
> Then I should mention that the recent PR 203 "Support for Array and
> Iterable not just Collection in JsonBuilder" [1] submitted I merged only
> into master since it was an enhancement.  Depending on how the other
> open PR's are handled this may need to be revisited.
>
> [1] https://github.com/apache/groovy/pull/203
>
> On Thu, Dec 10, 2015 at 1:05 PM, Graeme Rocher <graeme.rocher@gmail.com
> <mailto:graeme.rocher@gmail.com>> wrote:
>
>     FWIW these are non-breaking additions that I would appreciate going
>     into 2.4.6 as 2.5.x might not be out for a while.
>
>     Currently I’m maintaining a temporary fork until 2.4.6 (or whatever
>     release includes my commits) is out
>     https://github.com/grails/grails-views/blob/master/json/src/main/groovy/grails/plugin/json/builder/StreamingJsonBuilder.java
>
>     Cheers
>     Graeme
>
>>     On 10 Dec 2015, at 21:58, John Wagenleitner
>>     <john.wagenleitner@gmail.com <mailto:john.wagenleitner@gmail.com>>
>>     wrote:
>>
>>     In looking at PR #210 "StreamingJsonBuilder - fix
>>     IllegalStateException when writing unescaped output" [1] I noticed
>>     that commit c5c0cefb36 [2] that introduced the unescaped output
>>     feature was merged into both master and 2_4_X.  I didn't think new
>>     features were normally introduced in patch releases so was just
>>     curious how this should be handled (i.e., merge fix or revert
>>     commit).  Just trying to get a good understanding for how the
>>     versioning scheme [4] is applied and to see if there might have
>>     been a good reason to include it or if possibly it was just by
>>     mistake.
>>
>>     P.S.  Another related commit is 0bf2cb5d [3].
>>
>>     [1] https://github.com/apache/groovy/pull/210
>>     [2]
>>     https://github.com/apache/groovy/commit/c5c0cefb365b6a4c00335abeeed124cc8356a4c8
>>     [3]
>>     https://github.com/apache/groovy/commit/0bf2cb5d334a9ac095904d607867e4aee1807979
>>     [4] http://www.groovy-lang.org/versioning.html
>
>

Mime
View raw message