You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-dev@jackrabbit.apache.org by Amit Jain <am...@apache.org> on 2018/07/23 04:33:00 UTC
Release plan Oak 1.6.13
Hi,
I will release Oak 1.6.13 tomorrow (June 24th). Currently there are no
issues pending but let me know if you plan to include something and need
more time.
Thanks
Amit
Re: Release plan Oak 1.6.13
Posted by Amit Jain <am...@apache.org>.
The version is the same and the API looks similar.
Thanks
Amit
On Tue, Jul 24, 2018 at 10:56 AM Julian Reschke <ju...@gmx.de>
wrote:
> On 2018-07-24 06:44, Amit Jain wrote:
> > There's a change in the package version in the backport for OAK-6662 [1].
> > As I understand this change is fine and not changing would mean same API
> > having 2 different versions.
> >
> > [1]
> >
> https://github.com/apache/jackrabbit-oak/blame/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/package-info.java
>
> Hmm, are both the API and the version the same in 1.8?
>
> FWIW: that actually is a backport that should have been discussed...
>
> Best regards, Julian
>
Re: Release plan Oak 1.6.13
Posted by Alex Deparvu <st...@apache.org>.
Hi,
I think I managed to finally sort it out, thanks Julian and Marcel for the
help!
I tweaked OAK-6662 and reverted backport of OAK-6695 and it looks good now.
Sorry for the inconvenience!
alex
On Tue, Jul 24, 2018 at 11:20 AM Alex Deparvu <st...@apache.org> wrote:
> Hi,
>
> Minor update, I cleared some of the problems with Julian's help, but I'm
> now stuck on one that I can't figure out: some of the changes on 1.8 were
> using Suppliers (only avail on java 8) and 1.6 branch is still java 7 as
> far as I can see, so I cannot backport those. I actually changed the method
> signatures to use the guava Supplier but that turned out to not be a good
> idea as the baseline check on 1.8 will fail.
>
> It seems my only option is to rollback the backports which is not
> something I want to do.
> I would appreciate any ideas!
>
> thanks,
> alex
>
>
>
> On Tue, Jul 24, 2018 at 10:50 AM Julian Reschke <ju...@gmx.de>
> wrote:
>
>> On 2018-07-24 09:57, Amit Jain wrote:
>> >>> Once we have sorted that out, we should update creating-releases.md
>> >>> (it's good that Amit spotted the version change!).
>> >
>> > I spotted it because instructions are already there :)
>>
>> :-)
>>
>> Now that the instructions actually helped in a real world case, we might
>> to further tune them...
>>
>>
Re: Release plan Oak 1.6.13
Posted by Alex Deparvu <st...@apache.org>.
Hi,
Minor update, I cleared some of the problems with Julian's help, but I'm
now stuck on one that I can't figure out: some of the changes on 1.8 were
using Suppliers (only avail on java 8) and 1.6 branch is still java 7 as
far as I can see, so I cannot backport those. I actually changed the method
signatures to use the guava Supplier but that turned out to not be a good
idea as the baseline check on 1.8 will fail.
It seems my only option is to rollback the backports which is not something
I want to do.
I would appreciate any ideas!
thanks,
alex
On Tue, Jul 24, 2018 at 10:50 AM Julian Reschke <ju...@gmx.de>
wrote:
> On 2018-07-24 09:57, Amit Jain wrote:
> >>> Once we have sorted that out, we should update creating-releases.md
> >>> (it's good that Amit spotted the version change!).
> >
> > I spotted it because instructions are already there :)
>
> :-)
>
> Now that the instructions actually helped in a real world case, we might
> to further tune them...
>
>
Re: Release plan Oak 1.6.13
Posted by Julian Reschke <ju...@gmx.de>.
On 2018-07-24 09:57, Amit Jain wrote:
>>> Once we have sorted that out, we should update creating-releases.md
>>> (it's good that Amit spotted the version change!).
>
> I spotted it because instructions are already there :)
:-)
Now that the instructions actually helped in a real world case, we might
to further tune them...
Re: Release plan Oak 1.6.13
Posted by Amit Jain <am...@apache.org>.
>> Once we have sorted that out, we should update creating-releases.md
>> (it's good that Amit spotted the version change!).
I spotted it because instructions are already there :)
On Tue, Jul 24, 2018 at 1:07 PM Julian Reschke <ju...@gmx.de>
wrote:
> On 2018-07-24 09:17, Alex Deparvu wrote:
> > Hi,
> >
> > Sorry for the mess, I tested this out as best as I could. I would
> > appreciate to *not* revert the backports, they are needed on that branch.
> > I can't understand what is breaking here, building 1.8 vs 1.6? how can I
> > reproduce this locally?
>
> The build works, but the package in 1.6 has now the same version number
> as in 1.8, but a different API (due to subsequent changes to the package).
>
> This can be tested by building 1.8 with a baseline comparisonVersiob set
> to 1.6.13-SNAPSHOT:
>
> --- snip ---
> Index: oak-parent/pom.xml
> ===================================================================
> --- oak-parent/pom.xml (revision 1836528)
> +++ oak-parent/pom.xml (working copy)
> @@ -187,7 +187,8 @@
> <logResults>false</logResults>
> <failOnWarning>false</failOnWarning>
> <failOnError>true</failOnError>
> - <filters>
> + <comparisonVersion>1.6.13-SNAPSHOT</comparisonVersion>
> + <filters>
> <!-- Disable baseline for explicitly NOT managed
> packages. See OAK-3842 -->
> <filter>!org.apache.jackrabbit.oak.spi.blob</filter>
>
> <filter>!org.apache.jackrabbit.oak.spi.blob.split</filter>
> --- snip ---
>
> Once we have sorted that out, we should update creating-releases.md
> (it's good that Amit spotted the version change!).
>
> Best regards, Julian
>
Re: Release plan Oak 1.6.13
Posted by Julian Reschke <ju...@gmx.de>.
On 2018-07-24 09:17, Alex Deparvu wrote:
> Hi,
>
> Sorry for the mess, I tested this out as best as I could. I would
> appreciate to *not* revert the backports, they are needed on that branch.
> I can't understand what is breaking here, building 1.8 vs 1.6? how can I
> reproduce this locally?
The build works, but the package in 1.6 has now the same version number
as in 1.8, but a different API (due to subsequent changes to the package).
This can be tested by building 1.8 with a baseline comparisonVersiob set
to 1.6.13-SNAPSHOT:
--- snip ---
Index: oak-parent/pom.xml
===================================================================
--- oak-parent/pom.xml (revision 1836528)
+++ oak-parent/pom.xml (working copy)
@@ -187,7 +187,8 @@
<logResults>false</logResults>
<failOnWarning>false</failOnWarning>
<failOnError>true</failOnError>
- <filters>
+ <comparisonVersion>1.6.13-SNAPSHOT</comparisonVersion>
+ <filters>
<!-- Disable baseline for explicitly NOT managed
packages. See OAK-3842 -->
<filter>!org.apache.jackrabbit.oak.spi.blob</filter>
<filter>!org.apache.jackrabbit.oak.spi.blob.split</filter>
--- snip ---
Once we have sorted that out, we should update creating-releases.md
(it's good that Amit spotted the version change!).
Best regards, Julian
Re: Release plan Oak 1.6.13
Posted by Alex Deparvu <st...@apache.org>.
Hi,
Sorry for the mess, I tested this out as best as I could. I would
appreciate to *not* revert the backports, they are needed on that branch.
I can't understand what is breaking here, building 1.8 vs 1.6? how can I
reproduce this locally?
thanks,
alex
On Tue, Jul 24, 2018 at 9:06 AM Julian Reschke <ju...@gmx.de>
wrote:
> On 2018-07-24 08:41, Julian Reschke wrote:
> > On 2018-07-24 08:04, Julian Reschke wrote:
> >> On 2018-07-24 07:53, Julian Reschke wrote:
> >>> ...
> >>
> >> I suspect this can be healed by also backporting
> >> <https://issues.apache.org/jira/browse/OAK-6918> which made additional
> >> changes to the package (and didn't have to increase the version number
> >> again as it was done on trunk).
> >>
> >> Best regards, Julian
> >
> > Tried that, but then 1.6 build fails with:
> >
> >> ERROR]
> >>
> C:\projects\apache\oak\1.6\oak-core\src\test\java\org\apache\jackrabbit\oak\spi\security\authentication\credentials\AbstractCredentialsTest.java:[86,55]
>
> >> error: incompatible types: ImmutableMap<String,Boolean> cannot be
> >> converted to Map<String,Object>
> >> [ERROR]
>
> Could be a Java 7 problem with casting generics. I think I have a fix.
>
> Do we want to do this, or back out the original change?
>
> Best regards, Julian
>
>
Re: Release plan Oak 1.6.13
Posted by Julian Reschke <ju...@gmx.de>.
On 2018-07-24 08:41, Julian Reschke wrote:
> On 2018-07-24 08:04, Julian Reschke wrote:
>> On 2018-07-24 07:53, Julian Reschke wrote:
>>> ...
>>
>> I suspect this can be healed by also backporting
>> <https://issues.apache.org/jira/browse/OAK-6918> which made additional
>> changes to the package (and didn't have to increase the version number
>> again as it was done on trunk).
>>
>> Best regards, Julian
>
> Tried that, but then 1.6 build fails with:
>
>> ERROR]
>> C:\projects\apache\oak\1.6\oak-core\src\test\java\org\apache\jackrabbit\oak\spi\security\authentication\credentials\AbstractCredentialsTest.java:[86,55]
>> error: incompatible types: ImmutableMap<String,Boolean> cannot be
>> converted to Map<String,Object>
>> [ERROR]
Could be a Java 7 problem with casting generics. I think I have a fix.
Do we want to do this, or back out the original change?
Best regards, Julian
Re: Release plan Oak 1.6.13
Posted by Julian Reschke <ju...@gmx.de>.
On 2018-07-24 08:04, Julian Reschke wrote:
> On 2018-07-24 07:53, Julian Reschke wrote:
>> ...
>
> I suspect this can be healed by also backporting
> <https://issues.apache.org/jira/browse/OAK-6918> which made additional
> changes to the package (and didn't have to increase the version number
> again as it was done on trunk).
>
> Best regards, Julian
Tried that, but then 1.6 build fails with:
> ERROR] C:\projects\apache\oak\1.6\oak-core\src\test\java\org\apache\jackrabbit\oak\spi\security\authentication\credentials\AbstractCredentialsTest.java:[86,55] error: incompatible types: ImmutableMap<String,Boolean> cannot be converted to Map<String,Object>
> [ERROR]
Best regards, Julian
Re: Release plan Oak 1.6.13
Posted by Julian Reschke <ju...@gmx.de>.
On 2018-07-24 07:53, Julian Reschke wrote:
> ...
I suspect this can be healed by also backporting
<https://issues.apache.org/jira/browse/OAK-6918> which made additional
changes to the package (and didn't have to increase the version number
again as it was done on trunk).
Best regards, Julian
Re: Release plan Oak 1.6.13
Posted by Amit Jain <am...@apache.org>.
Yeah, there are annotations missing and the missing type arguments in the
return Map for getAttributes which is marked as major.
On Tue, Jul 24, 2018 at 11:24 AM Julian Reschke <ju...@gmx.de>
wrote:
> On 2018-07-24 07:26, Julian Reschke wrote:
> > On 2018-07-24 06:44, Amit Jain wrote:
> >> There's a change in the package version in the backport for OAK-6662
> [1].
> >> As I understand this change is fine and not changing would mean same API
> >> having 2 different versions.
> >>
> >> [1]
> >>
> https://github.com/apache/jackrabbit-oak/blame/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/package-info.java
> >>
> >
> > Hmm, are both the API and the version the same in 1.8?
> >
> > FWIW: that actually is a backport that should have been discussed...
> >
> > Best regards, Julian
>
> Building 1.8 with a comparison version of 1.6.13-SNAPHOT fails:
>
> <package
> name="org.apache.jackrabbit.oak.spi.security.authentication.credentials"
> delta="major">
> <mismatch>true</mismatch>
> <newerVersion>2.1.0</newerVersion>
> <olderVersion>2.1.0</olderVersion>
> <suggestedVersion>3.0.0</suggestedVersion>
> <error>Version increase required</error>
> <attributes>
> <version>2.1.0</version>
> <uses>com.google.common.collect,javax.annotation,javax.jcr</uses>
> </attributes>
> <class
> name="org.apache.jackrabbit.oak.spi.security.authentication.credentials.AbstractCredentials"
>
> delta="major">
> <method name="<init>(java.lang.String)" delta="changed">
> <annotated name="javax.annotation.Nonnull" delta="added"/>
> </method>
> <method name="getAttribute(java.lang.String)" delta="changed">
> <annotated name="javax.annotation.CheckForNull" delta="added"/>
> <annotated name="javax.annotation.Nonnull" delta="added"/>
> </method>
> <method name="getAttributes()" delta="major">
> <annotated name="javax.annotation.Nonnull" delta="added"/>
> <return name="java.util.Map" delta="removed"/>
> <return
> name="java.util.Map<Ljava.lang.String;Ljava.lang.Object;>"
> delta="added"/>
> </method>
> <method name="getUserId()" delta="changed">
> <annotated name="javax.annotation.Nonnull" delta="added"/>
> </method>
> <method name="removeAttribute(java.lang.String)" delta="changed">
> <annotated name="javax.annotation.Nonnull" delta="added"/>
> </method>
> <method name="setAttribute(java.lang.String,java.lang.Object)"
> delta="changed">
> <annotated name="javax.annotation.Nonnull" delta="added"/>
> <annotated name="javax.annotation.Nullable" delta="added"/>
> </method>
> <method
> name="setAttributes(Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)"
>
> delta="added">
> <annotated name="javax.annotation.Nonnull" delta="added"/>
> </method>
> <method name="setAttributes(java.util.Map)" delta="removed"/>
> </class>
> <class
> name="org.apache.jackrabbit.oak.spi.security.authentication.credentials.CompositeCredentialsSupport"
>
> delta="major">
> <method
> name="newInstance(Lcom/google/common/base/Supplier<Ljava/util/Collection<Lorg/apache/jackrabbit/oak/spi/security/authentication/credentials/CredentialsSupport;>;>;)"
>
> delta="removed">
> <access name="static" delta="removed"/>
> <annotated name="javax.annotation.Nonnull" delta="removed"/>
> <return
> name="org.apache.jackrabbit.oak.spi.security.authentication.credentials.CredentialsSupport"
>
> delta="removed"/>
> </method>
> <method
> name="newInstance(Ljava/util/function/Supplier<Ljava/util/Collection<Lorg/apache/jackrabbit/oak/spi/security/authentication/credentials/CredentialsSupport;>;>;)"
>
> delta="added">
> <access name="static" delta="added"/>
> <annotated name="javax.annotation.Nonnull" delta="added"/>
> <return
> name="org.apache.jackrabbit.oak.spi.security.authentication.credentials.CredentialsSupport"
>
> delta="added"/>
> </method>
> </class>
>
> So I believe we can't proceed without analyzing this properly (or
> backing it out).
>
> Best regards, Julian
>
>
Re: Release plan Oak 1.6.13
Posted by Julian Reschke <ju...@gmx.de>.
On 2018-07-24 07:26, Julian Reschke wrote:
> On 2018-07-24 06:44, Amit Jain wrote:
>> There's a change in the package version in the backport for OAK-6662 [1].
>> As I understand this change is fine and not changing would mean same API
>> having 2 different versions.
>>
>> [1]
>> https://github.com/apache/jackrabbit-oak/blame/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/package-info.java
>>
>
> Hmm, are both the API and the version the same in 1.8?
>
> FWIW: that actually is a backport that should have been discussed...
>
> Best regards, Julian
Building 1.8 with a comparison version of 1.6.13-SNAPHOT fails:
<package
name="org.apache.jackrabbit.oak.spi.security.authentication.credentials"
delta="major">
<mismatch>true</mismatch>
<newerVersion>2.1.0</newerVersion>
<olderVersion>2.1.0</olderVersion>
<suggestedVersion>3.0.0</suggestedVersion>
<error>Version increase required</error>
<attributes>
<version>2.1.0</version>
<uses>com.google.common.collect,javax.annotation,javax.jcr</uses>
</attributes>
<class
name="org.apache.jackrabbit.oak.spi.security.authentication.credentials.AbstractCredentials"
delta="major">
<method name="<init>(java.lang.String)" delta="changed">
<annotated name="javax.annotation.Nonnull" delta="added"/>
</method>
<method name="getAttribute(java.lang.String)" delta="changed">
<annotated name="javax.annotation.CheckForNull" delta="added"/>
<annotated name="javax.annotation.Nonnull" delta="added"/>
</method>
<method name="getAttributes()" delta="major">
<annotated name="javax.annotation.Nonnull" delta="added"/>
<return name="java.util.Map" delta="removed"/>
<return
name="java.util.Map<Ljava.lang.String;Ljava.lang.Object;>"
delta="added"/>
</method>
<method name="getUserId()" delta="changed">
<annotated name="javax.annotation.Nonnull" delta="added"/>
</method>
<method name="removeAttribute(java.lang.String)" delta="changed">
<annotated name="javax.annotation.Nonnull" delta="added"/>
</method>
<method name="setAttribute(java.lang.String,java.lang.Object)"
delta="changed">
<annotated name="javax.annotation.Nonnull" delta="added"/>
<annotated name="javax.annotation.Nullable" delta="added"/>
</method>
<method
name="setAttributes(Ljava/util/Map<Ljava/lang/String;Ljava/lang/Object;>;)"
delta="added">
<annotated name="javax.annotation.Nonnull" delta="added"/>
</method>
<method name="setAttributes(java.util.Map)" delta="removed"/>
</class>
<class
name="org.apache.jackrabbit.oak.spi.security.authentication.credentials.CompositeCredentialsSupport"
delta="major">
<method
name="newInstance(Lcom/google/common/base/Supplier<Ljava/util/Collection<Lorg/apache/jackrabbit/oak/spi/security/authentication/credentials/CredentialsSupport;>;>;)"
delta="removed">
<access name="static" delta="removed"/>
<annotated name="javax.annotation.Nonnull" delta="removed"/>
<return
name="org.apache.jackrabbit.oak.spi.security.authentication.credentials.CredentialsSupport"
delta="removed"/>
</method>
<method
name="newInstance(Ljava/util/function/Supplier<Ljava/util/Collection<Lorg/apache/jackrabbit/oak/spi/security/authentication/credentials/CredentialsSupport;>;>;)"
delta="added">
<access name="static" delta="added"/>
<annotated name="javax.annotation.Nonnull" delta="added"/>
<return
name="org.apache.jackrabbit.oak.spi.security.authentication.credentials.CredentialsSupport"
delta="added"/>
</method>
</class>
So I believe we can't proceed without analyzing this properly (or
backing it out).
Best regards, Julian
Re: Release plan Oak 1.6.13
Posted by Julian Reschke <ju...@gmx.de>.
On 2018-07-24 06:44, Amit Jain wrote:
> There's a change in the package version in the backport for OAK-6662 [1].
> As I understand this change is fine and not changing would mean same API
> having 2 different versions.
>
> [1]
> https://github.com/apache/jackrabbit-oak/blame/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/package-info.java
Hmm, are both the API and the version the same in 1.8?
FWIW: that actually is a backport that should have been discussed...
Best regards, Julian
Re: Release plan Oak 1.6.13
Posted by Amit Jain <am...@apache.org>.
There's a change in the package version in the backport for OAK-6662 [1].
As I understand this change is fine and not changing would mean same API
having 2 different versions.
[1]
https://github.com/apache/jackrabbit-oak/blame/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/package-info.java
On Mon, Jul 23, 2018 at 11:16 AM Julian Reschke <ju...@gmx.de>
wrote:
> On 2018-07-23 06:33, Amit Jain wrote:
> > Hi,
> >
> > I will release Oak 1.6.13 tomorrow (June 24th). Currently there are no
> > issues pending but let me know if you plan to include something and need
> > more time.
> >
> > Thanks
> > Amit
>
> We have a few tickets marked candidate_oak_16 which are marked critical.
> If they are, we probably should backport :-)
>
> Best regards, Julian
>
Re: Release plan Oak 1.6.13
Posted by Julian Reschke <ju...@gmx.de>.
On 2018-07-23 06:33, Amit Jain wrote:
> Hi,
>
> I will release Oak 1.6.13 tomorrow (June 24th). Currently there are no
> issues pending but let me know if you plan to include something and need
> more time.
>
> Thanks
> Amit
We have a few tickets marked candidate_oak_16 which are marked critical.
If they are, we probably should backport :-)
Best regards, Julian