You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by el...@apache.org on 2016/03/23 17:14:54 UTC
calcite git commit: Restore Avatica development version to
1.8.0-SNAPSHOT.
Repository: calcite
Updated Branches:
refs/heads/master 4b93fa826 -> b37413336
Restore Avatica development version to 1.8.0-SNAPSHOT.
Looks like this got goofed up on the merge after 1.7.1.
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/b3741333
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/b3741333
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/b3741333
Branch: refs/heads/master
Commit: b374133361d31ebe8e136668b4a5148ce2cb83b1
Parents: 4b93fa8
Author: Josh Elser <el...@apache.org>
Authored: Wed Mar 23 12:12:35 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Mar 23 12:12:35 2016 -0400
----------------------------------------------------------------------
avatica/core/pom.xml | 2 +-
avatica/metrics-dropwizardmetrics3/pom.xml | 2 +-
avatica/metrics/pom.xml | 2 +-
avatica/noop-driver/pom.xml | 2 +-
avatica/pom.xml | 2 +-
avatica/server/pom.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/b3741333/avatica/core/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/core/pom.xml b/avatica/core/pom.xml
index bf62088..73e97ce 100644
--- a/avatica/core/pom.xml
+++ b/avatica/core/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
- <version>1.7.2-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>avatica</artifactId>
http://git-wip-us.apache.org/repos/asf/calcite/blob/b3741333/avatica/metrics-dropwizardmetrics3/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/metrics-dropwizardmetrics3/pom.xml b/avatica/metrics-dropwizardmetrics3/pom.xml
index 8f85a87..52e59e7 100644
--- a/avatica/metrics-dropwizardmetrics3/pom.xml
+++ b/avatica/metrics-dropwizardmetrics3/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
- <version>1.7.2-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>avatica-metrics-dropwizardmetrics3</artifactId>
http://git-wip-us.apache.org/repos/asf/calcite/blob/b3741333/avatica/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/metrics/pom.xml b/avatica/metrics/pom.xml
index 31f4db4..4e6d97b 100644
--- a/avatica/metrics/pom.xml
+++ b/avatica/metrics/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
- <version>1.7.2-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>avatica-metrics</artifactId>
http://git-wip-us.apache.org/repos/asf/calcite/blob/b3741333/avatica/noop-driver/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/noop-driver/pom.xml b/avatica/noop-driver/pom.xml
index 42744c8..2a6bc0b 100644
--- a/avatica/noop-driver/pom.xml
+++ b/avatica/noop-driver/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
- <version>1.7.2-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>avatica-noop-driver</artifactId>
http://git-wip-us.apache.org/repos/asf/calcite/blob/b3741333/avatica/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/pom.xml b/avatica/pom.xml
index cbcfea7..938b3a5 100644
--- a/avatica/pom.xml
+++ b/avatica/pom.xml
@@ -29,7 +29,7 @@ limitations under the License.
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
<packaging>pom</packaging>
- <version>1.7.2-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<!-- More project information. -->
<name>Apache Calcite Avatica Project</name>
http://git-wip-us.apache.org/repos/asf/calcite/blob/b3741333/avatica/server/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/server/pom.xml b/avatica/server/pom.xml
index 3b8bfdc..9bb841e 100644
--- a/avatica/server/pom.xml
+++ b/avatica/server/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
- <version>1.7.2-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>avatica-server</artifactId>
Re: calcite git commit: Restore Avatica development version to 1.8.0-SNAPSHOT.
Posted by 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.
Posted by 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 :)
Re: calcite git commit: Restore Avatica development version to 1.8.0-SNAPSHOT.
Posted by 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