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 <[email protected]> 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 > >
