This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new b88201e0db3 Move calcite and immutables dependency to sql federation
optimizer module (#30230)
b88201e0db3 is described below
commit b88201e0db38ac10a2f1abf69fa98166b750fc4f
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Wed Feb 21 19:13:57 2024 +0800
Move calcite and immutables dependency to sql federation optimizer module
(#30230)
---
kernel/sql-federation/executor/pom.xml | 5 -----
kernel/sql-federation/optimizer/pom.xml | 25 ++++++++++++++++---------
pom.xml | 14 --------------
3 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/kernel/sql-federation/executor/pom.xml
b/kernel/sql-federation/executor/pom.xml
index c23669997eb..a23efbd52fb 100644
--- a/kernel/sql-federation/executor/pom.xml
+++ b/kernel/sql-federation/executor/pom.xml
@@ -57,11 +57,6 @@
<artifactId>shardingsphere-infra-binder</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.immutables</groupId>
- <artifactId>value</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-fixture-database</artifactId>
diff --git a/kernel/sql-federation/optimizer/pom.xml
b/kernel/sql-federation/optimizer/pom.xml
index b7c84ddf0f6..074a1191f5d 100644
--- a/kernel/sql-federation/optimizer/pom.xml
+++ b/kernel/sql-federation/optimizer/pom.xml
@@ -26,26 +26,33 @@
<artifactId>shardingsphere-sql-federation-optimizer</artifactId>
<name>${project.artifactId}</name>
+ <properties>
+ <calcite.version>1.35.0</calcite.version>
+ <immutables.version>2.9.3</immutables.version>
+ </properties>
+
<dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-sql-parser-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path</artifactId>
+ <version>${calcite.version}</version>
</dependency>
<dependency>
<groupId>org.immutables</groupId>
<artifactId>value</artifactId>
+ <version>${immutables.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-sql-parser-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-parser-sql-sql92</artifactId>
diff --git a/pom.xml b/pom.xml
index 00f95da26db..09a9e94ccaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,9 +90,6 @@
<jakarta.jakartaee-bom.version>8.0.0</jakarta.jakartaee-bom.version>
<glassfish-jaxb.version>2.3.9</glassfish-jaxb.version>
- <calcite.version>1.35.0</calcite.version>
- <immutables.version>2.9.3</immutables.version>
-
<atomikos.version>6.0.0</atomikos.version>
<narayana.version>5.12.4.Final</narayana.version>
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
@@ -310,22 +307,11 @@
<version>${freemarker.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-core</artifactId>
- <version>${calcite.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>${commons-math3.version}</version>
</dependency>
- <dependency>
- <groupId>org.immutables</groupId>
- <artifactId>value</artifactId>
- <version>${immutables.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>io.netty</groupId>
