On 5/30/13 4:06 AM, Emmanuel Bourg wrote: > Le 30/05/2013 11:40, Phil Steitz a écrit : > >> Sorry for stupidity above. I was not thinking through the >> consequences of the gump-esque build process. I guess if we really >> want to support everything building from source with no binary >> incompatible change, we are going to have to support the 1.x code >> suitably hacked forward indefinitely. This is not a happy prospect; >> but given how widely used DBCP is, we should do it. Given this, I >> agree with your original proposal that we build in another layer of >> filtering to the 1.x code base, with the no-op patch merged in. I >> will play with this over the weekend and see if I can get an Ant >> build working that extends what we do now to produce 1.3.x from the >> 1.4.x sources to also source a 1.5.x.
OK, I played with this a little over the weekend and I think it is doable. Before I start committing stuff, I want to make sure others are OK with the following approach: 1. Create a new branch, DBCP_1_5_x. This will basically take the role of DBCP_!_4_X, so once created *all code changes / bug fixes for 1.x series should be applied only to the 1_5_x branch*. 2. Add the new methods (UOE-ed) to the 1_5_x sources, surrounded by JDBC_4_1_ANT_KEY_BEGIN/END tags 3. Create build-1.4, pom-1.4 like the 1.3 versions, modifying 1.3 build to filter both, 1.4 only the 4.1 stuff. 4. Modify build.xml and the RC build process in release-process.txt to handle the additional version. The process gets a little more complicated, but I think it will work and will allow us to avoid having to backport anything. The only hitch that I see so far is that the process documented in release-process.txt creates maven artifacts "manually" that I need to figure out how to install without using the release plugin. Is that still possible somehow? If there are no objections to the setup above, I will create the 1.5 branch and add the JDBC4.1 methods and filter tags there. Phil > Thank you Phil. > > Hopefully this kind of maintenance happens only once every 2 years. > > > Emmanuel Bourg > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mail: dev-h...@commons.apache.org
