You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@isis.apache.org by Andi Huber <ah...@apache.org> on 2018/02/23 09:03:33 UTC

Rebasing again

I'm in the process of rebasing M2 on top of M1 (master) again, but
before I do that, I'm pulling changes, that do not conflict with DN-4,
from M2 into M1.

Remember:

  * 2.0.0-M1 is a transition to JDK 8
  * 2.0.0-M2 is a transition to Datanucleus 5

Cheers,
Andi

Re: Rebasing again

Posted by Andi Huber <ah...@apache.org>.

When pulling in changes from M2 into M1, I needed to do some
hand-picking of code fragments. In the process we lost some original
commit history, replaced by consolidated commits with issue ISIS-1871 [1].

Instead of re-basing our latest M2 on top of the newly assembled M1, I
branched off on M1 fresh and cherry-picked commits only related to the
transition to DN-5.

The new branch for M2 is 'dev/2.0.0-M2-cherrypicked', which may be
renamed to its original after review.

Cheers,
Andi

[1] https://issues.apache.org/jira/browse/ISIS-1871

On 23.02.2018 10:03, Andi Huber wrote:
> I'm in the process of rebasing M2 on top of M1 (master) again, but
> before I do that, I'm pulling changes, that do not conflict with DN-4,
> from M2 into M1.
>
> Remember:
>
>   * 2.0.0-M1 is a transition to JDK 8
>   * 2.0.0-M2 is a transition to Datanucleus 5
>
> Cheers,
> Andi
>

Current state of branches

Posted by Andi Huber <ah...@apache.org>.

Summarizing current state of branches:

== master (2.0.0-M1)

* simpleapp/helloworld do not compile on my eclipse checkout
* allows disabling of footer
* making progress with removing guava from API (applib)
* swagger-ui now packaged with metamodel (removed from example apps and artifacts)
* local-resource links fixed (by introducing LocalResourcePath value type), allows proper actions that link to swagger-ui or object's restful-API
* further refactored reusable code into Internal API (algorithms for byte array processing: base64 encoding + compression)
* pulled in all code necessary for JavaEE support from M2
* all JUnit Tests pass

== 2.0.0-M2

* has name 'dev/2.0.0-M2-cherrypicked' and is rebased on today's master (M1)
* simpleapp/helloworld do not compile on my eclipse checkout


Cheers,
Andi