[hibernate-dev] merge master into metamodel branch, again :)

[Steve Ebersole]

This is the deal discussed earlier on the dev list about jdk 1.6 javac
bug.  For now we will need to use jdk 1.7
On Jul 19, 2012 2:20 AM, "Strong Liu" <stliu at hibernate.org> wrote:

> our CI reported some compile error :
>
>
> [ant:javac] Compiling 206 source files to /mnt/hudson_workspace/workspace/hibernate-core-master/hibernate-entitymanager/target/classes/main
> [ant:javac] /mnt/hudson_workspace/workspace/hibernate-core-master/hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/JoinImplementor.java:37: types javax.persistence.criteria.Fetch<Z,X> and javax.persistence.criteria.Join<Z,X> are incompatible; both define on(javax.persistence.criteria.Predicate[]), but with unrelated return types
> [ant:javac] public interface JoinImplementor<Z,X> extends Join<Z,X>, Fetch<Z,X>, FromImplementor<Z,X> {
> [ant:javac]        ^
> [ant:javac] /mnt/hudson_workspace/workspace/hibernate-core-master/hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/CollectionJoinImplementor.java:35: types org.hibernate.jpa.criteria.JoinImplementor<Z,X> and org.hibernate.jpa.criteria.JoinImplementor<Z,X> are incompatible; both define on(javax.persistence.criteria.Predicate[]), but with unrelated return types
> [ant:javac] public interface CollectionJoinImplementor<Z,X> extends JoinImplementor<Z,X>, CollectionJoin<Z,X> {
> [ant:javac]        ^
> [ant:javac] /mnt/hudson_workspace/workspace/hibernate-core-master/hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/SetJoinImplementor.java:35: types org.hibernate.jpa.criteria.JoinImplementor<Z,X> and org.hibernate.jpa.criteria.JoinImplementor<Z,X> are incompatible; both define on(javax.persistence.criteria.Predicate[]), but with unrelated return types
> [ant:javac] public interface SetJoinImplementor<Z,X> extends JoinImplementor<Z,X>, SetJoin<Z,X> {
> [ant:javac]        ^
> [ant:javac] /mnt/hudson_workspace/workspace/hibernate-core-master/hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/ListJoinImplementor.java:35: types org.hibernate.jpa.criteria.JoinImplementor<Z,X> and org.hibernate.jpa.criteria.JoinImplementor<Z,X> are incompatible; both define on(javax.persistence.criteria.Predicate[]), but with unrelated return types
> [ant:javac] public interface ListJoinImplementor<Z,X> extends JoinImplementor<Z,X>, ListJoin<Z,X> {
> [ant:javac]        ^
> [ant:javac] /mnt/hudson_workspace/workspace/hibernate-core-master/hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/MapJoinImplementor.java:35: types org.hibernate.jpa.criteria.JoinImplementor<Z,V> and org.hibernate.jpa.criteria.JoinImplementor<Z,V> are incompatible; both define on(javax.persistence.criteria.Predicate[]), but with unrelated return types
> [ant:javac] public interface MapJoinImplementor<Z,K,V> extends JoinImplementor<Z,V>, MapJoin<Z,K,V> {
> [ant:javac]        ^
> [ant:javac] Note: Some input files use or override a deprecated API.
> [ant:javac] Note: Recompile with -Xlint:deprecation for details.
> [ant:javac] Note: Some input files use unchecked or unsafe operations.
> [ant:javac] Note: Recompile with -Xlint:unchecked for details.
> [ant:javac] 5 errors
>
>
>
>
> On Jul 19, 2012, at 7:59 AM, Steve Ebersole <steve at hibernate.org> wrote:
>
> (1) and (2) are done.  Tomorrow I will work on (3).
>
> On Tue 17 Jul 2012 03:16:46 AM CDT, Hardy Ferentschik wrote:
>
>
> On Jul 16, 2012, at 9:38 PM, Steve Ebersole wrote:
>
> Thinking we should consider:
> 1) branching 4.1
> 2) integrating my JPA 2.1 work onto master
> 3) merge master (with JPA 2.1) to metamodel branch
>
>
> +1
>
>
> --
> steve at hibernate.org
> http://hibernate.org
>
>
> -------------------------
> Best Regards,
>
> Strong Liu <stliu at hibernate.org>
> http://about.me/stliu/bio
>
>