Skip to content

Commit e5e7fae

Browse files
committed
[CALCITE-6582] Release Calcite 1.38.0
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
1 parent a7c3d16 commit e5e7fae

File tree

6 files changed

+958
-357
lines changed

6 files changed

+958
-357
lines changed

.mailmap

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ Alan Jin <jinlantao@gmail.com>
2121
Ali Mansour <Ali.MANSOUR@murex.com>
2222
Amir Gajst <amir.gajst@sisense.com>
2323
Botong Huang <botong.huang@alibaba-inc.com>
24+
Bowen Yang <bowen.yang@kyligence.io>
25+
Cancai Cai <2356672992@qq.com>
2426
Cancai Cai <77189278+caicancai@users.noreply.github.com>
27+
Cancai Cai <cc.cai@aftership.com>
2528
Charbel Yazbeck <cyazbeck@murex.com>
2629
Chen Kai <chk19940609@gmail.com>
2730
Chunhui Shi <cshi@maprtech.com>
@@ -42,6 +45,9 @@ Drew Schmitt <dasch@google.com>
4245
Dylan Adams <dylan.adams@gmail.com>
4346
Evgeniy Stanilovskiy <eugen.stan@netdava.com> # aka Eugen Stan, Evgeny Stanilovsky
4447
Evgeniy Stanilovskiy <stanilovsky@gmail.com>
48+
Evgeniy Stanilovsky <zstan@apache.com>
49+
Evgeniy Stanilovsky <zstan@apache.org>
50+
Fan Luo <fan.luo@ly.com>
4551
Feng Guo <guofeng.my@bytedance.com>
4652
Feng Zhu <fengzhu@apache.org> # DonnyZone at github
4753
Feng Zhu <fenzhu@ebay.com>
@@ -71,6 +77,7 @@ Jeffery Zhang (张俭) <zj48271@ly.com>
7177
Jerin John <jerinjohn@google.com>
7278
Jiajun Xie <jiajunbernoulli@foxmail.com> # aka Jiajun Bernoulli
7379
Jiasen Sheng <angelzouxin@gmail.com>
80+
Jie Cheng <18033291053@163.com>
7481
Jin Xing <jinxing.corey@gmail.com>
7582
Jin Xing <jx158167@antfin.com> # aka jx158167
7683
Joey Moore <jhugomoore@google.com>
@@ -83,8 +90,12 @@ Julian Hyde <julianhyde@gmail.com>
8390
Kevin Liew <kliew@apache.org>
8491
Kevin Liew <kliewkliew@users.noreply.github.com>
8592
Khawla Mouhoubi <mouhoubi.khawla@gmail.com>
93+
Konstantin Orlov <korlov@apache.com>
94+
Konstantin Orlov <korlov@apache.org>
8695
Konstantin Orlov <korlov@gridgain.com>
8796
Krisztian Kasa <kasakrisz2@gmail.com>
97+
Krisztian Kasa <kasakrisz2@gmail.com>
98+
Krisztian Kasa <kkasa@cloudera.com>
8899
Lei Shen <shenlang@zbyte-inc.com>
89100
LeoWangLZ <wanglongzhong2006@163.com> # aka Rheet Wong?
90101
Liao Xintao <chiyou@taobao.com>
@@ -103,9 +114,11 @@ Pavel Gubin <pavel@contiamo.com>
103114
Pawel Ruchaj <pawel+gitlab@profimedia.co.uk>
104115
Peng Wang <foxpengwang@tencent.com>
105116
pengzhiwei <pengzhiwei2015@icloud.com>
117+
Pranava B <pranava018@gmail.com>
106118
Praveen Kumar <praveen@dremio.com>
107119
Qi Yu (余启) <yuqi5@xiaomi.com>
108120
Rafay Qureshi <qureshi.rafay@gmail.com>
121+
Rodrigo Rueda <rorueda@gmail.com>
109122
Ruben Quesada Lopez <rubenql@gmail.com>
110123
Rui Wang <amaliujia@163.com>
111124
Runkang He (何润康) <herunkang.runking@bytedance.com>
@@ -120,6 +133,8 @@ Shuo Cheng <shuo.cs@alibaba-inc.com>
120133
Slim Bouguerra <slim.bouguerra@gmail.com>
121134
Stamatis Zampetakis <15013153+zabetak@users.noreply.github.com>
122135
Stamatis Zampetakis <zabetak@gmail.com>
136+
suibianwanwan <1597226206@qq.com>
137+
suibianwanwan <suibianwanwan33@foxmail.com>
123138
Taras Ledkov <tledkov@gridgain.com>
124139
Ted Xu (少杰) <shaojie@alibaba-inc.com>
125140
Venki Korukanti <venki.korukanti@gmail.com>
@@ -141,6 +156,8 @@ Yeong Wei <laiyw@persistent.my>
141156
Yingyu Wang <yingyu.w@gmail.com>
142157
Yingyu Wang <yingyuwang@users.noreply.github.com>
143158
Yiqun Zhang <guiyanakuang@gmail.com>
159+
YiwenWu <yiwenwu1006@gmail.com>
160+
YiwenWu <yiwenwu@tencent.com>
144161
Zhe Hu <iluffzhe@163.com>
145162
Zhen Wang <awang@marinsoftware.com>
146163
Zhen Wang <zinking3@gmail.com>

