Repository: calcite-avatica Updated Branches: refs/heads/master 887f48d2d -> 97d90a32e
News item for avatica-1.10 Change "Dockerhub" to "Docker Hub" Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica/commit/97d90a32 Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica/tree/97d90a32 Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica/diff/97d90a32 Branch: refs/heads/master Commit: 97d90a32e191861e013b041144ce775560069860 Parents: 887f48d Author: Julian Hyde <[email protected]> Authored: Thu May 25 13:03:36 2017 -0700 Committer: Julian Hyde <[email protected]> Committed: Tue May 30 02:15:13 2017 -0700 ---------------------------------------------------------------------- docker/README.md | 4 +- .../verify-dockerhub-dockerfile-version.groovy | 2 +- site/README.md | 14 ++++-- site/_docs/docker_images.md | 34 +++++++-------- site/_docs/howto.md | 14 +++--- site/_posts/2017-05-30-release-1.10.0.md | 46 ++++++++++++++++++++ site/downloads/index.md | 18 ++++++-- 7 files changed, 99 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/97d90a32/docker/README.md ---------------------------------------------------------------------- diff --git a/docker/README.md b/docker/README.md index 2633a9c..3cb41bf 100644 --- a/docker/README.md +++ b/docker/README.md @@ -37,10 +37,10 @@ A number of Dockerfiles for different databases are provided. Presently, they in * [MySQL](https://github.com/apache/calcite-avatica/tree/master/docker/src/main/docker/mysql) * [PostgreSQL](https://github.com/apache/calcite-avatica/tree/master/docker/src/main/docker/postgresql) -## Dockerhub +## Docker Hub `src/main/dockerhub` contains a copy of the same `avatica-server` Dockerfile that is present in `src/main/docker` that is designed to be used with the -automation around publishing Docker images to the Apache Dockerhub account. +automation around publishing Docker images to the Apache Docker Hub account. It is not expected that users would interact with this Dockerfile. http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/97d90a32/docker/src/test/scripts/verify-dockerhub-dockerfile-version.groovy ---------------------------------------------------------------------- diff --git a/docker/src/test/scripts/verify-dockerhub-dockerfile-version.groovy b/docker/src/test/scripts/verify-dockerhub-dockerfile-version.groovy index 2908be2..66c7bec 100644 --- a/docker/src/test/scripts/verify-dockerhub-dockerfile-version.groovy +++ b/docker/src/test/scripts/verify-dockerhub-dockerfile-version.groovy @@ -19,7 +19,7 @@ import java.io.File; import java.nio.file.Files; -System.out.println("Verifying the included version in the Dockerhub Dockerfile"); +System.out.println("Verifying the included version in the Docker Hub Dockerfile"); String expectedPrefix = "ARG AVATICA_VERSION="; String expectedVersion = project.getVersion(); http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/97d90a32/site/README.md ---------------------------------------------------------------------- diff --git a/site/README.md b/site/README.md index bd80bf1..8bf7f44 100644 --- a/site/README.md +++ b/site/README.md @@ -26,15 +26,21 @@ a sub-directory of the ## Setup -1. Set up Calcite web site as described in its - [README](../site/README.md). +Similar to the instructions to +[set up the Calcite web site](../site/README.md). + +1. `cd site` +2. `svn co https://svn.apache.org/repos/asf/calcite/site/avatica target/avatica` +3. `sudo apt-get install rubygems ruby2.1-dev zlib1g-dev` (linux) +4. `sudo gem install bundler github-pages jekyll jekyll-oembed` +5. `bundle install` ## Add javadoc 1. `cd avatica` 2. `mvn -DskipTests site` -3. `rm -rf ../site/target/avatica/apidocs ../site/target/avatica/testapidocs` -4. `mv target/site/apidocs target/site/testapidocs ../site/target/avatica` +3. `rm -rf site/target/avatica/apidocs site/target/avatica/testapidocs` +4. `mv target/site/apidocs target/site/testapidocs site/target/avatica` ## Running locally http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/97d90a32/site/_docs/docker_images.md ---------------------------------------------------------------------- diff --git a/site/_docs/docker_images.md b/site/_docs/docker_images.md index 46976f7..c4662ea 100644 --- a/site/_docs/docker_images.md +++ b/site/_docs/docker_images.md @@ -34,7 +34,7 @@ or encapsulating database access for testing software that uses Avatica. ### Base "avatica-server" Docker Image -Starting with the Avatica 1.10.0 release, Avatica is providing a number of Docker +Avatica provides a number of Docker containers. Each of these images is based on a "parent" "avatica-server" Docker image. This Docker image has no bindings to a specific database (it has not database-specific @@ -43,8 +43,8 @@ jar (which contains all the necessary dependencies of the Avatica server). This image is not directly useful for end users; it is useful for those who want to use Avatica with a database of their choosing. -This Docker image will be deployed to the [Apache Dockerhub account](https://hub.docker.com/r/apache/) after the release -of 1.10.0 and will be updated for future releases of Avatica. +This Docker image is deployed to the [Apache Docker Hub account](https://hub.docker.com/r/apache/calcite-avatica) +and is updated for each release of Avatica. ### Database-specific Docker Images @@ -70,22 +70,22 @@ file will start an instance of PostgreSQL and an instance of the Avatica server, exposing an Avatica server configured against a "real" PostgreSQL database. All of the `Dockerfile` and `docker-compose.yml` files are conveniently provided in an archive for -each release, starting with 1.10.0. +each release. Here is the layout for release 1.10.0: ``` -avatica-docker-1.10.0-SNAPSHOT/ -avatica-docker-1.10.0-SNAPSHOT/hypersql/ -avatica-docker-1.10.0-SNAPSHOT/mysql/ -avatica-docker-1.10.0-SNAPSHOT/postgresql/ -avatica-docker-1.10.0-SNAPSHOT/Dockerfile -avatica-docker-1.10.0-SNAPSHOT/hypersql/build.sh -avatica-docker-1.10.0-SNAPSHOT/hypersql/Dockerfile -avatica-docker-1.10.0-SNAPSHOT/mysql/build.sh -avatica-docker-1.10.0-SNAPSHOT/mysql/docker-compose.yml -avatica-docker-1.10.0-SNAPSHOT/mysql/Dockerfile -avatica-docker-1.10.0-SNAPSHOT/postgresql/build.sh -avatica-docker-1.10.0-SNAPSHOT/postgresql/docker-compose.yml -avatica-docker-1.10.0-SNAPSHOT/postgresql/Dockerfile +avatica-docker-1.10.0/ +avatica-docker-1.10.0/hypersql/ +avatica-docker-1.10.0/mysql/ +avatica-docker-1.10.0/postgresql/ +avatica-docker-1.10.0/Dockerfile +avatica-docker-1.10.0/hypersql/build.sh +avatica-docker-1.10.0/hypersql/Dockerfile +avatica-docker-1.10.0/mysql/build.sh +avatica-docker-1.10.0/mysql/docker-compose.yml +avatica-docker-1.10.0/mysql/Dockerfile +avatica-docker-1.10.0/postgresql/build.sh +avatica-docker-1.10.0/postgresql/docker-compose.yml +avatica-docker-1.10.0/postgresql/Dockerfile ``` #### Running http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/97d90a32/site/_docs/howto.md ---------------------------------------------------------------------- diff --git a/site/_docs/howto.md b/site/_docs/howto.md index a7ad380..413a99d 100644 --- a/site/_docs/howto.md +++ b/site/_docs/howto.md @@ -191,7 +191,7 @@ Before you start: * Set up signing keys as described above. * Make sure you are using JDK 8 (not 7 or 9). -* Check that `README`, `site/_docs/howto.md` +* Check that `README`, `site/_docs/howto.md`, `site/_docs/docker_images.md`, and `docker/src/main/dockerhub/Dockerfile` have the correct version number. * Set `version.major` and `version.minor` in `pom.xml`. * Make sure that @@ -407,7 +407,7 @@ Thanks to everyone who has contributed to this release. https://github.com/apache/calcite-avatica/blob/XXXX/site/_docs/history.md The commit to be voted upon: -http://git-wip-us.apache.org/repos/asf/calcite/commit/NNNNNN +http://git-wip-us.apache.org/repos/asf/calcite-avatica/commit/NNNNNN Its hash is XXXX. @@ -476,8 +476,8 @@ Julian Use the [Apache URL shortener](http://s.apache.org) to generate 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). +[s.apache.org/calcite-1.2-vote](http://s.apache.org/avatica-1.2-vote) and +[s.apache.org/calcite-1.2-result](http://s.apache.org/avatica-1.2-result). ## Publishing a release (for Calcite committers) @@ -547,8 +547,10 @@ svn ci The old releases will remain available in the [release archive](http://archive.apache.org/dist/calcite/). +Publish the [Docker images](docker_images.md). + Add a release note by copying -[site/_posts/2015-11-10-release-1.5.0.md]({{ site.sourceRoot }}/site/_posts/2015-11-10-release-1.5.0.md), +[site/_posts/2016-11-01-release-1.9.0.md]({{ site.sourceRoot }}/site/_posts/2016-11-01-release-1.9.0.md), generate the javadoc and copy to `site/target/apidocs` and `site/target/testapidocs`, [publish the site](#publish-the-web-site), and check that it appears in the contents in [news](http://localhost:4000/news/). @@ -556,7 +558,7 @@ and check that it appears in the contents in [news](http://localhost:4000/news/) After 24 hours, announce the release by sending an email to [[email protected]](https://mail-archives.apache.org/mod_mbox/www-announce/). You can use -[the 1.6.0 announcement](https://mail-archives.apache.org/mod_mbox/www-announce/201601.mbox/%3C8DB4C1E5-B322-4A33-8E8F-9858FA6A1119%40apache.org%3E) +[the 1.8.0 announcement](https://mail-archives.apache.org/mod_mbox/www-announce/201606.mbox/%[email protected]%3E) as a template. Be sure to include a brief description of the project. ## Publishing the web site (for Calcite committers) http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/97d90a32/site/_posts/2017-05-30-release-1.10.0.md ---------------------------------------------------------------------- diff --git a/site/_posts/2017-05-30-release-1.10.0.md b/site/_posts/2017-05-30-release-1.10.0.md new file mode 100644 index 0000000..8dc49ed --- /dev/null +++ b/site/_posts/2017-05-30-release-1.10.0.md @@ -0,0 +1,46 @@ +--- +layout: news_item +date: "2017-05-30 08:30:00 +0000" +author: jhyde +version: 1.10.0 +categories: [release] +tag: v1-10-0 +sha: fcec4be +--- +<!-- +{% comment %} +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to you under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +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. +{% endcomment %} +--> + +Apache Calcite Avatica 1.10.0 adds support for JDBC Array data, +Docker, and JDK 9. + +From this release onwards, Docker images for Avatica Server are +published to [Docker Hub](https://hub.docker.com/r/apache/calcite-avatica). These +make Avatica [easier than ever to run]({{ site.baseurl }}/docs/docker). + +As the Calcite and Avatica projects become +[more separate]({{ site.baseurl }}/news/2016/03/03/separate-project), +it is the first release since Avatica's git repository +[separated from Calcite's repository]({{ site.baseurl }}/news/2017/03/31/new-avatica-repository). + +Avatica now runs on JDK 9 (and continues to run on JDK 7 and 8). + +Clients may now send and receive Array data via the JDBC API. +There are improvements to date/time support in +[DateTimeUtils]({{ site.apiRoot }}/org/apache/calcite/avatica/util/DateTimeUtils.html), +and over 20 [other new features and bug fixes]({{ site.baseurl }}/docs/history.html#v1-10-0). http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/97d90a32/site/downloads/index.md ---------------------------------------------------------------------- diff --git a/site/downloads/index.md b/site/downloads/index.md index e0ba1e4..e860f3a 100644 --- a/site/downloads/index.md +++ b/site/downloads/index.md @@ -22,7 +22,7 @@ limitations under the License. {% endcomment %} --> -Calcite is released as a source artifact, and also through Maven. +Avatica is released as a source artifact, and also through Maven and Docker Hub. # Source releases @@ -43,15 +43,22 @@ Release | Date | Commit | Download {% endcomment %}{% assign q = "" %}{% comment %} {% endcomment %}{% assign d = "https://archive.apache.org/dist"; %}{% comment %} {% endcomment %}{% endif %}{% comment %} +{% endcomment %}{% capture d1 %}{{ post.date | date: "%F"}}{% endcapture %}{% comment %} +{% endcomment %}{% capture d2 %}2017-05-01{% endcapture %}{% comment %} +{% endcomment %}{% if d1 > d2 %}{% comment %} +{% endcomment %}{% assign digest = "mds" %}{% comment %} +{% endcomment %}{% else %}{% comment %} +{% endcomment %}{% assign digest = "md5" %}{% comment %} +{% endcomment %}{% endif %}{% comment %} {% endcomment %}<a href="{{ site.baseurl }}/docs/history.html#{{ post.tag }}">{{ post.version }}</a>{% comment %} {% endcomment %} | {{ post.date | date_to_string }}{% comment %} {% endcomment %} | <a href="https://github.com/apache/calcite-avatica/commit/{{ post.sha }}">{{ post.sha }}</a>{% comment %} {% endcomment %} | <a href="{{ p }}/{{ v }}-src.tar.gz{{ q }}">tar</a>{% comment %} -{% endcomment %} (<a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.tar.gz.md5">md5</a>{% comment %} +{% endcomment %} (<a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.tar.gz.{{ digest }}">{{ digest }}</a>{% comment %} {% endcomment %} <a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.tar.gz.asc">pgp</a>){% comment %} {% endcomment %} {% raw %}<br>{% endraw %}{% comment %} {% endcomment %} <a href="{{ p }}/{{ v }}-src.zip{{ q }}">zip</a>{% comment %} -{% endcomment %} (<a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.zip.md5">md5</a>{% comment %} +{% endcomment %} (<a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.zip.{{ digest }}">{{ digest }}</a>{% comment %} {% endcomment %} <a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.zip.asc">pgp</a>){% comment %} {% endcomment %} {% endfor %} @@ -106,3 +113,8 @@ As of Apache Calcite Avatica 1.9.0, the following un-shaded client artifact is a </dependency> </dependencies> {% endhighlight %} + +# Docker images + +From release 1.10.0 onwards, Docker images for Avatica Server are available at +[Docker Hub](https://hub.docker.com/r/apache/calcite-avatica).
