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

2012-07-19 Thread 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" wrote: > our CI reported some compile error : > > > [ant:javac] Compiling 206 source files to > /mnt/hudson_workspace/workspace/hibernate-core-ma

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

2012-07-19 Thread Strong Liu
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/

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

2012-07-18 Thread Steve Ebersole
(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

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

2012-07-17 Thread Hardy Ferentschik
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 ___ hibernate-dev mailing list hibernate-dev@lis

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

2012-07-16 Thread Strong Liu
On Jul 17, 2012, at 3:38 AM, Steve Ebersole wrote: > Going to throw another perhaps crazy suggestion out there... > > 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 I think this route is oka

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

2012-07-16 Thread Steve Ebersole
Going to throw another perhaps crazy suggestion out there... 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 Couple of thought processes go into this. First, I do not see us doing anymore 4.x releases ou

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

2012-07-15 Thread Strong Liu
Hi there, I think we should do this again since there are some changes in master that I want to use in metamodel, and maybe we should do this regularly to minimize the conflicts? Steve is the best to do this, since he already did this once, but in case he is busying on other stuff, I'm volunta