<div dir="ltr">Alright,<div><br></div><div>here is the 1.1.x branch:</div><div><a href="https://github.com/aerogear/aerogear-unifiedpush-server/tree/1.1.x-dev">https://github.com/aerogear/aerogear-unifiedpush-server/tree/1.1.x-dev</a><br></div><div>and I did revert the KC update, on that branch:</div><div><a href="https://github.com/aerogear/aerogear-unifiedpush-server/pull/661">https://github.com/aerogear/aerogear-unifiedpush-server/pull/661</a><br></div><div><br></div><div>Also, master is now 1.2.0-SNAPSHOT:</div><div><a href="https://github.com/aerogear/aerogear-unifiedpush-server/commit/0d5c276db70b65e7cd607c98aae6f5b68109f757">https://github.com/aerogear/aerogear-unifiedpush-server/commit/0d5c276db70b65e7cd607c98aae6f5b68109f757</a><br></div><div><br></div><div>This will, eventually also get the KC 1.7.0 update, that abstractj is working on</div><div><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Dec 16, 2015 at 11:21 PM, Bruno Oliveira <span dir="ltr"><<a href="mailto:bruno@abstractj.org" target="_blank">bruno@abstractj.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><p dir="ltr">Go ahead!</p><div class="HOEnZb"><div class="h5">
<br><div class="gmail_quote"><div dir="ltr">On Wed, Dec 16, 2015, 2:12 PM Matthias Wessendorf <<a href="mailto:matzew@apache.org" target="_blank">matzew@apache.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Wed, Dec 16, 2015 at 4:31 PM, Bruno Oliveira <span dir="ltr"><<a href="mailto:bruno@abstractj.org" target="_blank">bruno@abstractj.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Matthias, the overall plan looks good to me. Just a question to<br>
make sure I understood.<br>
<br>
- on master - Keycloak 1.7.0.Final<br></blockquote><div><br></div></div></div></div><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div>yes, and basically upgrading from current 1.5.0 to 1.7.0 - only on master</div></div></div></div><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
- on 1.1.x branch - Keycloak 1.5.0.Final<br></blockquote><div><br></div></div></div></div><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div>no - will revert that particular fix on the 1.1.x branch, so that the KC update is "only" on master</div></div></div></div><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Is that correct?<br>
<div><div><br>
On Wed, Dec 16, 2015 at 11:27 AM, Matthias Wessendorf <<a href="mailto:matzew@apache.org" target="_blank">matzew@apache.org</a>> wrote:<br>
> Hi folks,<br>
><br>
> for early Jan, I'd like to get the UPS-1.1.1 out:<br>
> <a href="https://issues.jboss.org/projects/AGPUSH/versions/12327457" rel="noreferrer" target="_blank">https://issues.jboss.org/projects/AGPUSH/versions/12327457</a><br>
><br>
> Not sure we will be doing a 1.1.2 later, but maybe... given these JIRAs:<br>
> <a href="https://issues.jboss.org/projects/AGPUSH/versions/12323762" rel="noreferrer" target="_blank">https://issues.jboss.org/projects/AGPUSH/versions/12323762</a><br>
><br>
> The next minor version will be 1.2.0:<br>
> <a href="https://issues.jboss.org/projects/AGPUSH/versions/12327301" rel="noreferrer" target="_blank">https://issues.jboss.org/projects/AGPUSH/versions/12327301</a><br>
><br>
> However, I had quick chat w/ Lukas in the morning, that we already have KC<br>
> version update on master, but that really should not be in a 1.1.x patch<br>
> version.<br>
><br>
> Here is the proposal of what to do:<br>
> * I branch of master for a 1.1.x patch branch, and on that branch, I simply<br>
> rewert the KC update.<br>
> * Obviously on master we keep the update, but also update the version there<br>
> to 1.2.0-SNAPSHOT<br>
><br>
> Also, since "active" branches are a PITA (we had that on 1.0.x), the idea is<br>
> that the 1.1.x branch will be deleted ASAP, e.g. once we get out 1.1.1<br>
> shipped. In case we do a 1.1.2, we'd simple create a new 1.1.x branch of the<br>
> 1.1.1 TAG.<br>
><br>
> But on master, things will be moving forward, towards UPS 1.2.0<br>
><br>
><br>
> Any thoughts?<br>
><br>
><br>
> -Matthias<br>
><br>
> --<br>
> Matthias Wessendorf<br>
><br>
> blog: <a href="http://matthiaswessendorf.wordpress.com/" rel="noreferrer" target="_blank">http://matthiaswessendorf.wordpress.com/</a><br>
> sessions: <a href="http://www.slideshare.net/mwessendorf" rel="noreferrer" target="_blank">http://www.slideshare.net/mwessendorf</a><br>
> twitter: <a href="http://twitter.com/mwessendorf" rel="noreferrer" target="_blank">http://twitter.com/mwessendorf</a><br>
><br>
</div></div><span>> _______________________________________________<br>
> aerogear-dev mailing list<br>
> <a href="mailto:aerogear-dev@lists.jboss.org" target="_blank">aerogear-dev@lists.jboss.org</a><br>
> <a href="https://lists.jboss.org/mailman/listinfo/aerogear-dev" rel="noreferrer" target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a><br>
<br>
<br>
<br>
</span><span><font color="#888888">--<br>
- abstractj<br>
</font></span><div><div>_______________________________________________<br>
aerogear-dev mailing list<br>
<a href="mailto:aerogear-dev@lists.jboss.org" target="_blank">aerogear-dev@lists.jboss.org</a><br>
<a href="https://lists.jboss.org/mailman/listinfo/aerogear-dev" rel="noreferrer" target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a><br>
</div></div></blockquote></div></div></div><div dir="ltr"><div class="gmail_extra"><br><br clear="all"><div><br></div>-- <br><div>Matthias Wessendorf <br><br>blog: <a href="http://matthiaswessendorf.wordpress.com/" target="_blank">http://matthiaswessendorf.wordpress.com/</a><br>sessions: <a href="http://www.slideshare.net/mwessendorf" target="_blank">http://www.slideshare.net/mwessendorf</a><br>twitter: <a href="http://twitter.com/mwessendorf" target="_blank">http://twitter.com/mwessendorf</a></div>
</div></div>
_______________________________________________<br>
aerogear-dev mailing list<br>
<a href="mailto:aerogear-dev@lists.jboss.org" target="_blank">aerogear-dev@lists.jboss.org</a><br>
<a href="https://lists.jboss.org/mailman/listinfo/aerogear-dev" rel="noreferrer" target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a></blockquote></div>
</div></div><br>_______________________________________________<br>
aerogear-dev mailing list<br>
<a href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a><br>
<a href="https://lists.jboss.org/mailman/listinfo/aerogear-dev" rel="noreferrer" target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a><br></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature">Matthias Wessendorf <br><br>blog: <a href="http://matthiaswessendorf.wordpress.com/" target="_blank">http://matthiaswessendorf.wordpress.com/</a><br>sessions: <a href="http://www.slideshare.net/mwessendorf" target="_blank">http://www.slideshare.net/mwessendorf</a><br>twitter: <a href="http://twitter.com/mwessendorf" target="_blank">http://twitter.com/mwessendorf</a></div>
</div>