README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Apache Calcite release 1.37.0
1+
Apache Calcite release 1.38.0
22

33
This is a source distribution of Apache Calcite.
44

file/src/test/java/org/apache/calcite/adapter/file/FileReaderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private static String resourcePath(String path) {
8383
assumeTrue(!r.equals("OpenJDK Runtime Environment")
8484
|| getJavaMajorVersion() > 10,
8585
"Java 10+ should have root certificates (JEP 319). Runtime is "
86-
+ r + ", Jave major version is " + getJavaMajorVersion());
86+
+ r + ", Java major version is " + getJavaMajorVersion());
8787

8888
FileReader t = new FileReader(STATES_SOURCE);
8989
t.refresh();

release/build.gradle.kts

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ import com.github.vlsi.gradle.release.ReleaseExtension
2626
import com.github.vlsi.gradle.release.ReleaseParams
2727
import com.github.vlsi.gradle.release.dsl.dependencyLicenses
2828
import com.github.vlsi.gradle.release.dsl.licensesCopySpec
29+
import java.time.Instant
30+
import java.time.temporal.ChronoUnit
2931

3032
plugins {
3133
id("com.github.vlsi.stage-vote-release")
@@ -54,7 +56,7 @@ https://gitbox.apache.org/repos/asf?p=calcite.git;a=commit;h=$gitSha
5456
Its hash is $gitSha
5557
5658
Tag:
57-
$sourceCodeTagUrl
59+
https://github.com/apache/calcite/tree/$tag
5860
5961
The artifacts to be voted on are located here:
6062
$svnStagingUri
@@ -71,24 +73,38 @@ https://people.apache.org/keys/committer/$committerId.asc
7173
https://www.apache.org/dist/$tlpUrl/KEYS
7274
7375
To create the jars and test $componentName: "gradle build"
74-
(requires an appropriate Gradle/JDK installation)
76+
(Requires an appropriate Gradle/JDK installation.)
7577
7678
Please vote on releasing this package as $componentName $version.
77-
78-
The vote is open for the next 72 hours and passes if a majority of at
79-
least three +1 PMC votes are cast.
79+
Everyone is welcome to vote. Your vote should contain the line
80+
'code name (role)', where
81+
* 'code' is +1, 0 or -1 as below;
82+
* 'name' is your ASF id if you have one, else your real name;
83+
* 'role' is 'community', 'committer' or 'PMC member'.
8084
8185
[ ] +1 Release this package as Apache Calcite $version
8286
[ ] 0 I don't feel strongly about it, but I'm okay with the release
8387
[ ] -1 Do not release this package because...
8488
89+
The vote is open for the next $voteDurationHours hours (closing at
90+
$voteEnd) and passes if a majority of
91+
at least three +1 votes by PMC members are cast.
92+
8593
Here is my vote:
8694
87-
+1 (binding)
95+
+1 $committerId (PMC member)
96+
97+
$userName (release manager)
98+
8899
""".trimIndent()
89100

90101
val distributionGroup = "distribution"
91102
val baseFolder = "apache-calcite-${rootProject.version}"
103+
val userName = System.getProperty("user.name")
104+
val voteDurationHours = 72L
105+
val voteEnd =
106+
Instant.now().truncatedTo(ChronoUnit.HOURS)
107+
.plus(voteDurationHours, ChronoUnit.HOURS).toString()
92108

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

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

0 commit comments

Comments
 (0)