Re: [dbutils] 2_0 branch discussion

[Carl Hall <th...@apache.org>]

Thanks for merging that in. Since 2.0 RC1 was cut, there have been a few releases on the 1.x line. Is 2_0 up to date with everything?

> On Dec 30, 2019, at 4:35 PM, William Speirs <ws...@apache.org> wrote:
> 
> I just merged the code from my fork (
> https://github.com/wspeirs/sop4j-dbutils/ <https://github.com/wspeirs/sop4j-dbutils/>) into the commons-dbutils 2_0
> branch (
> https://gitbox.apache.org/repos/asf?p=commons-dbutils.git;a=commit;h=180c0990b1f0da4d0039904b68cc6b57f00558e5 <https://gitbox.apache.org/repos/asf?p=commons-dbutils.git;a=commit;h=180c0990b1f0da4d0039904b68cc6b57f00558e5>
> ).
> 
> The code builds, and all the tests pass... that's as far as I went however.
> 
> Carl, let me know if I can help more... thanks!
> 
> Bill-
> 
> On Mon, Dec 30, 2019 at 5:17 PM Carl Hall <thecarlhall@apache.org <ma...@apache.org>> wrote:
> 
>> There was a 2_0 branch started several years ago[1]. That release was
>> abandoned, the code wasn’t merged into master, and a fork was spurred
>> outside of Apache[2]. I’d like to rectify this and work to a release.
>> 
>> The code was moved to a different package in both repos, so merging isn’t
>> straightforward. I can attempt to copy in the classes from the 2_0 branch
>> in gitbox or manually copy the classes from Bill’s GitHub account. Both
>> seem like a lot of work with chances for accidentally unwinding more recent
>> changes. I think a more detailed review would be better, but time isn’t on
>> my side for that.
>> 
>> Any suggestions for how to best proceed on this? Bill, if there’s anyway
>> you could work the merge, I’ll manage the release.
>> 
>> 1
>> https://gitbox.apache.org/repos/asf?p=commons-dbutils.git;a=shortlog;h=refs/heads/2_0
>> <
>> https://gitbox.apache.org/repos/asf?p=commons-dbutils.git;a=shortlog;h=refs/heads/2_0 <https://gitbox.apache.org/repos/asf?p=commons-dbutils.git;a=shortlog;h=refs/heads/2_0>
>>> 
>> 2 https://github.com/wspeirs/sop4j-dbutils/tree/dbutils-2.2 <https://github.com/wspeirs/sop4j-dbutils/tree/dbutils-2.2> <
>> https://github.com/wspeirs/sop4j-dbutils/tree/dbutils-2.2 <https://github.com/wspeirs/sop4j-dbutils/tree/dbutils-2.2>>

Re: [dbutils] 2_0 branch discussion

[Bill Speirs <bi...@gmail.com>]

Everything is as up-to-date as I can tell... just submitted a few merges:
https://gitbox.apache.org/repos/asf?p=commons-dbutils.git;a=commit;h=31deec7a232bacb1204c86788939afaac101b0ef

Bill-

On Sun, Jan 5, 2020 at 1:12 PM Carl Hall <th...@apache.org> wrote:

> Thanks for merging that in. Since 2.0 RC1 was cut, there have been a few
> releases on the 1.x line. Is 2_0 up to date with everything?
>
> > On Dec 30, 2019, at 4:35 PM, William Speirs <ws...@apache.org> wrote:
> >
> > I just merged the code from my fork (
> > https://github.com/wspeirs/sop4j-dbutils/ <
> https://github.com/wspeirs/sop4j-dbutils/>) into the commons-dbutils 2_0
> > branch (
> >
> https://gitbox.apache.org/repos/asf?p=commons-dbutils.git;a=commit;h=180c0990b1f0da4d0039904b68cc6b57f00558e5
> <
> https://gitbox.apache.org/repos/asf?p=commons-dbutils.git;a=commit;h=180c0990b1f0da4d0039904b68cc6b57f00558e5
> >
> > ).
> >
> > The code builds, and all the tests pass... that's as far as I went
> however.
> >
> > Carl, let me know if I can help more... thanks!
> >
> > Bill-
> >
> > On Mon, Dec 30, 2019 at 5:17 PM Carl Hall <thecarlhall@apache.org
> <ma...@apache.org>> wrote:
> >
> >> There was a 2_0 branch started several years ago[1]. That release was
> >> abandoned, the code wasn’t merged into master, and a fork was spurred
> >> outside of Apache[2]. I’d like to rectify this and work to a release.
> >>
> >> The code was moved to a different package in both repos, so merging
> isn’t
> >> straightforward. I can attempt to copy in the classes from the 2_0
> branch
> >> in gitbox or manually copy the classes from Bill’s GitHub account. Both
> >> seem like a lot of work with chances for accidentally unwinding more
> recent
> >> changes. I think a more detailed review would be better, but time isn’t
> on
> >> my side for that.
> >>
> >> Any suggestions for how to best proceed on this? Bill, if there’s anyway
> >> you could work the merge, I’ll manage the release.
> >>
> >> 1
> >>
> https://gitbox.apache.org/repos/asf?p=commons-dbutils.git;a=shortlog;h=refs/heads/2_0
> >> <
> >>
> https://gitbox.apache.org/repos/asf?p=commons-dbutils.git;a=shortlog;h=refs/heads/2_0
> <
> https://gitbox.apache.org/repos/asf?p=commons-dbutils.git;a=shortlog;h=refs/heads/2_0
> >
> >>>
> >> 2 https://github.com/wspeirs/sop4j-dbutils/tree/dbutils-2.2 <
> https://github.com/wspeirs/sop4j-dbutils/tree/dbutils-2.2> <
> >> https://github.com/wspeirs/sop4j-dbutils/tree/dbutils-2.2 <
> https://github.com/wspeirs/sop4j-dbutils/tree/dbutils-2.2>>
>
>