Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Calcite 1.32.0 #13153

Closed
wants to merge 7 commits into from
Closed

Upgrade to Calcite 1.32.0 #13153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3252488
Upgrade Calcite to 1.32.0
liam-verta Sep 27, 2022
2e9aa1c
Suppress Calcite CVE (#13119)
adarshsanjeev Sep 23, 2022
af6239b
Update licenses and comments
liam-verta Sep 27, 2022
eff0036
Update owasp suppression
liam-verta Sep 27, 2022
a97c2b7
WIP generating fmpp
liam-verta Sep 27, 2022
2957823
Update sql/pom.xml
liam-verta Sep 28, 2022
ed1bcbe
Update pom.xml
liam-verta Sep 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion extensions-contrib/compressed-bigdecimal/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
<version>1.21.0</version>
<scope>provided</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion licenses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1620,7 +1620,7 @@ name: Apache Calcite
license_category: binary
module: java-core
license_name: Apache License version 2.0
version: 1.21.0
version: 1.32.0
libraries:
- org.apache.calcite: calcite-core
- org.apache.calcite: calcite-linq4j
Expand Down
13 changes: 1 addition & 12 deletions owasp-dependency-check-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@
<cve>CVE-2015-7430</cve>
<cve>CVE-2017-3162</cve>
</suppress>

<suppress>
<!-- Suppress avro cves that are only applicable to .NET SDK-->
<notes><![CDATA[
Expand Down Expand Up @@ -643,15 +643,4 @@
<cve>CVE-2022-39135</cve>
</suppress>

<suppress>
<!-- calcite-core-1.21.0.jar -->
<notes><![CDATA[
file name: calcite-core-1.21.0.jar
]]></notes>
<!--
We do not expose any of the SQL operators that were found vulnerable in this CVE.
-->
<cve>CVE-2022-39135</cve>
</suppress>

</suppressions>
9 changes: 3 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,9 @@
<apache.ranger.gson.version>2.2.4</apache.ranger.gson.version>
<avatica.version>1.17.0</avatica.version>
<avro.version>1.9.2</avro.version>
<!-- sql/src/main/codegen/config.fmpp is based on a file from calcite-core, and needs to be
updated when upgrading Calcite. Refer to the top-level comments in that file for details.
Also, CalcitePlanner is a clone of Calcite's PlannerImpl and may require updates when
<!-- CalcitePlanner is a clone of Calcite's PlannerImpl and may require updates when
Calcite is upgrade. -->
<calcite.version>1.21.0</calcite.version>
<calcite.version>1.32.0</calcite.version>
<datasketches.version>3.2.0</datasketches.version>
<datasketches.memory.version>2.0.0</datasketches.memory.version>
<derby.version>10.14.2.0</derby.version>
Expand Down Expand Up @@ -939,9 +937,8 @@
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
<artifactId>calcite-testkit</artifactId>
<version>${calcite.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
5 changes: 2 additions & 3 deletions sql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,7 @@
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
<type>test-jar</type>
<artifactId>calcite-testkit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -287,7 +286,7 @@
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/</outputDirectory>
<includes>**/Parser.jj</includes>
<includes>**/Parser.jj,**/default_config.fmpp</includes>
</artifactItem>
</artifactItems>
</configuration>
Expand Down
Loading