calcite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jh...@apache.org
Subject incubator-calcite git commit: [CALCITE-930] Now Calcite is a top-level project, remove references to "incubating"
Date Thu, 22 Oct 2015 02:55:43 GMT
Repository: incubator-calcite
Updated Branches:
  refs/heads/master 9db3b023d -> 5ed5ef469


[CALCITE-930] Now Calcite is a top-level project, remove references to "incubating"

 Also remove "incubator", incubation disclaimer, fix URLs and mailing list names

 Update the PMC list


Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/5ed5ef46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/5ed5ef46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/5ed5ef46

Branch: refs/heads/master
Commit: 5ed5ef46909774c6284a6a7521cc3b2c0d23177a
Parents: 9db3b02
Author: Julian Hyde <jhyde@apache.org>
Authored: Wed Oct 21 18:43:29 2015 -0700
Committer: Julian Hyde <jhyde@apache.org>
Committed: Wed Oct 21 18:43:29 2015 -0700

----------------------------------------------------------------------
 .travis.yml                                     |   2 +-
 DISCLAIMER                                      |  12 --
 README                                          |  15 +-
 README.md                                       |   4 +-
 .../java/org/apache/calcite/model/JsonRoot.java |   2 +-
 .../org/apache/calcite/model/package-info.java  |   2 +-
 pom.xml                                         |  16 +-
 site/README.md                                  |   8 +-
 site/_config.yml                                |   6 +-
 site/_data/contributors.yml                     |  23 +--
 site/_docs/adapter.md                           |   2 +-
 site/_docs/api.md                               |   2 +-
 site/_docs/contributing.md                      |   6 +-
 site/_docs/downloads.md                         |  15 +-
 site/_docs/history.md                           |  43 +++--
 site/_docs/howto.md                             | 184 ++++++-------------
 site/_docs/index.md                             |  10 -
 site/_docs/tutorial.md                          |   4 +-
 .../2014-06-27-release-0.8.0-incubating.md      |   4 +-
 site/_sass/_style.scss                          |   9 -
 site/develop/index.md                           |  24 +--
 site/doap_calcite.rdf                           |  14 +-
 site/help/index.md                              |   6 +-
 site/index.html                                 |  21 ---
 24 files changed, 147 insertions(+), 287 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index f193dd8..395a92d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 # Configuration file for Travis continuous integration.
-# See https://travis-ci.org/apache/incubator-calcite
+# See https://travis-ci.org/apache/calcite
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 09695df..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,12 +0,0 @@
-Apache Calcite is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further
-review indicates that the infrastructure, communications, and decision
-making process have stabilized in a manner consistent with other
-successful ASF projects.
-
-While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the
-project has yet to be fully endorsed by the ASF.
-

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/README
----------------------------------------------------------------------
diff --git a/README b/README
index d1de7da..7b1640e 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Apache Calcite release 1.4.0 (incubating)
+Apache Calcite release 1.5.0
 
 This is a source or binary distribution of Apache Calcite.
 
@@ -14,15 +14,4 @@ doc/howto.md.
 README.md contains examples of running Calcite.
 
 Further information about Apache Calcite is available at its web site,
-http://calcite.incubator.apache.org.
-
-Disclaimer
-
-Apache Calcite is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Incubator. Incubation is
-required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making
-process have stabilized in a manner consistent with other successful
-ASF projects. While incubation status is not necessarily a reflection
-of the completeness or stability of the code, it does indicate that
-the project has yet to be fully endorsed by the ASF.
+http://calcite.apache.org.

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index fcdbc75..b490dc0 100644
--- a/README.md
+++ b/README.md
@@ -16,10 +16,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 {% endcomment %}
 -->
