You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by fr...@apache.org on 2018/11/18 02:55:06 UTC
[1/3] calcite-avatica git commit: [CALCITE-2681] Add maven-scm-api as
a dependency so that Avatica can be built [Forced Update!]
Repository: calcite-avatica
Updated Branches:
refs/heads/branch-avatica-1.13 1f41a3547 -> 6f6101a8f (forced update)
[CALCITE-2681] Add maven-scm-api as a dependency so that Avatica can be built
Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica/commit/8f89f7ee
Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica/tree/8f89f7ee
Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica/diff/8f89f7ee
Branch: refs/heads/branch-avatica-1.13
Commit: 8f89f7ee9e8d677a428c0e713f2cfca2ccd1cbb4
Parents: f8520bb
Author: Francis Chuang <fr...@apache.org>
Authored: Sun Nov 18 13:44:25 2018 +1100
Committer: Francis Chuang <fr...@apache.org>
Committed: Sun Nov 18 13:44:25 2018 +1100
----------------------------------------------------------------------
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/8f89f7ee/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b43d0e8..f00b0d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,7 @@ limitations under the License.
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
+ <maven-scm-api.version>1.10.0</maven-scm-api.version>
<maven-scm-provider.version>1.10.0</maven-scm-provider.version>
<!-- ASF 21 provides 3.1.1 but need 3.2.0 due to MSHADE-289 -->
<maven-shade-plugin.version>3.2.0</maven-shade-plugin.version>
@@ -504,6 +505,11 @@ limitations under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-api</artifactId>
+ <version>${maven-scm-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>${maven-scm-provider.version}</version>
</dependency>
[3/3] calcite-avatica git commit: [CALCITE-2576] Release avatica
1.13.0
Posted by fr...@apache.org.
[CALCITE-2576] Release avatica 1.13.0
Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica/commit/6f6101a8
Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica/tree/6f6101a8
Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica/diff/6f6101a8
Branch: refs/heads/branch-avatica-1.13
Commit: 6f6101a8f715424fcbe8af178d13507418eee070
Parents: d5d779e
Author: Francis Chuang <fr...@apache.org>
Authored: Sun Nov 18 13:54:08 2018 +1100
Committer: Francis Chuang <fr...@apache.org>
Committed: Sun Nov 18 13:54:08 2018 +1100
----------------------------------------------------------------------
README | 2 +-
docker/src/main/dockerhub-hypersql/Dockerfile | 2 +-
docker/src/main/dockerhub/Dockerfile | 2 +-
pom.xml | 2 +-
site/_docs/docker_images.md | 28 ++++----
site/_docs/history.md | 74 ++++++++++++++++++++++
site/_docs/howto.md | 12 ++--
7 files changed, 98 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/6f6101a8/README
----------------------------------------------------------------------
diff --git a/README b/README
index 3053e13..c8b7c5d 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Apache Calcite Avatica release 1.12.0
+Apache Calcite Avatica release 1.13.0
This is a source or binary distribution of Avatica, a framework for
building database drivers. Avatica is a sub-project of Apache Calcite.
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/6f6101a8/docker/src/main/dockerhub-hypersql/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/src/main/dockerhub-hypersql/Dockerfile b/docker/src/main/dockerhub-hypersql/Dockerfile
index 0ea57b3..82ee89d 100644
--- a/docker/src/main/dockerhub-hypersql/Dockerfile
+++ b/docker/src/main/dockerhub-hypersql/Dockerfile
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ARG AVATICA_VERSION=1.12.0
+ARG AVATICA_VERSION=1.13.0
FROM apache/calcite-avatica:$AVATICA_VERSION
MAINTAINER Apache Avatica <de...@calcite.apache.org>
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/6f6101a8/docker/src/main/dockerhub/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/src/main/dockerhub/Dockerfile b/docker/src/main/dockerhub/Dockerfile
index 5308afa..c7233e7 100644
--- a/docker/src/main/dockerhub/Dockerfile
+++ b/docker/src/main/dockerhub/Dockerfile
@@ -21,7 +21,7 @@ RUN addgroup -S avatica && adduser -S -G avatica avatica
RUN mkdir -p /home/avatica/classpath
# This line must be preserved. The Maven build will verify this version matches its version
-ARG AVATICA_VERSION="1.12.0"
+ARG AVATICA_VERSION="1.13.0"
# Dependencies
ADD https://repository.apache.org/content/groups/public/org/apache/calcite/avatica/avatica-standalone-server/${AVATICA_VERSION}/avatica-standalone-server-${AVATICA_VERSION}-shaded.jar /home/avatica/classpath
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/6f6101a8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f00b0d0..a2a75ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@ limitations under the License.
<top.dir>${project.basedir}</top.dir>
<avatica.release.version>${project.version}</avatica.release.version>
<version.major>1</version.major>
- <version.minor>12</version.minor>
+ <version.minor>13</version.minor>
<!-- This list is in alphabetical order. -->
<bouncycastle.version>1.60</bouncycastle.version>
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/6f6101a8/site/_docs/docker_images.md
----------------------------------------------------------------------
diff --git a/site/_docs/docker_images.md b/site/_docs/docker_images.md
index 3736c9d..f60b13c 100644
--- a/site/_docs/docker_images.md
+++ b/site/_docs/docker_images.md
@@ -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. Here is the layout for release 1.11.0:
+each release. Here is the layout for release 1.13.0:
```
-avatica-docker-1.11.0/
-avatica-docker-1.11.0/hypersql/
-avatica-docker-1.11.0/mysql/
-avatica-docker-1.11.0/postgresql/
-avatica-docker-1.11.0/Dockerfile
-avatica-docker-1.11.0/hypersql/build.sh
-avatica-docker-1.11.0/hypersql/Dockerfile
-avatica-docker-1.11.0/mysql/build.sh
-avatica-docker-1.11.0/mysql/docker-compose.yml
-avatica-docker-1.11.0/mysql/Dockerfile
-avatica-docker-1.11.0/postgresql/build.sh
-avatica-docker-1.11.0/postgresql/docker-compose.yml
-avatica-docker-1.11.0/postgresql/Dockerfile
+avatica-docker-1.13.0/
+avatica-docker-1.13.0/hypersql/
+avatica-docker-1.13.0/mysql/
+avatica-docker-1.13.0/postgresql/
+avatica-docker-1.13.0/Dockerfile
+avatica-docker-1.13.0/hypersql/build.sh
+avatica-docker-1.13.0/hypersql/Dockerfile
+avatica-docker-1.13.0/mysql/build.sh
+avatica-docker-1.13.0/mysql/docker-compose.yml
+avatica-docker-1.13.0/mysql/Dockerfile
+avatica-docker-1.13.0/postgresql/build.sh
+avatica-docker-1.13.0/postgresql/docker-compose.yml
+avatica-docker-1.13.0/postgresql/Dockerfile
```
#### Running
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/6f6101a8/site/_docs/history.md
----------------------------------------------------------------------
diff --git a/site/_docs/history.md b/site/_docs/history.md
index d6aea4c..49c4011 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -28,6 +28,80 @@ For a full list of releases, see
Downloads are available on the
[downloads page]({{ site.baseurl }}/downloads/avatica.html).
+## <a href="https://github.com/apache/calcite-avatica/releases/tag/rel/avatica-1.13.0">1.13.0</a> / 2018-11-XX
+{: #v1-13-0}
+
+Apache Calcite Avatica 1.13.0 includes around 20 bugs fixes and enhancements.
+
+Compatibility: This release is tested
+on Linux, macOS, Microsoft Windows;
+using Oracle JDK 8, 9, 10, 11, 12;
+using IBM Java 8;
+Guava versions 14.0 to 23.0;
+other software versions as specified in `pom.xml`.
+
+Features and bug fixes
+
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2386">CALCITE-2386</a>]
+ Naively wire up struct support
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2390">CALCITE-2390</a>]
+ Remove uses of `X509CertificateObject` which is deprecated in current version of bouncycastle
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2467">CALCITE-2467</a>]
+ Update owasp-dependency-check maven plugin to 3.3.1, protobuf-java to 3.5.1, jackson to 2.9.6 and jetty to 9.4.11.v20180605
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2503">CALCITE-2503</a>]
+ AvaticaCommonsHttpClientImpl client needs to set user-token on HttpClientContext before sending the request
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2570">CALCITE-2570</a>]
+ Upgrade forbiddenapis to 2.6 for JDK 11 support
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1183">CALCITE-1183</a>]
+ Upgrade kerby to 1.1.1 and re-enable AvaticaSpnegoTest
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2486">CALCITE-2486</a>]
+ Upgrade Apache parent POM to version 21 and update other dependencies
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2583">CALCITE-2583</a>]
+ Upgrade dropwizard metrics to 4.0.3
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1006">CALCITE-1006</a>]
+ Enable spotbugs-maven-plugin
+* Move spotbugs-filter.xml to src/main/config/spotbugs/
+* Update usage of JCommander after upgrading to 1.72
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2587">CALCITE-2587</a>]
+ Regenerate protobuf files for protobuf 3.6.1
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2594">CALCITE-2594</a>]
+ Ensure forbiddenapis and maven-compiler use the correct JDK version
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2595">CALCITE-2595</a>]
+ Add maven wrapper
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2385">CALCITE-2385</a>]
+ Add flag to disable dockerfile checks when executing a dry-run build
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2676">CALCITE-2676</a>]
+ Add release script and docker-compose.yml to support building releases using docker
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2680">CALCITE-2680</a>]
+ Downgrade maven-scm-provider to 1.10.0 due to API incompatibility that prevents releases from building
+* Update release script to use GPG agent
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2681">CALCITE-2681</a>]
+ Add maven-scm-api as a dependency, so that Avatica can build
+* Include -Dgpg.keyname when executing release:perform in the release script
+
+Tests
+
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2568">CALCITE-2568</a>]
+ Ensure that IBM JDK TLS cipher list matches Oracle/OpenJDK for Travis CI
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2655">CALCITE-2655</a>]
+ Enable Travis to test against JDK12
+
+Website and Documentation
+
+* Fix broken links to Github release on the history page
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2381">CALCITE-2381</a>]
+ Document how to authenticate against the Apache maven repository, select GPG keys and version numbers when building
+ a release
+* Fix Go client download links
+* Fix download link to release history in news item template
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2550">CALCITE-2550</a>]
+ Update download links for avatica-go to link to `apache-calcite-avatica-go-x.x.x-src.tar.gz` for release 3.2.0 and onwards
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2574">CALCITE-2574</a>]
+ Update download pages to include instructions for verifying downloaded artifacts
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2577">CALCITE-2577</a>]
+ Update URLs on download page to HTTPS
+* Update links on Go client download page to reference `go_history.html` and not `history.html`
+
## <a href="https://github.com/apache/calcite-avatica/releases/tag/rel/avatica-1.12.0">1.12.0</a> / 2018-06-24
{: #v1-12-0}
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/6f6101a8/site/_docs/howto.md
----------------------------------------------------------------------
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 5733018..3dbca62 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -38,8 +38,8 @@ Unpack the source distribution `.tar.gz` file,
then build using maven:
{% highlight bash %}
-$ tar xvfz apache-calcite-avatica-1.12.0-src.tar.gz
-$ cd apache-calcite-avatica-1.12.0-src
+$ tar xvfz apache-calcite-avatica-1.13.0-src.tar.gz
+$ cd apache-calcite-avatica-1.13.0-src
$ ./mvnw install
{% endhighlight %}
@@ -211,9 +211,9 @@ To perform the dry-run, you can either use your environment or the release scrip
git clean -xn
# Do a dry run of the release:prepare step, which sets version numbers.
-# Typically we increment minor version: If X.Y.Z is 1.11.0, X2.Y2.Z2 is 1.12.0.
+# Typically we increment minor version: If X.Y.Z is 1.13.0, X2.Y2.Z2 is 1.14.0.
# Note X.Y.Z is the current version we're trying to release, and X2.Y2.Z2 is the next development version.
-# For example, if I am currently building a release for 1.11.0, X.Y.Z would be 1.11.0 and X2.Y2.Z2 would be 1.12.0.
+# For example, if I am currently building a release for 1.13.0, X.Y.Z would be 1.13.0 and X2.Y2.Z2 would be 1.14.0.
./mvnw -DdryRun=true -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X2.Y2.Z2-SNAPSHOT -Dtag=avatica-X.Y.Z-rcN -Papache-release -Duser.name=${asf.username} release:prepare -Darguments=-DskipDockerCheck
# If you have multiple GPG keys, you can select the key used to sign the release by appending `-Dgpg.keyname=${your.key.id}` to `-Darguments`:
@@ -279,9 +279,9 @@ If successful, 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.
-# Typically we increment minor version: If X.Y.Z is 1.11.0, X2.Y2.Z2 is 1.12.0.
+# Typically we increment minor version: If X.Y.Z is 1.13.0, X2.Y2.Z2 is 1.14.0.
# Note X.Y.Z is the current version we're trying to release, and X2.Y2.Z2 is the next development version.
-# For example, if I am currently building a release for 1.11.0, X.Y.Z would be 1.11.0 and X2.Y2.Z2 would be 1.12.0.
+# For example, if I am currently building a release for 1.13.0, X.Y.Z would be 1.13.0 and X2.Y2.Z2 would be 1.14.0.
./mvnw -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X2.Y2.Z2-SNAPSHOT -Dtag=avatica-X.Y.Z-rcN -Papache-release -Duser.name=${asf.username} release:prepare
# If you have multiple GPG keys, you can select the key used to sign the release by appending `-Darguments=-Dgpg.keyname=${your.key.id}`:
[2/3] calcite-avatica git commit: Use selected GPG key in release
script when executing release:perform
Posted by fr...@apache.org.
Use selected GPG key in release script when executing release:perform
Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica/commit/d5d779e3
Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica/tree/d5d779e3
Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica/diff/d5d779e3
Branch: refs/heads/branch-avatica-1.13
Commit: d5d779e3458ca888dd0029d7504b61a42e6544d9
Parents: 8f89f7e
Author: Francis Chuang <fr...@apache.org>
Authored: Sun Nov 18 13:50:28 2018 +1100
Committer: Francis Chuang <fr...@apache.org>
Committed: Sun Nov 18 13:50:28 2018 +1100
----------------------------------------------------------------------
release.sh | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/d5d779e3/release.sh
----------------------------------------------------------------------
diff --git a/release.sh b/release.sh
index eff4dbf..1d609be 100755
--- a/release.sh
+++ b/release.sh
@@ -99,9 +99,6 @@ select_gpg_key(){
echo "Starting GPG agent..."
gpg-agent --daemon
- touch /root/.gnupg/gpg.conf
- echo use-agent >> /root/.gnupg/gpg.conf
-
while $INVALID_KEY_SELECTED; do
if [ "${#KEYS[@]}" -le 0 ]; then
@@ -250,7 +247,7 @@ case $1 in
set_maven_credentials
mvn -Dmaven.artifact.threads=20 -DreleaseVersion=$RELEASE_VERSION -DdevelopmentVersion=$DEV_VERSION-SNAPSHOT -Dtag="avatica-$RELEASE_VERSION-rc$RC_NUMBER" -Papache-release -Duser.name=$ASF_USERNAME release:prepare -Darguments=-Dgpg.keyname=$SELECTED_GPG_KEY
- mvn -Dmaven.artifact.threads=20 -Papache-release -Duser.name=$ASF_USERNAME release:perform -Darguments="-DskipTests"
+ mvn -Dmaven.artifact.threads=20 -Papache-release -Duser.name=$ASF_USERNAME release:perform -Darguments="-DskipTests -Dgpg.keyname=$SELECTED_GPG_KEY"
;;
clean)