You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@isis.apache.org by Dan Haywood <da...@haywood-associates.co.uk> on 2018/02/14 11:55:34 UTC
Merging maint-1.16.1 into master; checking status of our branches
Hi Andi
just an fyi, I'm currently merging maint-1.16.1 into master.
I'm thinking of cutting a 2.0.0-M1 release (from the master branch) at some
point quite soon.
Can I check, what's the current state of master and the various feature
branches. I see:
- ISIS-1846_internal_utils - this looks like further useful stuff, and I
know that master has already merged some of this branch in. Could the new
commits be merged into master (a fast-forward merge, I think)?
- ISIS-1740_where_am_i - my recollection was this was close to being done
and could be merged in (behind a config option?).
- ISIS-1852_parallel_stream_patch - this looks like a bit of a spike to
support some JEE use cases, should this be based on M2?
We also have for M2:
- dev/2.0.0-M2 which has the DN 5.1 and much more of the JEE stuff
- ISIS-1779-jax-rs-2 ... hmm, looks like all of this branch except the very
last commit (Transition to JAX-RS 2.0 Client API) was actually rebased onto
dev/2.0.0-M2. So, I think this last commit needs to be cherry-picked onto
M2?
thanks
Dan
Re: Merging maint-1.16.1 into master; checking status of our branches
Posted by Andi Huber <ah...@apache.org>.
Thx Dan!
To summarize:
1) branch 'dev/2.0.0-M2' is now reviewed. I did some minor updates and
rebased once more on top of today's dev/2.0.0-M1 (=master).
2) I removed temporary branch 'dev/2.0.0-M2-rebased'.
3) Branch 'ISIS-1779-jax-rs-2-rebased' is still work in progress. Once
finished, I'll rebase on top of M2 and reinstate the original branch name.
Cheers Andi!
On 17.02.2018 16:35, Dan Haywood wrote:
> Hi Andi,
>
> I was drafting this a few days ago, didn't get around to sending...
>
> within..
>
>>
>> - ISIS-1846_internal_utils -
>
> This branch introduces the new 'Internal API', a collection of
> code idioms frequently used in isis-core-applib. If we commit to
> using this Internal API, we should merge this branch into 2.0.0-M1
> as soon as possible. (Not sure if a fast forward will work ...
> there's a lot of code being moved around, but you may definitely try.)
>
>
> ok, I've merged this into master. you are right, a fast-forward
> wasn't possible, but there were only a couple of conflicts, easily fixed.
>
>
>
>
>
>
>> - ISIS-1740_where_am_i - my recollection was this was close to
>> being done and could be merged in (behind a config option?).
> Yes is ready, can be merged in. Only documentation is missing. We
> have config options to enable or disable this feature. It
> introduces a new annotation in applib: @Parent
>
>
> also merged into master.
>
> I have a question re the @Parent annotation, but I'll start a new
> thread for this.
>
>
>
>
>
>> - ISIS-1852_parallel_stream_patch - this looks like a bit of a
>> spike to support some JEE use cases, should this be based on M2?
> No ISIS-1852 [1] is rather a severe issue, which also affects
> 1.16. (It prevents use of parallel streams on collections of
> domain objects.)
>
>
> ok, I've rebased this on top of maint-1.16.1. I've just cancelled the
> RC1 vote so we can release this in 1.16.1 after all.
>
> I've also merged the branch into master so that - irrespective of what
> we do with 1.16 - it will be part of 2.0.0 M1.
>
>
>
>
>>
>> We also have for M2:
>>
>> - dev/2.0.0-M2 which has the DN 5.1 and much more of the JEE stuff
>> - ISIS-1779-jax-rs-2 ... hmm, looks like all of this branch
>> except the very last commit (Transition to JAX-RS 2.0 Client API)
>> was actually rebased onto dev/2.0.0-M2. So, I think this last
>> commit needs to be cherry-picked onto M2?
> Let's not worry about ISIS-1779-jax-rs-2 too much right now. The
> last commit [2] is kind of an experiment, and maybe I need to redo
> some of these ideas anyway.
>
>
> (I mailed you separately on this also, but to reiterate...)
>
> I went ahead and cherry-picked ISIS-1779-jax-rs-2 on top of
> dev/2.0.0-M2, it was easy to do.
>
> I then went ahead to rebase dev/2.0.0-M2 + ISIS-1779-jax-rs-2 on top
> of master. This threw up quite a few conflicts along the way which I
> resolved as best I could, but in some cases you had made the code
> changes on both sides of the conflict, so I wasn't 100% sure which way
> to go.
>
> Once I'd finished rebasing I therefore decided to rename the branches
> to dev/2.0.0-M2-rebased and ISIS-1779-jax-rs-2-rebased and pushed these.
>
> Could you review these branches? If they are ok then force push them
> to replace origin/dev/2.0.0-M2 and origin/ISIS-1779-jax-rs-2. If they
> aren't ok, could you do the rebase yourself and push?
>
> Thx
> Dan
>
>
>
>
>>
>>
>> thanks
>> Dan
>>
>>
>>
>
> [1] https://issues.apache.org/jira/browse/ISIS-1852
> [2]
> https://github.com/apache/isis/commit/fd8670e8337f99832f767bf24c26dde33bf34cc5
>
Re: Merging maint-1.16.1 into master; checking status of our branches
Posted by Dan Haywood <da...@haywood-associates.co.uk>.
Hi Andi,
I was drafting this a few days ago, didn't get around to sending...
within..
> - ISIS-1846_internal_utils -
>
> This branch introduces the new 'Internal API', a collection of code idioms
> frequently used in isis-core-applib. If we commit to using this Internal
> API, we should merge this branch into 2.0.0-M1 as soon as possible. (Not
> sure if a fast forward will work ... there's a lot of code being moved
> around, but you may definitely try.)
>
>
ok, I've merged this into master. you are right, a fast-forward wasn't
possible, but there were only a couple of conflicts, easily fixed.
>
> - ISIS-1740_where_am_i - my recollection was this was close to being done
> and could be merged in (behind a config option?).
>
> Yes is ready, can be merged in. Only documentation is missing. We have
> config options to enable or disable this feature. It introduces a new
> annotation in applib: @Parent
>
>
also merged into master.
I have a question re the @Parent annotation, but I'll start a new thread
for this.
>
> - ISIS-1852_parallel_stream_patch - this looks like a bit of a spike to
> support some JEE use cases, should this be based on M2?
>
> No ISIS-1852 [1] is rather a severe issue, which also affects 1.16. (It
> prevents use of parallel streams on collections of domain objects.)
>
>
ok, I've rebased this on top of maint-1.16.1. I've just cancelled the RC1
vote so we can release this in 1.16.1 after all.
I've also merged the branch into master so that - irrespective of what we
do with 1.16 - it will be part of 2.0.0 M1.
>
> We also have for M2:
>
> - dev/2.0.0-M2 which has the DN 5.1 and much more of the JEE stuff
> - ISIS-1779-jax-rs-2 ... hmm, looks like all of this branch except the
> very last commit (Transition to JAX-RS 2.0 Client API) was actually rebased
> onto dev/2.0.0-M2. So, I think this last commit needs to be cherry-picked
> onto M2?
>
> Let's not worry about ISIS-1779-jax-rs-2 too much right now. The last
> commit [2] is kind of an experiment, and maybe I need to redo some of these
> ideas anyway.
>
>
(I mailed you separately on this also, but to reiterate...)
I went ahead and cherry-picked ISIS-1779-jax-rs-2 on top of dev/2.0.0-M2,
it was easy to do.
I then went ahead to rebase dev/2.0.0-M2 + ISIS-1779-jax-rs-2 on top of
master. This threw up quite a few conflicts along the way which I resolved
as best I could, but in some cases you had made the code changes on both
sides of the conflict, so I wasn't 100% sure which way to go.
Once I'd finished rebasing I therefore decided to rename the branches to
dev/2.0.0-M2-rebased and ISIS-1779-jax-rs-2-rebased and pushed these.
Could you review these branches? If they are ok then force push them to
replace origin/dev/2.0.0-M2 and origin/ISIS-1779-jax-rs-2. If they aren't
ok, could you do the rebase yourself and push?
Thx
Dan
>
>
> thanks
> Dan
>
>
>
>
> [1] https://issues.apache.org/jira/browse/ISIS-1852
> [2]
> https://github.com/apache/isis/commit/fd8670e8337f99832f767bf24c26dde33bf34cc5
>
Re: Merging maint-1.16.1 into master; checking status of our branches
Posted by Andi Huber <ah...@apache.org>.
Thx Dan,
answering inline ...
Cheers, Andi!
On 14.02.2018 12:55, Dan Haywood wrote:
> Hi Andi
>
> just an fyi, I'm currently merging maint-1.16.1 into master.
>
> I'm thinking of cutting a 2.0.0-M1 release (from the master branch) at
> some point quite soon.
>
> Can I check, what's the current state of master and the various
> feature branches. I see:
>
> - ISIS-1846_internal_utils - this looks like further useful stuff, and
> I know that master has already merged some of this branch in. Could
> the new commits be merged into master (a fast-forward merge, I think)?
This branch introduces the new 'Internal API', a collection of code
idioms frequently used in isis-core-applib. If we commit to using this
Internal API, we should merge this branch into 2.0.0-M1 as soon as
possible. (Not sure if a fast forward will work ... there's a lot of
code being moved around, but you may definitely try.)
> - ISIS-1740_where_am_i - my recollection was this was close to being
> done and could be merged in (behind a config option?).
Yes is ready, can be merged in. Only documentation is missing. We have
config options to enable or disable this feature. It introduces a new
annotation in applib: @Parent
> - ISIS-1852_parallel_stream_patch - this looks like a bit of a spike
> to support some JEE use cases, should this be based on M2?
No ISIS-1852 [1] is rather a severe issue, which also affects 1.16. (It
prevents use of parallel streams on collections of domain objects.)
>
>
> We also have for M2:
>
> - dev/2.0.0-M2 which has the DN 5.1 and much more of the JEE stuff
> - ISIS-1779-jax-rs-2 ... hmm, looks like all of this branch except the
> very last commit (Transition to JAX-RS 2.0 Client API) was actually
> rebased onto dev/2.0.0-M2. So, I think this last commit needs to be
> cherry-picked onto M2?
Let's not worry about ISIS-1779-jax-rs-2 too much right now. The last
commit [2] is kind of an experiment, and maybe I need to redo some of
these ideas anyway.
>
>
> thanks
> Dan
>
>
>
[1] https://issues.apache.org/jira/browse/ISIS-1852
[2]
https://github.com/apache/isis/commit/fd8670e8337f99832f767bf24c26dde33bf34cc5