I figured we'd wait until the vote on 3.0 M2. I'm going to try to build and test it over the weekend.
But, generally, I agree. We should be able to move forward with the merge as outlined in CAY-904. I'd rather seen it done now, while not so many people are working with the code, than later, when it could be a real pain. -- Kevin On 10/26/07 3:08 PM, "Andrus Adamchik" <[EMAIL PROTECTED]> wrote: > :-) > > Actually I was itching to jump on the JDK switch task, but figured > that this would make porting the bug fixes from the M2 tag a bit > harder... Or maybe not... just use patch -p1 to target a different > dir :-) > > Andrus > > > On Oct 26, 2007, at 9:48 PM, [EMAIL PROTECTED] wrote: > >> Author: kmenard >> Date: Fri Oct 26 11:48:43 2007 >> New Revision: 588743 >> >> URL: http://svn.apache.org/viewvc?rev=588743&view=rev >> Log: >> Oops. This was not supposed to be committed, as one could probably >> guess from the non-sensical commit message. >> >> Modified: >> cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/pom.xml >> >> Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/ >> pom.xml >> URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/ >> cayenne-jdk1.4-unpublished/pom.xml? >> rev=588743&r1=588742&r2=588743&view=diff >> ====================================================================== >> ======== >> --- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/pom.xml >> (original) >> +++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/pom.xml >> Fri Oct 26 11:48:43 2007 >> @@ -169,8 +169,8 @@ >> <groupId>org.apache.maven.plugins</groupId> >> <artifactId>maven-compiler-plugin</artifactId> >> <configuration> >> - <source>1.5</source> >> - <target>1.5</target> >> + <source>1.4</source> >> + <target>1.4</target> >> </configuration> >> </plugin> >> <plugin> >> >> >> > --
