Re: calcite git commit: Restore Avatica development version to 1.8.0-SNAPSHOT.

[Julian Hyde <jh...@apache.org>]

On Wed, Mar 23, 2016 at 9:14 AM,  <el...@apache.org> wrote:
>
> Restore Avatica development version to 1.8.0-SNAPSHOT.
>
> Looks like this got goofed up on the merge after 1.7.1.

I did the merge. I assumed you had a good reason to not set the
release back to 1.8.0-SNAPSHOT when you made the release, so I merged
the version number back in good faith.

Julian

Re: calcite git commit: Restore Avatica development version to 1.8.0-SNAPSHOT.

[Julian Hyde <jh...@apache.org>]

We've done things a bit differently in the past. For example, when we
released calcite 1.5.0 we created branch-1.5. The commit after the
release, the last commit on branch-1.5, which is also on the master
branch, sets version to 1.6.0-SNAPSHOT. The idea was that if we needed
to make a 1.5.1 we'd force-push to branch-1.5.

I'm not saying that was right or wrong. Mainly my naivete; I accepted
the default when maven-release-plugin asked me what the next version
should be. It worked out OK, and kept the history linear, mainly
because maintenance releases are the exception rather than the rule.

On Wed, Mar 23, 2016 at 10:05 AM, Josh Elser <jo...@gmail.com> wrote:
> Julian Hyde wrote:
>>
>> On Wed, Mar 23, 2016 at 9:14 AM,<el...@apache.org>  wrote:
>>>
>>> Restore Avatica development version to 1.8.0-SNAPSHOT.
>>>
>>> Looks like this got goofed up on the merge after 1.7.1.
>>
>>
>> I did the merge. I assumed you had a good reason to not set the
>> release back to 1.8.0-SNAPSHOT when you made the release, so I merged
>> the version number back in good faith.
>>
>> Julian
>
>
> No worries.
>
> branch-avatica-1.7 should remain at 1.7.2-SNAPSHOT ($deity forbid we have to
> make another hotfix release), but master should be set to 1.8.0-SNAPSHOT for
> the next release. At least, that's how I envisioned things working :)

Re: calcite git commit: Restore Avatica development version to 1.8.0-SNAPSHOT.

[Josh Elser <jo...@gmail.com>]

Julian Hyde wrote:
> On Wed, Mar 23, 2016 at 9:14 AM,<el...@apache.org>  wrote:
>> Restore Avatica development version to 1.8.0-SNAPSHOT.
>>
>> Looks like this got goofed up on the merge after 1.7.1.
>
> I did the merge. I assumed you had a good reason to not set the
> release back to 1.8.0-SNAPSHOT when you made the release, so I merged
> the version number back in good faith.
>
> Julian

No worries.

branch-avatica-1.7 should remain at 1.7.2-SNAPSHOT ($deity forbid we 
have to make another hotfix release), but master should be set to 
1.8.0-SNAPSHOT for the next release. At least, that's how I envisioned 
things working :)