You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by da...@apache.org on 2020/02/27 02:34:20 UTC
[calcite] branch master updated (e427180 -> 134430e)
This is an automated email from the ASF dual-hosted git repository.
danny0405 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git.
from e427180 [CALCITE-3734] MySQL JDBC rewrite is producing queries with CHAR with range beyond 255 (Vineet Garg)
new 6fd4de7 [CALCITE-3818] Upgrade Avatica version to 1.16.0
new 134430e [CALCITE-3822] Source distribution must not contain fonts under SIL OFL 1.1 license (category B)
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:
gradle.properties | 2 +-
release/build.gradle.kts | 16 +++++++++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
[calcite] 01/02: [CALCITE-3818] Upgrade Avatica version to 1.16.0
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danny0405 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git
commit 6fd4de7b9286d1730244d997e5c34c3a146db752
Author: yuzhao.cyz <yu...@gmail.com>
AuthorDate: Tue Feb 25 12:25:34 2020 +0800
[CALCITE-3818] Upgrade Avatica version to 1.16.0
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index 2d407b8..3788469 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,7 @@ kotlin.parallel.tasks.in.project=true
# Release version can be generated by using -Prelease or -Prc=<int> arguments
calcite.version=1.22.0
# This is a version to be used from Maven repository. It can be overridden by localAvatica below
-calcite.avatica.version=1.15.0
+calcite.avatica.version=1.16.0
# The options below configures the use of local clone (e.g. testing development versions)
# You can pass un-comment it, or pass option -PlocalReleasePlugins, or -PlocalReleasePlugins=<path>
[calcite] 02/02: [CALCITE-3822] Source distribution must not
contain fonts under SIL OFL 1.1 license (category B)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danny0405 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git
commit 134430e481bb5495d0852434041428104e29874e
Author: yuzhao.cyz <yu...@gmail.com>
AuthorDate: Wed Feb 26 13:08:12 2020 +0800
[CALCITE-3822] Source distribution must not contain fonts under SIL OFL 1.1 license (category B)
---
release/build.gradle.kts | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/release/build.gradle.kts b/release/build.gradle.kts
index ef0d935..39a70f4 100644
--- a/release/build.gradle.kts
+++ b/release/build.gradle.kts
@@ -115,7 +115,6 @@ val getLicenses by tasks.registering(GatherLicenseTask::class) {
// Parts of the web site generated by Jekyll (http://jekyllrb.com/)
addDependency(":jekyll:", SpdxLicense.MIT)
addDependency("font-awesome:font-awesome-code:4.2.0", SpdxLicense.MIT)
- addDependency("font-awesome:font-awesome-font:4.2.0", SpdxLicense.OFL_1_1)
// git.io/normalize
addDependency(":normalize:3.0.2", SpdxLicense.MIT)
// Gridism: A simple, responsive, and handy CSS grid by @cobyism
@@ -143,6 +142,20 @@ fun CopySpec.excludeLicenseFromSourceRelease() {
exclude("LICENSE")
}
+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).
+ //
+ // OFL 1.1 is "category B" (see LEGAL-112).
+ //
+ // According to
+ // https://www.apache.org/legal/resolved.html#binary-only-inclusion-condition,
+ // the source code can not include Category B licensed works.
+
+ // We need to remove "web and desktop font files".
+ exclude("site/fonts/**")
+}
+
fun CrLfSpec.sourceLayout() = copySpec {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
gitattributes(gitProps)
@@ -154,6 +167,7 @@ fun CrLfSpec.sourceLayout() = copySpec {
from(rootDir) {
gitignore(gitProps)
excludeLicenseFromSourceRelease()
+ excludeCategoryBLicensedWorksFromSourceRelease()
}
}
}