topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-11 12:07:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix milvus dependency conflict (#1246)

Browse Source
This commit is contained in:
二毛
2024-06-28 14:14:04 +08:00
committed by GitHub
parent 3d4c078d95
commit 3e8283a7b6
5 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
auth/authentication/pom.xml
View File

@@ -38,10 +38,6 @@
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>${alibaba.druid.version}</version> <version>${alibaba.druid.version}</version>
</dependency> </dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
@@ -50,7 +46,6 @@
<dependency> <dependency>
<groupId>com.github.pagehelper</groupId> <groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId> <artifactId>pagehelper</artifactId>
<version>${pagehelper.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

5
headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/schema/SemanticSqlConformance.java
View File

@@ -79,6 +79,11 @@ public class SemanticSqlConformance implements SqlConformance {
return SqlConformanceEnum.BIG_QUERY.isMinusAllowed(); return SqlConformanceEnum.BIG_QUERY.isMinusAllowed();
} }
@Override
public boolean isRegexReplaceCaptureGroupDollarIndexed() {
return SqlConformanceEnum.BIG_QUERY.isRegexReplaceCaptureGroupDollarIndexed();
}
@Override @Override
public boolean isApplyAllowed() { public boolean isApplyAllowed() {
return SqlConformanceEnum.BIG_QUERY.isApplyAllowed(); return SqlConformanceEnum.BIG_QUERY.isApplyAllowed();

19
headless/server/pom.xml
View File

@@ -37,7 +37,6 @@
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tencent.supersonic</groupId> <groupId>com.tencent.supersonic</groupId>
@@ -63,10 +62,6 @@
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>${alibaba.druid.version}</version> <version>${alibaba.druid.version}</version>
</dependency> </dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
@@ -86,7 +81,6 @@
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId> <artifactId>mockito-inline</artifactId>
<version>${mockito-inline.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -96,7 +90,6 @@
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<version>${h2.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
@@ -121,19 +114,17 @@
<dependency> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf-java.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.arrow</groupId> <groupId>org.apache.arrow</groupId>
<artifactId>flight-sql</artifactId> <artifactId>flight-sql</artifactId>
<version>${flight-sql.version}</version> <version>${flight-sql.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.24.0</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.arrow</groupId> <groupId>org.apache.arrow</groupId>
<artifactId>arrow-jdbc</artifactId> <artifactId>arrow-jdbc</artifactId>

7
launchers/standalone/pom.xml
View File

@@ -42,7 +42,11 @@
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<version>${h2.version}</version> </dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency> </dependency>
<dependency> <dependency>
@@ -89,7 +93,6 @@
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId> <artifactId>log4j-slf4j-impl</artifactId>
<version>2.14.1</version>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>

7
pom.xml
View File

@@ -49,18 +49,18 @@
<jjwt.version>0.12.3</jjwt.version> <jjwt.version>0.12.3</jjwt.version>
<alibaba.druid.version>1.2.3</alibaba.druid.version> <alibaba.druid.version>1.2.3</alibaba.druid.version>
<mysql.connector.java.version>5.1.46</mysql.connector.java.version> <mysql.connector.java.version>5.1.46</mysql.connector.java.version>
<mybatis.plus.version>3.1.2</mybatis.plus.version> <mybatis.plus.version>3.5.7</mybatis.plus.version>
<clickhouse.jdbc.version>0.4.6</clickhouse.jdbc.version> <clickhouse.jdbc.version>0.4.6</clickhouse.jdbc.version>
<h2.version>1.4.200</h2.version> <h2.version>1.4.200</h2.version>
<fastjson.version>2.0.40</fastjson.version> <fastjson.version>2.0.40</fastjson.version>
<dozer.verson>6.5.0</dozer.verson> <dozer.verson>7.0.0</dozer.verson>
<httpmime.version>4.5.6</httpmime.version> <httpmime.version>4.5.6</httpmime.version>
<transmittable.version>2.12.1</transmittable.version> <transmittable.version>2.12.1</transmittable.version>
<commons.compress.version>1.21</commons.compress.version> <commons.compress.version>1.21</commons.compress.version>
<jetty.util.version>6.1.26</jetty.util.version> <jetty.util.version>6.1.26</jetty.util.version>
<spring.version>2.5.1</spring.version> <spring.version>2.5.1</spring.version>
<jsonpath.version>2.8.0</jsonpath.version> <jsonpath.version>2.8.0</jsonpath.version>
<calcite.version>1.35.0</calcite.version> <calcite.version>1.37.0</calcite.version>
<calcite.avatica.version>1.23.0</calcite.avatica.version> <calcite.avatica.version>1.23.0</calcite.avatica.version>
<xk.time.version>3.2.4</xk.time.version> <xk.time.version>3.2.4</xk.time.version>
<mockito-inline.version>4.5.1</mockito-inline.version> <mockito-inline.version>4.5.1</mockito-inline.version>
@@ -70,7 +70,6 @@
<postgresql.version>42.7.1</postgresql.version> <postgresql.version>42.7.1</postgresql.version>
<st.version>4.0.8</st.version> <st.version>4.0.8</st.version>
<duckdb_jdbc.version>0.10.0</duckdb_jdbc.version> <duckdb_jdbc.version>0.10.0</duckdb_jdbc.version>
<protobuf-java.version>3.23.1</protobuf-java.version>
<flight-sql.version>15.0.2</flight-sql.version> <flight-sql.version>15.0.2</flight-sql.version>
<arrow-jdbc.version>15.0.2</arrow-jdbc.version> <arrow-jdbc.version>15.0.2</arrow-jdbc.version>
<flight-sql-jdbc-driver.version>15.0.2</flight-sql-jdbc-driver.version> <flight-sql-jdbc-driver.version>15.0.2</flight-sql-jdbc-driver.version>