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 2021/05/12 04:42:09 UTC
[calcite-avatica] branch master updated (0c147fb -> 1786676)
This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git.
omit 0c147fb [CALCITE-4575] Remove Gradle wrapper from source distribution
new e120301 [CALCITE-4575] Remove Gradle wrapper from source distribution
new 1786676 [CALCITE-4576] Release process should not overwrite LICENSE file
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (0c147fb)
\
N -- N -- N refs/heads/master (1786676)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
LICENSE | 97 +++++-------------------------------------------
release/build.gradle.kts | 6 +--
site/_docs/howto.md | 1 +
3 files changed, 13 insertions(+), 91 deletions(-)
[calcite-avatica] 02/02: [CALCITE-4576] Release process should not
overwrite LICENSE file
Posted by fr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git
commit 1786676a6e38e6c3feafb54759989bae5ac159d5
Author: Julian Hyde <jh...@apache.org>
AuthorDate: Tue May 11 17:07:21 2021 -0700
[CALCITE-4576] Release process should not overwrite LICENSE file
---
LICENSE | 97 +++++------------------------------------------------
site/_docs/howto.md | 1 +
2 files changed, 10 insertions(+), 88 deletions(-)
diff --git a/LICENSE b/LICENSE
index f409fd8..2f69b1f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -176,93 +176,14 @@
END OF TERMS AND CONDITIONS
- APPENDIX: How to apply the Apache License to your work.
+Additional License files can be found in the 'licenses' folder located in the same directory as the LICENSE file (i.e. this file)
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
+- Software produced outside the ASF which is available under other licenses (not Apache-2.0)
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
-
-
-
-
------------------------------------------------------------------------
-
-APACHE CALCITE AVATICA SUBCOMPONENTS:
-
-The Apache Calcite Avatica project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
-licenses.
-
------------------------------------------------------------------------
- The MIT License
------------------------------------------------------------------------
-
-The Apache Calcite project bundles the following files under the MIT License:
-
-- site
- Parts of the web site generated by Jekyll (http://jekyllrb.com/)
- Copyright (c) 2008-2015 Tom Preston-Werner
-- site/_sass/_font-awesome.scss
- Font-awesome css files v4.1.0 (http://fortawesome.github.io/Font-Awesome/)
- Copyright (c) 2013 Dave Gandy
-- site/_sass/_normalize.scss
- normalize.css v3.0.2 | git.io/normalize
- Copyright (c) Nicolas Gallagher and Jonathan Neal
-- site/_sass/_gridism.scss
- Gridism: A simple, responsive, and handy CSS grid by @cobyism
- https://github.com/cobyism/gridism
- Copyright (c) 2013 Coby Chapple
-- site/js/html5shiv.min.js
- HTML5 Shiv 3.7.2 | @afarkas @jdalton @jon_neal @rem
-- site/js/respond.min.js
- Respond.js v1.4.2: min/max-width media query polyfill
- Copyright 2013 Scott Jehl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------------------------------------------------------------------------
- The Open Font License
------------------------------------------------------------------------
-
-The Apache Calcite project bundles the following fonts under the
-SIL Open Font License (OFL) - http://scripts.sil.org/OFL/
-
-- site/fonts/fontawesome-webfont.*
- Font-awesome font files v4.0.3 (http://fortawesome.github.io/Font-Awesome/)
+MIT
+* cobyism:html5shiv:3.7.2
+* font-awesome:font-awesome-code:4.2.0
+* gridsim:gridsim:
+* jekyll:jekyll:
+* normalize:normalize:3.0.2
+* respond:respond:1.4.2
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 1a7748f..814af53 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -277,6 +277,7 @@ docker-compose run -v /c/Users/username/AppData/Roaming/gnupg:/.gnupg publish-re
* That directory must contain files `NOTICE`, `LICENSE`,
`README`, `README.md`
* Check that the version in `README` is correct
+ * Check that `LICENSE` is identical to the file checked into git
* Make sure that the following files do not occur in the source
distros: `KEYS`, `gradlew`, `gradlew.bat`, `gradle-wrapper.jar`,
`gradle-wrapper.properties`
[calcite-avatica] 01/02: [CALCITE-4575] Remove Gradle wrapper from
source distribution
Posted by fr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git
commit e1203014f477422a2288aef4fb4123657c99241f
Author: Julian Hyde <jh...@apache.org>
AuthorDate: Tue May 11 11:53:18 2021 -0700
[CALCITE-4575] Remove Gradle wrapper from source distribution
---
release/build.gradle.kts | 17 +++++++++++----
site/_docs/history.md | 2 +-
site/_docs/howto.md | 54 ++++++++++++++++++++++++++++--------------------
3 files changed, 46 insertions(+), 27 deletions(-)
diff --git a/release/build.gradle.kts b/release/build.gradle.kts
index c2f4fb9..64915c4 100644
--- a/release/build.gradle.kts
+++ b/release/build.gradle.kts
@@ -77,10 +77,9 @@ Release artifacts are signed with the following key:
https://people.apache.org/keys/committer/$committerId.asc
https://www.apache.org/dist/$tlpUrl/KEYS
-N.B.
-To create the jars and test $componentName: "./gradlew build -Prelease -PskipSign".
+To create the jars and test $componentName: "gradle build -Prelease -PskipSign".
-If you do not have a Java environment available, you can run the tests
+If you do not have a Java/Gradle environment available, you can run the tests
using docker. To do so, install docker and docker-compose, then run
"docker-compose run test" from the root of the directory.
@@ -89,7 +88,7 @@ Please vote on releasing this package as $componentName $version.
The vote is open for the next 72 hours and passes if a majority of at
least three +1 PMC votes are cast.
-[ ] +1 Release this package as Apache Calcite $version
+[ ] +1 Release this package as Apache Calcite Avatica $version
[ ] 0 I don't feel strongly about it, but I'm okay with the release
[ ] -1 Do not release this package because...
@@ -142,6 +141,15 @@ fun CopySpec.excludeLicenseFromSourceRelease() {
exclude("LICENSE")
}
+fun CopySpec.excludeGradleWrapperFromSourceRelease() {
+ // Source distributions must not include binary files (see LEGAL-288).
+ // The Gradle wrapper requires gradle-wrapper.jar, so exclude the whole
+ // wrapper. Users must install Gradle manually.
+ exclude("gradlew")
+ exclude("gradlew.bat")
+ exclude("gradle/wrapper/**")
+}
+
fun CopySpec.excludeCategoryBLicensedWorksFromSourceRelease() {
// The source distribution contains "font-awesome:fonts" which is licensed as
// http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License).
@@ -167,6 +175,7 @@ fun CrLfSpec.sourceLayout() = copySpec {
from(rootDir) {
gitignore(gitProps)
excludeLicenseFromSourceRelease()
+ excludeGradleWrapperFromSourceRelease()
excludeCategoryBLicensedWorksFromSourceRelease()
}
}
diff --git a/site/_docs/history.md b/site/_docs/history.md
index a81e77e..02c69c6 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -36,7 +36,7 @@ Please see below to determine how the breaking change will affect your project.
Compatibility: This release is tested
on Linux, macOS, Microsoft Windows;
-using Oracle JDK 8, 9, 10, 11, 12, 13, 14;
+using Oracle JDK 8, 9, 10, 11, 12, 13, 14, 15;
using IBM Java 8;
Guava versions 14.0 to 29.0;
other software versions as specified in `gradle.properties`.
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 0f4941c..1a7748f 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -30,20 +30,27 @@ Here's some miscellaneous documentation about using Avatica.
## Building from a source distribution
-Prerequisites are Java (JDK 8 or later) on your path.
+Prerequisites are Java (JDK 8 or later)
+and Gradle (version 6.8.1) on your path.
+
+(The source distribution
+[does not include the Gradle wrapper](https://issues.apache.org/jira/browse/CALCITE-4575);
+therefore you need to
+[install Gradle manually](https://gradle.org/releases/).)
Unpack the source distribution `.tar.gz` file,
`cd` to the root directory of the unpacked source,
-then build using maven:
+then build using Gradle:
{% highlight bash %}
$ tar xvfz apache-calcite-avatica-1.18.0-src.tar.gz
$ cd apache-calcite-avatica-1.18.0-src
-$ ./gradlew build
+$ gradle build
{% endhighlight %}
[Running tests](#running-tests) describes how to run more or fewer
-tests.
+tests (but you should use the `gradle` command rather than
+`./gradlew`).
## Building from Git
@@ -52,7 +59,7 @@ and Java (JDK 8 or later) on your path.
Create a local copy of the GitHub repository,
`cd` to its root directory,
-then build using maven:
+then build using Gradle:
{% highlight bash %}
$ git clone git://github.com/apache/calcite-avatica.git avatica
@@ -60,9 +67,6 @@ $ cd avatica
$ ./gradlew build
{% endhighlight %}
-Note: [gdub](https://github.com/dougborg/gdub) simplifies `./gradlew build` to `gw build`,
-and it simplifies cases like `../../gradlew ...` to `gw ...` as well.
-
[Running tests](#running-tests) describes how to run more or fewer
tests.
@@ -83,7 +87,8 @@ You can use `./gradlew assemble` to build the artifacts and skip all tests and v
### To run tests in docker:
-* You will need to have [docker](https://docs.docker.com/install/) and [Docker Compose](https://docs.docker.com/compose/install/) installed.
+Prerequisites are [Docker](https://docs.docker.com/install/) and
+[Docker Compose](https://docs.docker.com/compose/install/).
{% highlight bash %}
docker-compose run test
@@ -123,7 +128,7 @@ ball because that would be
## Run a GPG agent
-By default, Maven plugins which require you to unlock a GPG secret key
+By default, Gradle plugins which require you to unlock a GPG secret key
will prompt you in the terminal. To prevent you from having to enter
this password numerous times, it is highly recommended to install and
run `gpg-agent`.
@@ -167,8 +172,10 @@ asfSvnUsername=
asfSvnPassword=
{% endhighlight %}
-Note: when https://github.com/vlsi/asflike-release-environment is used, the credentials are takend from
-`asfTest...` (e.g. `asfTestNexusUsername=test`)
+When
+[asflike-release-environment](https://github.com/vlsi/asflike-release-environment)
+is used, the credentials are taken from `asfTest...`
+(e.g. `asfTestNexusUsername=test`)
Note: if you want to uses `gpg-agent`, you need to pass `useGpgCmd` property, and specify the key id
via `signing.gnupg.keyName`.
@@ -194,6 +201,7 @@ Before you start:
* Set up signing keys as described above.
* Make sure you are using JDK 8 (not 9 or 10).
* Check that `README`, `site/_docs/howto.md`, `site/_docs/docker_images.md` have the correct version number.
+* Check that `site/_docs/howto.md` has the correct Gradle version.
* Check that `NOTICE` has the current copyright year.
* Check that `calcite.avatica.version` has the proper value in `/gradle.properties`.
* Add release notes to `site/_docs/history.md`. Include the commit history,
@@ -269,7 +277,9 @@ docker-compose run -v /c/Users/username/AppData/Roaming/gnupg:/.gnupg publish-re
* That directory must contain files `NOTICE`, `LICENSE`,
`README`, `README.md`
* Check that the version in `README` is correct
-* Make sure that there is no `KEYS` file in the source distros
+* Make sure that the following files do not occur in the source
+ distros: `KEYS`, `gradlew`, `gradlew.bat`, `gradle-wrapper.jar`,
+ `gradle-wrapper.properties`
* For each .jar (for example `core/build/libs/avatica-core-X.Y.Z.jar`
and `server/build/libs/avatica-server-X.Y.Z-sources.jar`),
verify that the `META-INF` directory contains the correct
@@ -299,7 +309,7 @@ gpg --recv-keys key
# Check keys
curl -O https://dist.apache.org/repos/dist/release/calcite/KEYS
-# Sign/check sha256 hashes
+# Sign/check sha512 hashes
# (Assumes your O/S has a 'shasum' command.)
function checkHash() {
cd "$1"
@@ -307,15 +317,15 @@ function checkHash() {
if [ ! -f $i ]; then
continue
fi
- if [ -f $i.sha256 ]; then
- if [ "$(cat $i.sha256)" = "$(shasum -a 256 $i)" ]; then
- echo $i.sha256 present and correct
+ if [ -f $i.sha512 ]; then
+ if [ "$(cat $i.sha512)" = "$(shasum -a 512 $i)" ]; then
+ echo $i.sha512 present and correct
else
- echo $i.sha256 does not match
+ echo $i.sha512 does not match
fi
else
- shasum -a 256 $i > $i.sha256
- echo $i.sha256 created
+ shasum -a 512 $i > $i.sha512
+ echo $i.sha512 created
fi
done
}
@@ -349,7 +359,7 @@ The artifacts to be voted on are located here:
https://dist.apache.org/repos/dist/dev/calcite/apache-calcite-avatica-X.Y.Z-rcN/
The hashes of the artifacts are as follows:
-src.tar.gz.sha256 XXXX
+src.tar.gz.sha512 XXXX
A staged Maven repository is available for review at:
https://repository.apache.org/content/repositories/orgapachecalcite-NNNN
@@ -362,7 +372,7 @@ Please vote on releasing this package as Apache Calcite Avatica X.Y.Z.
The vote is open for the next 72 hours and passes if a majority of
at least three +1 PMC votes are cast.
-[ ] +1 Release this package as Apache Calcite X.Y.Z
+[ ] +1 Release this package as Apache Calcite Avatica 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...