Skip to content

Commit

Permalink
[CALCITE-6582] Release Calcite 1.38.0
Browse files Browse the repository at this point in the history
Add release notes. In the release notes for previous releases,
change whitespace and formatting for consistency among
releases, standardize on 'Postgres' rather than 'PostgreSQL',
and move the 'Compatability' paragraph before the 'Breaking
changes' section.

Add users' aliases to .mailmap, so that the contributors list
in the release notes contains people's real name.

Fix a typo in FileReaderTest.

Release candidate #1 introduced

  [CALCITE-6616] ClassNotFoundException:
  java.util.SequencedCollection at RelBuilder$Frame init

The cause was compiling the release candidate using JDK 21,
which caused the `interface SequencedCollection`, introduced
in JDK 21, to be used in resolving methods. The fix (in
release candidate #2) is to revert to JDK 8 for the release
build (and revert the instructions in howto.md). We suspect
that building with building with JDK 11 or 17 would also work.

Revise template vote email. Fix the tag URL, add an end time
for the vote, describe how to use 'code name (role)' vote
format, sign using release manager's name.

Close #3979
  • Loading branch information
julianhyde committed Oct 10, 2024
1 parent a7c3d16 commit e5e7fae
Show file tree
Hide file tree
Showing 6 changed files with 958 additions and 357 deletions.
17 changes: 17 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ Alan Jin <jinlantao@gmail.com>
Ali Mansour <Ali.MANSOUR@murex.com>
Amir Gajst <amir.gajst@sisense.com>
Botong Huang <botong.huang@alibaba-inc.com>
Bowen Yang <bowen.yang@kyligence.io>
Cancai Cai <2356672992@qq.com>
Cancai Cai <77189278+caicancai@users.noreply.github.com>
Cancai Cai <cc.cai@aftership.com>
Charbel Yazbeck <cyazbeck@murex.com>
Chen Kai <chk19940609@gmail.com>
Chunhui Shi <cshi@maprtech.com>
Expand All @@ -42,6 +45,9 @@ Drew Schmitt <dasch@google.com>
Dylan Adams <dylan.adams@gmail.com>
Evgeniy Stanilovskiy <eugen.stan@netdava.com> # aka Eugen Stan, Evgeny Stanilovsky
Evgeniy Stanilovskiy <stanilovsky@gmail.com>
Evgeniy Stanilovsky <zstan@apache.com>
Evgeniy Stanilovsky <zstan@apache.org>
Fan Luo <fan.luo@ly.com>
Feng Guo <guofeng.my@bytedance.com>
Feng Zhu <fengzhu@apache.org> # DonnyZone at github
Feng Zhu <fenzhu@ebay.com>
Expand Down Expand Up @@ -71,6 +77,7 @@ Jeffery Zhang (张俭) <zj48271@ly.com>
Jerin John <jerinjohn@google.com>
Jiajun Xie <jiajunbernoulli@foxmail.com> # aka Jiajun Bernoulli
Jiasen Sheng <angelzouxin@gmail.com>
Jie Cheng <18033291053@163.com>
Jin Xing <jinxing.corey@gmail.com>
Jin Xing <jx158167@antfin.com> # aka jx158167
Joey Moore <jhugomoore@google.com>
Expand All @@ -83,8 +90,12 @@ Julian Hyde <julianhyde@gmail.com>
Kevin Liew <kliew@apache.org>
Kevin Liew <kliewkliew@users.noreply.github.com>
Khawla Mouhoubi <mouhoubi.khawla@gmail.com>
Konstantin Orlov <korlov@apache.com>
Konstantin Orlov <korlov@apache.org>
Konstantin Orlov <korlov@gridgain.com>
Krisztian Kasa <kasakrisz2@gmail.com>
Krisztian Kasa <kasakrisz2@gmail.com>
Krisztian Kasa <kkasa@cloudera.com>
Lei Shen <shenlang@zbyte-inc.com>
LeoWangLZ <wanglongzhong2006@163.com> # aka Rheet Wong?
Liao Xintao <chiyou@taobao.com>
Expand All @@ -103,9 +114,11 @@ Pavel Gubin <pavel@contiamo.com>
Pawel Ruchaj <pawel+gitlab@profimedia.co.uk>
Peng Wang <foxpengwang@tencent.com>
pengzhiwei <pengzhiwei2015@icloud.com>
Pranava B <pranava018@gmail.com>
Praveen Kumar <praveen@dremio.com>
Qi Yu (余启) <yuqi5@xiaomi.com>
Rafay Qureshi <qureshi.rafay@gmail.com>
Rodrigo Rueda <rorueda@gmail.com>
Ruben Quesada Lopez <rubenql@gmail.com>
Rui Wang <amaliujia@163.com>
Runkang He (何润康) <herunkang.runking@bytedance.com>
Expand All @@ -120,6 +133,8 @@ Shuo Cheng <shuo.cs@alibaba-inc.com>
Slim Bouguerra <slim.bouguerra@gmail.com>
Stamatis Zampetakis <15013153+zabetak@users.noreply.github.com>
Stamatis Zampetakis <zabetak@gmail.com>
suibianwanwan <1597226206@qq.com>
suibianwanwan <suibianwanwan33@foxmail.com>
Taras Ledkov <tledkov@gridgain.com>
Ted Xu (少杰) <shaojie@alibaba-inc.com>
Venki Korukanti <venki.korukanti@gmail.com>
Expand All @@ -141,6 +156,8 @@ Yeong Wei <laiyw@persistent.my>
Yingyu Wang <yingyu.w@gmail.com>
Yingyu Wang <yingyuwang@users.noreply.github.com>
Yiqun Zhang <guiyanakuang@gmail.com>
YiwenWu <yiwenwu1006@gmail.com>
YiwenWu <yiwenwu@tencent.com>
Zhe Hu <iluffzhe@163.com>
Zhen Wang <awang@marinsoftware.com>
Zhen Wang <zinking3@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Apache Calcite release 1.37.0
Apache Calcite release 1.38.0

This is a source distribution of Apache Calcite.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private static String resourcePath(String path) {
assumeTrue(!r.equals("OpenJDK Runtime Environment")
|| getJavaMajorVersion() > 10,
"Java 10+ should have root certificates (JEP 319). Runtime is "
+ r + ", Jave major version is " + getJavaMajorVersion());
+ r + ", Java major version is " + getJavaMajorVersion());

FileReader t = new FileReader(STATES_SOURCE);
t.refresh();
Expand Down
30 changes: 23 additions & 7 deletions release/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import com.github.vlsi.gradle.release.ReleaseExtension
import com.github.vlsi.gradle.release.ReleaseParams
import com.github.vlsi.gradle.release.dsl.dependencyLicenses
import com.github.vlsi.gradle.release.dsl.licensesCopySpec
import java.time.Instant
import java.time.temporal.ChronoUnit

plugins {
id("com.github.vlsi.stage-vote-release")
Expand Down Expand Up @@ -54,7 +56,7 @@ https://gitbox.apache.org/repos/asf?p=calcite.git;a=commit;h=$gitSha
Its hash is $gitSha
Tag:
$sourceCodeTagUrl
https://github.com/apache/calcite/tree/$tag
The artifacts to be voted on are located here:
$svnStagingUri
Expand All @@ -71,24 +73,38 @@ https://people.apache.org/keys/committer/$committerId.asc
https://www.apache.org/dist/$tlpUrl/KEYS
To create the jars and test $componentName: "gradle build"
(requires an appropriate Gradle/JDK installation)
(Requires an appropriate Gradle/JDK installation.)
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.
Everyone is welcome to vote. Your vote should contain the line
'code name (role)', where
* 'code' is +1, 0 or -1 as below;
* 'name' is your ASF id if you have one, else your real name;
* 'role' is 'community', 'committer' or 'PMC member'.
[ ] +1 Release this package as Apache Calcite $version
[ ] 0 I don't feel strongly about it, but I'm okay with the release
[ ] -1 Do not release this package because...
The vote is open for the next $voteDurationHours hours (closing at
$voteEnd) and passes if a majority of
at least three +1 votes by PMC members are cast.
Here is my vote:
+1 (binding)
+1 $committerId (PMC member)
$userName (release manager)
""".trimIndent()

val distributionGroup = "distribution"
val baseFolder = "apache-calcite-${rootProject.version}"
val userName = System.getProperty("user.name")
val voteDurationHours = 72L
val voteEnd =
Instant.now().truncatedTo(ChronoUnit.HOURS)
.plus(voteDurationHours, ChronoUnit.HOURS).toString()

// This task scans the project for gitignore / gitattributes, and that is reused for building
// source/binary artifacts with the appropriate eol/executable file flags
Expand All @@ -100,7 +116,7 @@ val gitProps by tasks.registering(FindGitAttributes::class) {

val getLicenses by tasks.registering(GatherLicenseTask::class) {
extraLicenseDir.set(file("$rootDir/src/main/config/licenses"))
// Parts of the web site generated by Jekyll (http://jekyllrb.com/)
// Parts of the website generated by Jekyll (http://jekyllrb.com/)
addDependency(":jekyll:", SpdxLicense.MIT)
addDependency("font-awesome:font-awesome-code:4.2.0", SpdxLicense.MIT)
// git.io/normalize
Expand Down
Loading

0 comments on commit e5e7fae

Please sign in to comment.