-[![Build Status](https://travis-ci.org/julianhyde/incubator-calcite.svg?branch=master)](https://travis-ci.org/julianhyde/incubator-calcite)
+[![Build Status](https://travis-ci.org/julianhyde/calcite.svg?branch=master)](https://travis-ci.org/julianhyde/calcite)
 
 # Apache Calcite
 
 Apache Calcite is a dynamic data management framework.
 
-For more details, see the [home page](http://calcite.incubator.apache.org).
+For more details, see the [home page](http://calcite.apache.org).

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/core/src/main/java/org/apache/calcite/model/JsonRoot.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/model/JsonRoot.java b/core/src/main/java/org/apache/calcite/model/JsonRoot.java
index d85d8e6..dfc517f 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonRoot.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonRoot.java
@@ -44,7 +44,7 @@ import java.util.List;
  * </pre>
  * <!-- CHECKSTYLE: ON -->
  *
- * <p>See the <a href="http://calcite.incubator.apache.org/docs/model.html">JSON
+ * <p>See the <a href="http://calcite.apache.org/docs/model.html">JSON
  * model reference</a>.
  */
 public class JsonRoot {

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/core/src/main/java/org/apache/calcite/model/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/model/package-info.java b/core/src/main/java/org/apache/calcite/model/package-info.java
index b792f65..3541c27 100644
--- a/core/src/main/java/org/apache/calcite/model/package-info.java
+++ b/core/src/main/java/org/apache/calcite/model/package-info.java
@@ -31,7 +31,7 @@
  * interfaces and including a custom schema in the model.</p>
  *
  * <p>There are several examples of schemas in the
- * <a href="https://github.com/apache/incubator-calcite/blob/master/doc/tutorial.md">tutorial</a>.
+ * <a href="https://github.com/apache/calcite/blob/master/doc/tutorial.md">tutorial</a>.
  */
 @PackageMarker
 package org.apache.calcite.model;

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 23567f9..0cac4a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,16 +32,16 @@ limitations under the License.
   <!-- More project information. -->
   <name>Calcite</name>
   <description>Calcite is a dynamic data management framework</description>
-  <url>http://calcite.incubator.apache.org</url>
+  <url>http://calcite.apache.org</url>
   <inceptionYear>2012</inceptionYear>
 
   <mailingLists>
     <mailingList>
       <name>Apache Calcite developers list</name>
-      <subscribe>dev-subscribe@calcite.incubator.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@calcite.incubator.apache.org</unsubscribe>
-      <post>dev@calcite.incubator.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/incubator-calcite-dev</archive>
+      <subscribe>dev-subscribe@calcite.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@calcite.apache.org</unsubscribe>
+      <post>dev@calcite.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/calcite-dev</archive>
     </mailingList>
   </mailingLists>
 
@@ -58,9 +58,9 @@ limitations under the License.
   </issueManagement>
 
   <scm>
-    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-calcite.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-calcite.git</developerConnection>
-    <url>https://github.com/apache/incubator-calcite</url>
+    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/calcite.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/calcite.git</developerConnection>
+    <url>https://github.com/apache/calcite</url>
     <tag>HEAD</tag>
   </scm>
 

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/README.md
----------------------------------------------------------------------
diff --git a/site/README.md b/site/README.md
index e48b853..23cab80 100644
--- a/site/README.md
+++ b/site/README.md
@@ -19,13 +19,13 @@ limitations under the License.
 
 # Apache Calcite docs site
 
-This directory contains the code for the Apache Calcite (incubating) web site,
-[calcite.incubator.apache.org](https://calcite.incubator.apache.org/).
+This directory contains the code for the Apache Calcite web site,
+[calcite.apache.org](https://calcite.apache.org/).
 
 ## Setup
 
 1. `cd site`
-2. svn co https://svn.apache.org/repos/asf/incubator/calcite/site target
+2. svn co https://svn.apache.org/repos/asf/calcite/site target
 3. `sudo apt-get install rubygems ruby2.1-dev zlib1g-dev` (linux)
 4. `sudo gem install bundler github-pages jekyll`
 5. `bundle install`
@@ -53,4 +53,4 @@ running from within the directory:
 
 Within a few minutes, svnpubsub should kick in and you'll be able to
 see the results at
-[calcite.incubator.apache.org](https://calcite.incubator.apache.org/).
+[calcite.apache.org](https://calcite.apache.org/).

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/_config.yml
----------------------------------------------------------------------
diff --git a/site/_config.yml b/site/_config.yml
index e850a15..58df559 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -17,7 +17,7 @@ markdown: kramdown
 permalink: /news/:year/:month/:day/:title/
 excerpt_separator: ""
 
-repository: https://github.com/apache/incubator-calcite
+repository: https://github.com/apache/calcite
 destination: target
 exclude: [README.md,Gemfile*]
 keep_files: [".git", ".svn", "apidocs"]
@@ -27,11 +27,11 @@ collections:
     output: true
 
 # The URL where the code can be found
-sourceRoot: https://github.com/apache/incubator-calcite/blob/master
+sourceRoot: https://github.com/apache/calcite/blob/master
 
 # The URL where Javadocs are located
 apiRoot: /apidocs
-# apiRoot: http://calcite.incubator.apache.org/apidocs
+# apiRoot: http://calcite.apache.org/apidocs
 
 # The base path where the website is deployed
 baseurl:

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/_data/contributors.yml
----------------------------------------------------------------------
diff --git a/site/_data/contributors.yml b/site/_data/contributors.yml
index 5163b10..6dbd958 100644
--- a/site/_data/contributors.yml
+++ b/site/_data/contributors.yml
@@ -20,22 +20,17 @@
   apacheId: gates
   githubId: alanfgates
   org: Hortonworks
-  role: Mentor
+  role: PMC
 - name: Aman Sinha
   apacheId: amansinha
   githubId: amansinha100
   org: MapR
-  role: Committer
+  role: PMC
 - name: Ashutosh Chauhan
   apacheId: hashutosh
   githubId: ashutoshc
   org: Hortonworks
   role: Champion
-- name: Chris Wensel
-  apacheId: cwensel
-  githubId: cwensel
-  org: Concurrent
-  role: PMC
 - name: James R. Taylor
   apacheId: jamestaylor
   githubId: JamesRTaylor
@@ -50,38 +45,38 @@
   apacheId: jcamacho
   githubId: jcamachor
   org: Hortonworks
-  role: Committer
+  role: PMC
 - name: Jinfeng Ni
   apacheId: jni
   githubId: jinfengni
   org: MapR
-  role: Committer
+  role: PMC
 - name: John Pullokkaran
   apacheId: jpullokk
   githubId: jpullokkaran
   org: Hortonworks
-  role: Committer
+  role: PMC
 - name: Julian Hyde
   apacheId: jhyde
   githubId: julianhyde
   org: Hortonworks
-  role: PMC
+  role: PMC Chair
   homepage: http://people.apache.org/~jhyde
 - name: Nick Dimiduk
   apacheId: ndimiduk
   githubId: ndimiduk
   org: Hortonworks
-  role: Committer
+  role: PMC
 - name: Steven Noels
   apacheId: stevenn
   githubId: stevenn
   org: NGData
-  role: Mentor
+  role: PMC
 - name: Ted Dunning
   apacheId: tdunning
   githubId: tdunning
   org: MapR
-  role: Mentor
+  role: PMC
   avatar: https://www.mapr.com/sites/default/files/otherpageimages/ted-circle-80.png
 - name: Vladimir Sitnikov
   apacheId: vladimirsitnikov

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/_docs/adapter.md
----------------------------------------------------------------------
diff --git a/site/_docs/adapter.md b/site/_docs/adapter.md
index be01384..57ae8cd 100644
--- a/site/_docs/adapter.md
+++ b/site/_docs/adapter.md
@@ -22,7 +22,7 @@ limitations under the License.
 {% endcomment %}
 -->
 
-* <a href="https://github.com/apache/incubator-drill">Apache Drill adapter</a>
+* <a href="https://github.com/apache/drill">Apache Drill adapter</a>
 * Cascading adapter (<a href="https://github.com/Cascading/lingual">Lingual</a>)
 * CSV adapter (example/csv)
 * JDBC adapter (part of <a href="{{ site.apiRoot }}/org/apache/calcite/adapter/jdbc/package-summary.html">calcite-core</a>)

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/_docs/api.md
----------------------------------------------------------------------
diff --git a/site/_docs/api.md b/site/_docs/api.md
index ba4704f..49f456b 100644
--- a/site/_docs/api.md
+++ b/site/_docs/api.md
@@ -1,7 +1,7 @@
 ---
 title: API
 layout: external
-external_url: http://calcite.incubator.apache.org/apidocs
+external_url: http://calcite.apache.org/apidocs
 ---
 {% comment %}
 Ideally, we want to use {{ site.apiRoot }} instead of hardcoding

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/_docs/contributing.md
----------------------------------------------------------------------
diff --git a/site/_docs/contributing.md b/site/_docs/contributing.md
index aa8b686..a79066b 100644
--- a/site/_docs/contributing.md
+++ b/site/_docs/contributing.md
@@ -47,18 +47,18 @@ combine them into a single commit, and to bring your code up to date
 with the latest on the main line.
 
 Then push your commit(s) to github, and create a pull request from
-your branch to the incubator-calcite master branch. Update the JIRA case
+your branch to the calcite master branch. Update the JIRA case
 to reference your pull request, and a committer will review your
 changes.
 
 ## Getting started
 
 Calcite is a community, so the first step to joining the project is to introduce yourself.
-Join the [developers list](http://mail-archives.apache.org/mod_mbox/incubator-calcite-dev/)
+Join the [developers list](http://mail-archives.apache.org/mod_mbox/calcite-dev/)
 and send an email.
 
 If you have the chance to attend a [meetup](http://www.meetup.com/Apache-Calcite/),
-or meet [members of the community](http://calcite.incubator.apache.org/team-list.html)
+or meet [members of the community](http://calcite.apache.org/develop)
 at a conference, that's also great.
 
 Choose an initial task to work on. It should be something really simple,

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/_docs/downloads.md
----------------------------------------------------------------------
diff --git a/site/_docs/downloads.md b/site/_docs/downloads.md
index 1da41b2..160da8d 100644
--- a/site/_docs/downloads.md
+++ b/site/_docs/downloads.md
@@ -29,7 +29,7 @@ Calcite is released as a source artifact, and also through Maven.
 
 Release          | Date       | Commit   | Notes | Download
 :--------------- | :--------- | :------- | :---- | :-------
-{% for post in site.categories.release %}{{ post.version }} | {{ post.date | date_to_string }} | <a href="https://github.com/apache/incubator-calcite/commit/{{ post.sha }}">{{ post.sha }}</a> | <a href="history.html#{{ post.tag }}">notes</a> | <a href="http://{% if forloop.index0 < 2 %}www.apache.org/dyn/closer.cgi{% else %}archive.apache.org/dist{% endif %}/incubator/calcite/{% if post.fullVersion %}{{ post.fullVersion }}{% else %}apache-calcite-{{ post.version }}{% endif %}">src</a>
+{% for post in site.categories.release %}{{ post.version }} | {{ post.date | date_to_string }} | <a href="https://github.com/apache/calcite/commit/{{ post.sha }}">{{ post.sha }}</a> | <a href="history.html#{{ post.tag }}">notes</a> | <a href="http://{% if forloop.index0 < 2 %}www.apache.org/dyn/closer.cgi{% else %}archive.apache.org/dist{% endif %}/calcite/{% if post.fullVersion %}{{ post.fullVersion }}{% else %}apache-calcite-{{ post.version }}{% endif %}">src</a>
       {% endfor %}
 
 # Maven artifacts
@@ -53,16 +53,3 @@ Add the following to the dependencies section of your `pom.xml` file:
 Also include `<dependency>` elements for any extension modules you
 need: `calcite-mongodb`, `calcite-spark`, `calcite-splunk`, and so
 forth.
-
-# Disclaimer
-
-Apache Calcite is an effort undergoing incubation at
-[The Apache Software Foundation (ASF)](http://www.apache.org),
-sponsored by the [Apache Incubator](http://incubator.apache.org/).
-Incubation is required of all newly accepted projects
-until a further review indicates that the infrastructure,
-communications, and decision making process have stabilized in a
-manner consistent with other successful ASF projects. While
-incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the
-project has yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/_docs/history.md
----------------------------------------------------------------------
diff --git a/site/_docs/history.md b/site/_docs/history.md
index 8b51e84..1c6799c 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -24,9 +24,14 @@ limitations under the License.
 -->
 
 For a full list of releases, see
-<a href="https://github.com/apache/incubator-calcite/releases">github</a>.
+<a href="https://github.com/apache/calcite/releases">github</a>.
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/calcite-1.4.0-incubating">1.4.0-incubating</a> / 2015-09-02
+## <a href="https://github.com/apache/calcite/releases/tag/calcite-1.5.0">1.5.0</a> / 2015-xx-xx
+{: #v1-5-0}
+
+Under development.
+
+## <a href="https://github.com/apache/calcite/releases/tag/calcite-1.4.0-incubating">1.4.0-incubating</a> / 2015-09-02
 {: #v1-4-0}
 
 In addition to a large number of bug fixes and minor enhancements,
@@ -207,7 +212,7 @@ Bug fixes, API changes and minor enhancements
   `version.minor` can be set just before a release, rather than just after as at
   present
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/calcite-1.3.0-incubating">1.3.0-incubating</a> / 2015-05-30
+## <a href="https://github.com/apache/calcite/releases/tag/calcite-1.3.0-incubating">1.3.0-incubating</a> / 2015-05-30
 {: #v1-3-0}
 
 Mainly bug-fixes, but this release adds support for
@@ -323,7 +328,7 @@ Bug-fixes and internal changes
 * [<a href="https://issues.apache.org/jira/browse/CALCITE-678">CALCITE-678</a>]
   `SemiJoinRule` mixes up fields when `Aggregate.groupSet` is not field #0
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/calcite-1.2.0-incubating">1.2.0-incubating</a> / 2015-04-07
+## <a href="https://github.com/apache/calcite/releases/tag/calcite-1.2.0-incubating">1.2.0-incubating</a> / 2015-04-07
 {: #v1-2-0}
 
 A short release, less than a month after 1.1.
@@ -453,7 +458,7 @@ Bug-fixes and internal changes
 * [<a href="https://issues.apache.org/jira/browse/CALCITE-619">CALCITE-619</a>]
   Slim down dependencies in parent POM
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/calcite-1.1.0-incubating">1.1.0-incubating</a> / 2015-03-13
+## <a href="https://github.com/apache/calcite/releases/tag/calcite-1.1.0-incubating">1.1.0-incubating</a> / 2015-03-13
 {: #v1-1-0}
 
 This Calcite release makes it possible to exploit physical properties
@@ -561,7 +566,7 @@ Bug-fixes and internal changes
 * [<a href="https://issues.apache.org/jira/browse/CALCITE-586">CALCITE-586</a>]
   Prevent JSON serialization of `Signature.internalParameters`
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/calcite-1.0.0-incubating">1.0.0-incubating</a> / 2015-01-31
+## <a href="https://github.com/apache/calcite/releases/tag/calcite-1.0.0-incubating">1.0.0-incubating</a> / 2015-01-31
 {: #v1-0-0}
 
 Calcite's first major release.
@@ -795,7 +800,7 @@ Bug-fixes and internal changes
 * Fix `JdbcTest.testVersion` now that version is 1.0
 * Update release HOWTO
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/calcite-0.9.2-incubating">0.9.2-incubating</a> / 2014-11-05
+## <a href="https://github.com/apache/calcite/releases/tag/calcite-0.9.2-incubating">0.9.2-incubating</a> / 2014-11-05
 {: #v0-9-2}
 
 A fairly minor release, and last release before we rename all of the
@@ -844,7 +849,7 @@ Bug-fixes and internal changes
 * Update `DiffRepository` documentation.
 * Add tests for windowed aggregates without `ORDER BY`. (Works already.)
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/calcite-0.9.1-incubating">0.9.1-incubating</a> / 2014-10-02
+## <a href="https://github.com/apache/calcite/releases/tag/calcite-0.9.1-incubating">0.9.1-incubating</a> / 2014-10-02
 {: #v0-9-1}
 
 This is the first release as Calcite. (The project was previously called Optiq.)
@@ -978,7 +983,7 @@ Bug-fixes and internal changes
   * Update JIRA cases following release
   * Instructions for making and verifying a release
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/optiq-0.9.0-incubating">0.9.0-incubating</a> / 2014-08-19
+## <a href="https://github.com/apache/calcite/releases/tag/optiq-0.9.0-incubating">0.9.0-incubating</a> / 2014-08-19
 {: #v0-9-0}
 
 This is the first release under the Apache incubator process.
@@ -1107,7 +1112,7 @@ Bug-fixes and internal changes
   Add unit test for `SqlRun`
 * Fix a bug where composite `SELECT DISTINCT` would return duplicate rows.
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/optiq-parent-0.8">0.8</a> / 2014-06-27
+## <a href="https://github.com/apache/calcite/releases/tag/optiq-parent-0.8">0.8</a> / 2014-06-27
 {: #v0-8}
 
 New features
@@ -1167,14 +1172,14 @@ Bug-fixes and internal changes
   Error casting MongoDB date
 * [<a href="https://issues.apache.org/jira/browse/CALCITE-284">CALCITE-284</a>]
   Window functions range defaults to `CURRENT ROW`
-* [<a href=https://issues.apache.org/jira/browse/CALCITE-285">CALCITE-285</a>]
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-285">CALCITE-285</a>]
   Window functions throw exception without `ORDER BY`
 * Test case for
-  [<a href=““https://issues.apache.org/jira/browse/CALCITE-285”>CALCITE-285</a>].
+  [<a href=“https://issues.apache.org/jira/browse/CALCITE-285”>CALCITE-285</a>].
 * [<a href="https://issues.apache.org/jira/browse/CALCITE-281">CALCITE-281</a>]
   `EXTRACT` function's SQL return type is `BIGINT` but implemented as Java `int`
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/optiq-parent-0.7">0.7</a> / 2014-05-13
+## <a href="https://github.com/apache/calcite/releases/tag/optiq-parent-0.7">0.7</a> / 2014-05-13
 {: #v0-7}
 
 New features
@@ -1245,7 +1250,7 @@ Bug-fixes and internal changes
 * [<a href="https://issues.apache.org/jira/browse/CALCITE-205">CALCITE-205</a>]
   Suspicious map.get in VolcanoPlanner.reregister
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/optiq-parent-0.6">0.6</a> / 2014-04-11
+## <a href="https://github.com/apache/calcite/releases/tag/optiq-parent-0.6">0.6</a> / 2014-04-11
 {: #v0-6}
 
 New features
@@ -1362,7 +1367,7 @@ Bug-fixes and internal changes
 * In planner, use `RelTrait.subsumes` rather than `equals` in an assert.
   (Jinfeng Ni)
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/optiq-parent-0.5">0.5</a> / 2014-03-14
+## <a href="https://github.com/apache/calcite/releases/tag/optiq-parent-0.5">0.5</a> / 2014-03-14
 {: #v0-5}
 
 New features
@@ -1457,7 +1462,7 @@ Bug-fixes and internal changes
   maven-central, we can make optiq-spark part of the regular build, and remove
   the spark profile.)
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/optiq-parent-0.4.18">0.4.18</a> / 2014-02-14
+## <a href="https://github.com/apache/calcite/releases/tag/optiq-parent-0.4.18">0.4.18</a> / 2014-02-14
 {: #v0-4-18}
 
 API and functionality changes
@@ -1551,7 +1556,7 @@ Bug-fixes and internal changes
 * Fix escaped unicode characters above 0x8000. Add tests for unicode
   strings.
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/optiq-parent-0.4.17">0.4.17</a> / 2014-01-13
+## <a href="https://github.com/apache/calcite/releases/tag/optiq-parent-0.4.17">0.4.17</a> / 2014-01-13
 {: #v0-4-17}
 
 API changes
@@ -1633,7 +1638,7 @@ Other
   password; not just dataSource.
 * Wrap internal error in `SQLException`.
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/optiq-parent-0.4.16">0.4.16</a> / 2013-11-24
+## <a href="https://github.com/apache/calcite/releases/tag/optiq-parent-0.4.16">0.4.16</a> / 2013-11-24
 {: #v0-4-16}
 
 * [<a href="https://issues.apache.org/jira/browse/CALCITE-69">CALCITE-69</a>]
@@ -1689,7 +1694,7 @@ Other
 * Upgrade to junit-4.11 (avoiding the dodgy junit-4.1.12).
 * Upgrade to linq4j-0.1.11.
 
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/optiq-parent-0.4.15">0.4.15</a> / 2013-10-14
+## <a href="https://github.com/apache/calcite/releases/tag/optiq-parent-0.4.15">0.4.15</a> / 2013-10-14
 {: #v0-4-15}
 
 * Lots of good stuff that this margin is too small to contain. See

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/_docs/howto.md
----------------------------------------------------------------------
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 6b7c904..d074fb9 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -36,8 +36,8 @@ Unpack the source distribution `.tar.gz` or `.zip` file,
 then build using maven:
 
 {% highlight bash %}
-$ tar xvfz calcite-1.4.0-incubating-source.tar.gz
-$ cd calcite-1.4.0-incubating
+$ tar xvfz calcite-1.5.0-source.tar.gz
+$ cd calcite-1.5.0
 $ mvn install
 {% endhighlight %}
 
@@ -54,8 +54,8 @@ Create a local copy of the github repository,
 then build using maven:
 
 {% highlight bash %}
-$ git clone git://github.com/apache/incubator-calcite.git
-$ cd incubator-calcite
+$ git clone git://github.com/apache/calcite.git
+$ cd calcite
 $ mvn install
 {% endhighlight %}
 
@@ -178,18 +178,18 @@ combine them into a single commit, and to bring your code up to date
 with the latest on the main line.
 
 Then push your commit(s) to github, and create a pull request from
-your branch to the incubator-calcite master branch. Update the JIRA case
+your branch to the calcite master branch. Update the JIRA case
 to reference your pull request, and a committer will review your
 changes.
 
 ## Getting started
 
 Calcite is a community, so the first step to joining the project is to introduce yourself.
-Join the [developers list](http://mail-archives.apache.org/mod_mbox/incubator-calcite-dev/)
+Join the [developers list](http://mail-archives.apache.org/mod_mbox/calcite-dev/)
 and send an email.
 
 If you have the chance to attend a [meetup](http://www.meetup.com/Apache-Calcite/),
-or meet [members of the community](http://calcite.incubator.apache.org/team-list.html)
+or meet [members of the community](http://calcite.apache.org/develop)
 at a conference, that's also great.
 
 Choose an initial task to work on. It should be something really simple,
@@ -498,31 +498,30 @@ git clean -xn
 mvn clean
 
 # Do a dry run of the release:prepare step, which sets version numbers.
-mvn -DdryRun=true -DskipTests -DreleaseVersion=X.Y.Z-incubating -DdevelopmentVersion=X.Y.Z+1-incubating-SNAPSHOT -Papache-release -Darguments="-Dgpg.passphrase=${GPG_PASSPHRASE}" release:prepare 2>&1 | tee /tmp/prepare-dry.log
+mvn -DdryRun=true -DskipTests -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X.Y.Z+1-SNAPSHOT -Papache-release -Darguments="-Dgpg.passphrase=${GPG_PASSPHRASE}" release:prepare 2>&1 | tee /tmp/prepare-dry.log
 {% endhighlight %}
 
 Check the artifacts:
 
 * In the `target` directory should be these 8 files, among others:
-  * apache-calcite-X.Y.Z-incubating-src.tar.gz
-  * apache-calcite-X.Y.Z-incubating-src.tar.gz.asc
-  * apache-calcite-X.Y.Z-incubating-src.tar.gz.md5
-  * apache-calcite-X.Y.Z-incubating-src.tar.gz.sha1
-  * apache-calcite-X.Y.Z-incubating-src.zip
-  * apache-calcite-X.Y.Z-incubating-src.zip.asc
-  * apache-calcite-X.Y.Z-incubating-src.zip.md5
-  * apache-calcite-X.Y.Z-incubating-src.zip.sha1
-* Note that the file names start `apache-calcite-` and include
-  `incubating` in the version.
+  * apache-calcite-X.Y.Z-src.tar.gz
+  * apache-calcite-X.Y.Z-src.tar.gz.asc
+  * apache-calcite-X.Y.Z-src.tar.gz.md5
+  * apache-calcite-X.Y.Z-src.tar.gz.sha1
+  * apache-calcite-X.Y.Z-src.zip
+  * apache-calcite-X.Y.Z-src.zip.asc
+  * apache-calcite-X.Y.Z-src.zip.md5
+  * apache-calcite-X.Y.Z-src.zip.sha1
+* Note that the file names start `apache-calcite-`.
 * In the two source distros `.tar.gz` and `.zip` (currently there is
   no binary distro), check that all files belong to a directory called
-  `apache-calcite-X.Y.Z-incubating-src`.
-* That directory must contain files `DISCLAIMER`, `NOTICE`, `LICENSE`,
+  `apache-calcite-X.Y.Z-src`.
+* That directory must contain files `NOTICE`, `LICENSE`,
   `README`, `README.md`
   * Check that the version in `README` is correct
 * In each .jar (for example
-  `core/target/calcite-core-X.Y.Z-incubating.jar` and
-  `mongodb/target/calcite-mongodb-X.Y.Z-incubating-sources.jar`), check
+  `core/target/calcite-core-X.Y.Z.jar` and
+  `mongodb/target/calcite-mongodb-X.Y.Z-sources.jar`), check
   that the `META-INF` directory contains `DEPENDENCIES`, `LICENSE`,
   `NOTICE` and `git.properties`
 * In each .jar, check that `org-apache-calcite-jdbc.properties` is
@@ -533,7 +532,7 @@ Now, remove the `-DdryRun` flag and run the release for real.
 
 {% highlight bash %}
 # Prepare sets the version numbers, creates a tag, and pushes it to git.
-mvn -DdryRun=false -DskipTests -DreleaseVersion=X.Y.Z-incubating -DdevelopmentVersion=X.Y.Z+1-incubating-SNAPSHOT -Papache-release -Darguments="-Dgpg.passphrase=${GPG_PASSPHRASE}" release:prepare 2>&1 | tee /tmp/prepare.log
+mvn -DdryRun=false -DskipTests -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X.Y.Z+1-SNAPSHOT -Papache-release -Darguments="-Dgpg.passphrase=${GPG_PASSPHRASE}" release:prepare 2>&1 | tee /tmp/prepare.log
 
 # Perform checks out the tagged version, builds, and deploys to the staging repository
 mvn -DskipTests -Papache-release -Darguments="-Dgpg.passphrase=${GPG_PASSPHRASE}" release:perform 2>&1 | tee /tmp/perform.log
@@ -551,23 +550,23 @@ Verify the staged artifacts in the Nexus repository:
   (or a similar URL)
 
 Upload the artifacts via subversion to a staging area,
-https://dist.apache.org/repos/dist/dev/incubator/calcite/apache-calcite-X.Y.Z-incubating-rcN:
+https://dist.apache.org/repos/dist/dev/calcite/apache-calcite-X.Y.Z-rcN:
 
 {% highlight bash %}
 # Create a subversion workspace, if you haven't already
 mkdir -p ~/dist/dev
 pushd ~/dist/dev
-svn co https://dist.apache.org/repos/dist/dev/incubator/calcite
+svn co https://dist.apache.org/repos/dist/dev/calcite
 popd
 
 # Move the files into a directory
 cd target
-mkdir ~/dist/dev/calcite/apache-calcite-X.Y.Z-incubating-rcN
-mv apache-calcite-* ~/dist/dev/calcite/apache-calcite-X.Y.Z-incubating-rcN
+mkdir ~/dist/dev/calcite/apache-calcite-X.Y.Z-rcN
+mv apache-calcite-* ~/dist/dev/calcite/apache-calcite-X.Y.Z-rcN
 
 # Check in
 cd ~/dist/dev/calcite
-svn add apache-calcite-X.Y.Z-incubating-rcN
+svn add apache-calcite-X.Y.Z-rcN
 svn ci
 {% endhighlight %}
 
@@ -579,8 +578,8 @@ svn ci
 git tag
 
 # If the tag exists, delete it locally and remotely
-git tag -d apache-calcite-X.Y.Z-incubating
-git push origin :refs/tags/apache-calcite-X.Y.Z-incubating
+git tag -d apache-calcite-X.Y.Z
+git push origin :refs/tags/apache-calcite-X.Y.Z
 
 # Remove modified files
 mvn release:clean
@@ -598,7 +597,7 @@ git reset --hard HEAD
 gpg --recv-keys key
 
 # Check keys
-curl -O https://dist.apache.org/repos/dist/release/incubator/calcite/KEYS
+curl -O https://dist.apache.org/repos/dist/release/calcite/KEYS
 
 # Sign/check md5 and sha1 hashes
 # (Assumes your O/S has 'md5' and 'sha1' commands.)
@@ -630,7 +629,7 @@ function checkHash() {
     fi
   done
 }
-checkHash apache-calcite-X.Y.Z-incubating-rcN
+checkHash apache-calcite-X.Y.Z-rcN
 {% endhighlight %}
 
 ## Get approval for a release via Apache voting process (for Calcite committers)
@@ -638,24 +637,24 @@ checkHash apache-calcite-X.Y.Z-incubating-rcN
 Release vote on dev list
 
 {% highlight text %}
-To: dev@calcite.incubator.apache.org
-Subject: [VOTE] Release apache-calcite-X.Y.Z-incubating (release candidate N)
+To: dev@calcite.apache.org
+Subject: [VOTE] Release apache-calcite-X.Y.Z (release candidate N)
 
 Hi all,
 
-I have created a build for Apache Calcite X.Y.Z-incubating, release candidate N.
+I have created a build for Apache Calcite X.Y.Z, release candidate N.
 
 Thanks to everyone who has contributed to this release.
 <Further details about release.> You can read the release notes here:
-https://github.com/apache/incubator-calcite/blob/XXXX/site/_docs/history.md
+https://github.com/apache/calcite/blob/XXXX/site/_docs/history.md
 
 The commit to be voted upon:
-http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/NNNNNN
+http://git-wip-us.apache.org/repos/asf/calcite/commit/NNNNNN
 
 Its hash is XXXX.
 
 The artifacts to be voted on are located here:
-https://dist.apache.org/repos/dist/dev/incubator/calcite/apache-calcite-X.Y.Z-incubating-rcN/
+https://dist.apache.org/repos/dist/dev/calcite/apache-calcite-X.Y.Z-rcN/
 
 The hashes of the artifacts are as follows:
 src.tar.gz.md5 XXXX
@@ -669,12 +668,12 @@ https://repository.apache.org/content/repositories/orgapachecalcite-NNNN
 Release artifacts are signed with the following key:
 https://people.apache.org/keys/committer/jhyde.asc
 
-Please vote on releasing this package as Apache Calcite X.Y.Z-incubating.
+Please vote on releasing this package as Apache Calcite X.Y.Z.
 
 The vote is open for the next 72 hours and passes if a majority of
-at least three +1 PPMC votes are cast.
+at least three +1 PMC votes are cast.
 
-[ ] +1 Release this package as Apache Calcite X.Y.Z-incubating
+[ ] +1 Release this package as Apache Calcite X.Y.Z
 [ ]  0 I don't feel strongly about it, but I'm okay with the release
 [ ] -1 Do not release this package because...
 
@@ -689,8 +688,8 @@ Julian
 After vote finishes, send out the result:
 
 {% highlight text %}
-Subject: [RESULT] [VOTE] Release apache-calcite-X.Y.Z-incubating (release candidate N)
-To: dev@calcite.incubator.apache.org
+Subject: [RESULT] [VOTE] Release apache-calcite-X.Y.Z (release candidate N)
+To: dev@calcite.apache.org
 
 Thanks to everyone who has tested the release candidate and given
 their comments and votes.
@@ -706,10 +705,13 @@ N non-binding +1s:
 No 0s or -1s.
 
 Therefore I am delighted to announce that the proposal to release
-Apache Calcite X.Y.Z-incubating has passed.
+Apache Calcite X.Y.Z has passed.
+
+Thanks everyone. We’ll now roll the release out to the mirrors.
+
+There was some feedback during voting. I shall open a separate
+thread to discuss.
 
-I'll now start a vote on the general list. Those of you in the IPMC,
-please recast your vote on the new thread.
 
 Julian
 {% endhighlight %}
@@ -719,74 +721,6 @@ shortened URLs for the vote proposal and result emails. Examples:
 [s.apache.org/calcite-1.2-vote](http://s.apache.org/calcite-1.2-vote) and
 [s.apache.org/calcite-1.2-result](http://s.apache.org/calcite-1.2-result).
 
-Propose a vote on the incubator list.
-
-{% highlight text %}
-To: general@incubator.apache.org
-Subject: [VOTE] Release Apache Calcite X.Y.Z (incubating)
-
-Hi all,
-
-The Calcite community has voted on and approved a proposal to release
-Apache Calcite X.Y.Z (incubating).
-
-Proposal:
-http://s.apache.org/calcite-X.Y.Z-vote
-
-Vote result:
-N binding +1 votes
-N non-binding +1 votes
-No -1 votes
-http://s.apache.org/calcite-X.Y.Z-result
-
-The commit to be voted upon:
-http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/NNNNNN
-
-Its hash is XXXX.
-
-The artifacts to be voted on are located here:
-https://dist.apache.org/repos/dist/dev/incubator/calcite/apache-calcite-X.Y.Z-incubating-rcN/
-
-The hashes of the artifacts are as follows:
-src.tar.gz.md5 XXXX
-src.tar.gz.sha1 XXXX
-src.zip.md5 XXXX
-src.zip.sha1 XXXX
-
-A staged Maven repository is available for review at:
-https://repository.apache.org/content/repositories/orgapachecalcite-NNNN
-
-Release artifacts are signed with the following key:
-https://people.apache.org/keys/committer/jhyde.asc
-
-Pursuant to the Releases section of the Incubation Policy and with
-the endorsement of NNN of our mentors we would now like to request
-the permission of the Incubator PMC to publish the release. The vote
-is open for 72 hours, or until the necessary number of votes (3 +1)
-is reached.
-
-[ ] +1 Release this package as Apache Calcite X.Y.Z incubating
-[ ] -1 Do not release this package because...
-
-Julian Hyde, on behalf of Apache Calcite PPMC
-{% endhighlight %}
-
-After vote finishes, send out the result:
-
-{% highlight text %}
-To: general@incubator.apache.org
-Subject: [RESULT] [VOTE] Release Apache Calcite X.Y.Z (incubating)
-
-This vote passes with N +1s and no 0 or -1 votes:
-+1 <name> (mentor)
-
-There was some feedback during voting. I shall open a separate
-thread to discuss.
-
-Thanks everyone. We’ll now roll the release out to the mirrors.
-
-Julian
-{% endhighlight %}
 
 ## Publishing a release (for Calcite committers)
 
@@ -794,10 +728,10 @@ After a successful release vote, we need to push the release
 out to mirrors, and other tasks.
 
 In JIRA, search for
-[all issues resolved in this release](https://issues.apache.org/jira/issues/?jql=project%20%3D%20CALCITE%20and%20fixVersion%20%3D%201.3.0-incubating%20and%20status%20%3D%20Resolved%20and%20resolution%20%3D%20Fixed),
+[all issues resolved in this release](https://issues.apache.org/jira/issues/?jql=project%20%3D%20CALCITE%20and%20fixVersion%20%3D%201.5.0%20and%20status%20%3D%20Resolved%20and%20resolution%20%3D%20Fixed),
 and do a bulk update changing their status to "Closed",
 with a change comment
-"Resolved in release X.Y.Z-incubating (YYYY-MM-DD)"
+"Resolved in release X.Y.Z (YYYY-MM-DD)"
 (fill in release number and date appropriately).
 Uncheck "Send mail for this update".
 
@@ -814,37 +748,37 @@ Check the artifacts into svn.
 # Get the release candidate.
 mkdir -p ~/dist/dev
 cd ~/dist/dev
-svn co https://dist.apache.org/repos/dist/dev/incubator/calcite
+svn co https://dist.apache.org/repos/dist/dev/calcite
 
 # Copy the artifacts. Note that the copy does not have '-rcN' suffix.
 mkdir -p ~/dist/release
 cd ~/dist/release
-svn co https://dist.apache.org/repos/dist/release/incubator/calcite
+svn co https://dist.apache.org/repos/dist/release/calcite
 cd calcite
-cp -rp ../../dev/calcite/apache-calcite-X.Y.Z-incubating-rcN apache-calcite-X.Y.Z-incubating
-svn add apache-calcite-X.Y.Z-incubating
+cp -rp ../../dev/calcite/apache-calcite-X.Y.Z-rcN apache-calcite-X.Y.Z
+svn add apache-calcite-X.Y.Z
 
 # Check in.
 svn ci
 {% endhighlight %}
 
 Svnpubsub will publish to
-https://dist.apache.org/repos/dist/release/incubator/calcite and propagate to
-http://www.apache.org/dyn/closer.cgi/incubator/calcite within 24 hours.
+https://dist.apache.org/repos/dist/release/calcite and propagate to
+http://www.apache.org/dyn/closer.cgi/calcite within 24 hours.
 
 If there are now more than 2 releases, clear out the oldest ones:
 
 {% highlight bash %}
 cd ~/dist/release/calcite
-svn rm apache-calcite-X.Y.Z-incubating
+svn rm apache-calcite-X.Y.Z
 svn ci
 {% endhighlight %}
 
 The old releases will remain available in the
-[release archive](http://archive.apache.org/dist/incubator/calcite/).
+[release archive](http://archive.apache.org/dist/calcite/).
 
 Add a release note by copying
-[site/_posts/2015-03-13-release-1.1.0-incubating.md]({{ site.sourceRoot }}/site/_posts/2015-03-13-release-1.1.0-incubating.md),
+[site/_posts/2015-xx-xx-release-1.5.0.md]({{ site.sourceRoot }}/site/_posts/2015-xx-xx-release-1.5.0.md),
 [publish the site](#publish-the-web-site),
 and check that it appears in the contents in [news](http://localhost:4000/news/).
 

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/_docs/index.md
----------------------------------------------------------------------
diff --git a/site/_docs/index.md b/site/_docs/index.md
index 761630c..6f89946 100644
--- a/site/_docs/index.md
+++ b/site/_docs/index.md
@@ -143,13 +143,3 @@ The following features are complete.
 * Several [adapters](adapter.html)
 
 
-## Disclaimer
-
-Apache Calcite is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Incubator. Incubation is
-required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making
-process have stabilized in a manner consistent with other successful
-ASF projects. While incubation status is not necessarily a reflection
-of the completeness or stability of the code, it does indicate that
-the project has yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/_docs/tutorial.md
----------------------------------------------------------------------
diff --git a/site/_docs/tutorial.md b/site/_docs/tutorial.md
index 0e6f581..73f8f8f 100644
--- a/site/_docs/tutorial.md
+++ b/site/_docs/tutorial.md
@@ -56,8 +56,8 @@ several important concepts:
 You need Java (1.7 or higher; 1.8 preferred), git and maven (3.2.1 or later).
 
 {% highlight bash %}
-$ git clone https://github.com/apache/incubator-calcite.git
-$ cd incubator-calcite
+$ git clone https://github.com/apache/calcite.git
+$ cd calcite
 $ mvn install -DskipTests -Dcheckstyle.skip=true
 $ cd example/csv
 {% endhighlight %}

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/_posts/2014-06-27-release-0.8.0-incubating.md
----------------------------------------------------------------------
diff --git a/site/_posts/2014-06-27-release-0.8.0-incubating.md b/site/_posts/2014-06-27-release-0.8.0-incubating.md
index 588edaf..83f975d 100644
--- a/site/_posts/2014-06-27-release-0.8.0-incubating.md
+++ b/site/_posts/2014-06-27-release-0.8.0-incubating.md
@@ -26,4 +26,6 @@ limitations under the License.
 {% endcomment %}
 -->
 
-This is the first release under the Apache incubator process.
+Several new features, including a heuristic rule to plan queries with
+a large number of joins, a number of windowed aggregate functions, and
+new utility, `SqlRun`.

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/_sass/_style.scss
----------------------------------------------------------------------
diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index 5edcedb..d6e832a 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -222,15 +222,6 @@ footer {
   .intro p { font-size: 3.2em; }
 }
 
-.disclaimer {
-  h3 {
-    font-size: 16px;
-  }
-  p {
-    font-size: 14px;
-  }
-}
-
 /* Quickstart */
 
 .quickstart {

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/develop/index.md
----------------------------------------------------------------------
diff --git a/site/develop/index.md b/site/develop/index.md
index 9ffc729..2e9e120 100644
--- a/site/develop/index.md
+++ b/site/develop/index.md
@@ -34,23 +34,23 @@ Name | Apache Id | Github | Organization | Role
 
 There are several development mailing lists for Calcite:
 
-* [dev@calcite.incubator.apache.org](mailto:dev@calcite.incubator.apache.org) - Development discussions
-  [[archive](https://mail-archives.apache.org/mod_mbox/incubator-calcite-dev/)]
-* [issues@calcite.incubator.apache.org](mailto:issues@calcite.incubator.apache.org) - Bug tracking
-  [[archive](https://mail-archives.apache.org/mod_mbox/incubator-calcite-issues/)]
-* [commits@calcite.incubator.apache.org](mailto:commits@calcite.incubator.apache.org) - Git tracking
-  [[archive](https://mail-archives.apache.org/mod_mbox/incubator-calcite-commits/)]
+* [dev@calcite.apache.org](mailto:dev@calcite.apache.org) - Development discussions
+  [[archive](https://mail-archives.apache.org/mod_mbox/calcite-dev/)]
+* [issues@calcite.apache.org](mailto:issues@calcite.apache.org) - Bug tracking
+  [[archive](https://mail-archives.apache.org/mod_mbox/calcite-issues/)]
+* [commits@calcite.apache.org](mailto:commits@calcite.apache.org) - Git tracking
+  [[archive](https://mail-archives.apache.org/mod_mbox/calcite-commits/)]
 
 You can subscribe to the lists by sending email to
-*list*-subscribe@calcite.incubator.apache.org and unsubscribe by sending email to
-*list*-unsubscribe@calcite.incubator.apache.org.
+*list*-subscribe@calcite.apache.org and unsubscribe by sending email to
+*list*-unsubscribe@calcite.apache.org.
 
 ## Source code
 
 Calcite uses git for version control.  The canonical source is in
-[Apache](https://git-wip-us.apache.org/repos/asf/incubator-calcite.git),
+[Apache](https://git-wip-us.apache.org/repos/asf/calcite.git),
 but most people find the
-[Github mirror](https://github.com/apache/incubator-calcite) more
+[Github mirror](https://github.com/apache/calcite) more
 user-friendly.
 
 ## Download source, build, and run tests
@@ -62,8 +62,8 @@ Create a local copy of the git repository, cd to its root directory,
 then build using maven:
 
 {% highlight bash %}
-$ git clone git://github.com/apache/incubator-calcite.git
-$ cd incubator-calcite
+$ git clone git://github.com/apache/calcite.git
+$ cd calcite
 $ mvn install
 {% endhighlight %}
 

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/doap_calcite.rdf
----------------------------------------------------------------------
diff --git a/site/doap_calcite.rdf b/site/doap_calcite.rdf
index 5a59ca7..65db4a5 100644
--- a/site/doap_calcite.rdf
+++ b/site/doap_calcite.rdf
@@ -21,12 +21,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-  <Project rdf:about="https://calcite.incubator.apache.org">
+  <Project rdf:about="https://calcite.apache.org">
     <created>2015-05-27</created>
     <license rdf:resource="http://spdx.org/licenses/Apache-2.0" />
     <name>Apache Calcite</name>
-    <homepage rdf:resource="https://calcite.incubator.apache.org" />
-    <asfext:pmc rdf:resource="https://calcite.incubator.apache.org" />
+    <homepage rdf:resource="https://calcite.apache.org" />
+    <asfext:pmc rdf:resource="https://calcite.apache.org" />
     <shortdesc>A dynamic data management framework.</shortdesc>
     <description>Calcite is a framework for writing data management
       systems.  It converts queries, represented in relational algebra,
@@ -37,16 +37,16 @@ limitations under the License.
       operator types, metadata, and cost model are added at runtime as
       plugins.</description>
     <bug-database rdf:resource="https://issues.apache.org/jira/browse/CALCITE" />
-    <mailing-list rdf:resource="https://calcite.incubator.apache.org/develop" />
-    <download-page rdf:resource="https://calcite.incubator.apache.org/downloads" />
+    <mailing-list rdf:resource="https://calcite.apache.org/develop" />
+    <download-page rdf:resource="https://calcite.apache.org/docs/downloads.html" />
     <programming-language>Java</programming-language>
     <category rdf:resource="http://projects.apache.org/category/big-data" />
     <category rdf:resource="http://projects.apache.org/category/hadoop" />
     <category rdf:resource="http://projects.apache.org/category/sql" />
     <repository>
       <GitRepository>
-        <location rdf:resource="https://git-wip-us.apache.org/repos/asf/incubator-calcite.git"/>
-        <browse rdf:resource="https://github.com/apache/incubator-calcite"/>
+        <location rdf:resource="https://git-wip-us.apache.org/repos/asf/calcite.git"/>
+        <browse rdf:resource="https://github.com/apache/calcite"/>
       </GitRepository>
     </repository>
     <maintainer>

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/help/index.md
----------------------------------------------------------------------
diff --git a/site/help/index.md b/site/help/index.md
index 65921b4..9ef2a62 100644
--- a/site/help/index.md
+++ b/site/help/index.md
@@ -26,11 +26,11 @@ Need help with Calcite? Try these resources.
 ## Mailing Lists
 
 The best option is to send email to the developers list
-[dev@calcite.incubator.apache.org](mailto:dev@calcite.incubator.apache.org). All
+[dev@calcite.apache.org](mailto:dev@calcite.apache.org). All
 of the historic traffic is available in the
 [archive](http://mail-archives.apache.org/mod_mbox/calcite-dev/). To
 subscribe to the user list, please send email to
-[dev-subscribe@calcite.incubator.apache.org](mailto:dev-subscribe@calcite.incubator.apache.org).
+[dev-subscribe@calcite.apache.org](mailto:dev-subscribe@calcite.apache.org).
 
 ## Bug Reports
 
@@ -47,4 +47,4 @@ your question.
 ## Browse the code
 
 One of the advantages of open source software is that you can browse the code.
-The code is available on [github](https://github.com/apache/incubator-calcite/tree/master).
+The code is available on [github](https://github.com/apache/calcite/tree/master).

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/5ed5ef46/site/index.html
----------------------------------------------------------------------
diff --git a/site/index.html b/site/index.html
index 55f61f1..a81cd9b 100644
--- a/site/index.html
+++ b/site/index.html
@@ -47,25 +47,4 @@ limitations under the License.
     </div>
     <div class="clear"></div>
   </div>
-  <div class="unit whole"><p>&nbsp;</p></div>
-</section>
-<section class="disclaimer">
-  <div class="grid">
-    <div class="unit whole">
-      <article>
-        <h3>Disclaimer</h3>
-        <p>Apache Calcite is an effort undergoing incubation at
-          <a href="http://www.apache.org">The Apache Software Foundation</a>,
-          sponsored by the
-          <a href="http://incubator.apache.org/">Apache Incubator</a>.
-          Incubation is required of all newly accepted projects
-          until a further review indicates that the infrastructure,
-          communications, and decision making process have stabilized in a
-          manner consistent with other successful ASF projects. While
-          incubation status is not necessarily a reflection of the
-          completeness or stability of the code, it does indicate that the
-          project has yet to be fully endorsed by the ASF.</p>
-      </article>
-    </div>
-  </div>
 </section>


Mime
View raw message