From f0fa4011c13e2fece7d26d3f82886dd0d22bfd3b Mon Sep 17 00:00:00 2001
From: taoran1250 <543121890@qq.com>
Date: Thu, 31 Oct 2024 15:51:03 +0800
Subject: [PATCH 1/5] chore: pom update
---
linkis-commons/linkis-module/pom.xml | 20 ++++++++++++++++++++
linkis-engineconn-plugins/hive/pom.xml | 9 +++++++++
pom.xml | 2 ++
3 files changed, 31 insertions(+)
diff --git a/linkis-commons/linkis-module/pom.xml b/linkis-commons/linkis-module/pom.xml
index 86c2cb0afd..cbea615641 100644
--- a/linkis-commons/linkis-module/pom.xml
+++ b/linkis-commons/linkis-module/pom.xml
@@ -118,9 +118,29 @@
io.github.x-stream
mxparser
+
+ com.fasterxml.woodstox
+ woodstox-core
+
+
+ org.codehaus.jettison
+ jettison
+
+
+ com.fasterxml.woodstox
+ woodstox-core
+ ${woodstox.core.version}
+
+
+
+ org.codehaus.jettison
+ jettison
+ ${jettision.version}
+
+
org.springframework.boot
spring-boot-starter-cache
diff --git a/linkis-engineconn-plugins/hive/pom.xml b/linkis-engineconn-plugins/hive/pom.xml
index 8cdc574036..6d9462d496 100644
--- a/linkis-engineconn-plugins/hive/pom.xml
+++ b/linkis-engineconn-plugins/hive/pom.xml
@@ -203,8 +203,17 @@
com.google.inject
guice
+
+ org.codehaus.jettison
+ jettison
+
+
+ org.codehaus.jettison
+ jettison
+ ${jettision.version}
+
org.apache.hadoop
diff --git a/pom.xml b/pom.xml
index 28827d5719..f12ae0d0b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,6 +158,8 @@
2.17.2
5.2.3
1.33
+ 1.5.4
+ 6.4.0
1.3.5
From b96af34d0d5de904c78a9a72b6326602cdd6d5bc Mon Sep 17 00:00:00 2001
From: taoran1250 <543121890@qq.com>
Date: Tue, 5 Nov 2024 16:21:42 +0800
Subject: [PATCH 2/5] chore: pom update
---
linkis-engineconn-plugins/flink/pom.xml | 13 ++++++++-
linkis-engineconn-plugins/hive/pom.xml | 10 +++++++
linkis-engineconn-plugins/jdbc/pom.xml | 27 ++++++++++++++++++-
linkis-engineconn-plugins/presto/pom.xml | 11 ++++++++
linkis-engineconn-plugins/trino/pom.xml | 11 ++++++++
linkis-extensions/linkis-et-monitor/pom.xml | 2 +-
.../service/hive/pom.xml | 9 +++++++
.../service/kafka/pom.xml | 11 ++++++++
.../linkis-spring-cloud-gateway/pom.xml | 9 +++++++
pom.xml | 5 ++++
10 files changed, 105 insertions(+), 3 deletions(-)
diff --git a/linkis-engineconn-plugins/flink/pom.xml b/linkis-engineconn-plugins/flink/pom.xml
index 77cf73b491..72a1872172 100644
--- a/linkis-engineconn-plugins/flink/pom.xml
+++ b/linkis-engineconn-plugins/flink/pom.xml
@@ -205,8 +205,19 @@
org.apache.kafka
kafka-clients
+
+
+ org.xerial.snappy
+ snappy-java
+
+
3.4.0
+
+ org.xerial.snappy
+ snappy-java
+ ${snappy-java.version}
+
org.apache.flink
flink-json
@@ -339,7 +350,7 @@
org.apache.avro
avro
- 1.11.0
+ ${avro.version}
org.apache.hadoop
diff --git a/linkis-engineconn-plugins/hive/pom.xml b/linkis-engineconn-plugins/hive/pom.xml
index 6d9462d496..f83596326d 100644
--- a/linkis-engineconn-plugins/hive/pom.xml
+++ b/linkis-engineconn-plugins/hive/pom.xml
@@ -111,9 +111,19 @@
org.apache.logging.log4j
log4j-slf4j-impl
+
+ io.airlift
+ aircompressor
+
+
+ io.airlift
+ aircompressor
+ ${aircompressor.version}
+
+
org.apache.hive
hive-exec
diff --git a/linkis-engineconn-plugins/jdbc/pom.xml b/linkis-engineconn-plugins/jdbc/pom.xml
index d46f50f35b..d0da9170ab 100644
--- a/linkis-engineconn-plugins/jdbc/pom.xml
+++ b/linkis-engineconn-plugins/jdbc/pom.xml
@@ -134,10 +134,35 @@
io.netty
netty
-
+
+ org.apache.avro
+ avro
+
+
+ org.xerial.snappy
+ snappy-java
+
+
+ io.airlift
+ aircompressor
+ ${aircompressor.version}
+
+
+
+ org.xerial.snappy
+ snappy-java
+ ${snappy-java.version}
+
+
+
+ org.apache.avro
+ avro
+ ${avro.version}
+
+
io.trino
trino-jdbc
diff --git a/linkis-engineconn-plugins/presto/pom.xml b/linkis-engineconn-plugins/presto/pom.xml
index 0394a0fcbf..e0a8c1d1d0 100644
--- a/linkis-engineconn-plugins/presto/pom.xml
+++ b/linkis-engineconn-plugins/presto/pom.xml
@@ -69,6 +69,17 @@
com.facebook.presto
presto-client
${presto.version}
+
+
+ com.squareup.okio
+ okio
+
+
+
+
+ com.squareup.okio
+ okio
+ ${okio.version}
com.facebook.presto
diff --git a/linkis-engineconn-plugins/trino/pom.xml b/linkis-engineconn-plugins/trino/pom.xml
index 246f547511..db53e63f62 100644
--- a/linkis-engineconn-plugins/trino/pom.xml
+++ b/linkis-engineconn-plugins/trino/pom.xml
@@ -67,6 +67,17 @@
io.trino
trino-client
${trino.version}
+
+
+ com.squareup.okio
+ okio
+
+
+
+
+ com.squareup.okio
+ okio
+ ${okio.version}
diff --git a/linkis-extensions/linkis-et-monitor/pom.xml b/linkis-extensions/linkis-et-monitor/pom.xml
index 18d7079951..491d6b0a6c 100644
--- a/linkis-extensions/linkis-et-monitor/pom.xml
+++ b/linkis-extensions/linkis-et-monitor/pom.xml
@@ -90,7 +90,7 @@
io.projectreactor.netty
reactor-netty-http
- 1.1.13
+ ${reactor-netty-http.version}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
index 6f5305ef57..e69abe6eeb 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
@@ -148,8 +148,17 @@
com.github.joshelser
dropwizard-metrics-hadoop-metrics2-reporter
+
+ io.airlift
+ aircompressor
+
+
+ io.airlift
+ aircompressor
+ ${aircompressor.version}
+
org.apache.hive
hive-exec
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
index 1cf433c847..4154227902 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
@@ -49,8 +49,19 @@
org.apache.kafka
kafka-clients
+
+
+ org.xerial.snappy
+ snappy-java
+
+
2.7.0
+
+ org.xerial.snappy
+ snappy-java
+ ${snappy-java.version}
+
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml
index cd8d19e871..b6c98dba0e 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml
@@ -92,8 +92,17 @@
io.projectreactor.netty
reactor-netty
+
+ io.projectreactor.netty
+ reactor-netty-http
+
+
+ io.projectreactor.netty
+ reactor-netty-http
+ ${reactor-netty-http.version}
+
org.springframework.boot
spring-boot-starter
diff --git a/pom.xml b/pom.xml
index f12ae0d0b2..8073a53633 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,11 @@
2.7.1
33.2.1-jre
4.1.108.Final
+ 3.4.0
+ 1.1.10.4
+ 1.11.3
+ 0.27
+ 1.0.39
2.8.9
From ffa839f22457e34dad74d2963181afab58666b31 Mon Sep 17 00:00:00 2001
From: taoran1250 <543121890@qq.com>
Date: Tue, 5 Nov 2024 19:26:02 +0800
Subject: [PATCH 3/5] chore: pom update
---
linkis-engineconn-plugins/flink/pom.xml | 4 ++--
linkis-engineconn-plugins/hive/pom.xml | 2 +-
linkis-engineconn-plugins/jdbc/pom.xml | 6 +++---
linkis-engineconn-plugins/presto/pom.xml | 2 +-
linkis-engineconn-plugins/trino/pom.xml | 2 +-
linkis-extensions/linkis-et-monitor/pom.xml | 2 +-
.../linkis-metadata-query/service/hive/pom.xml | 2 +-
.../linkis-metadata-query/service/kafka/pom.xml | 2 +-
.../linkis-spring-cloud-gateway/pom.xml | 2 +-
pom.xml | 5 -----
10 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/linkis-engineconn-plugins/flink/pom.xml b/linkis-engineconn-plugins/flink/pom.xml
index 72a1872172..d656c41eab 100644
--- a/linkis-engineconn-plugins/flink/pom.xml
+++ b/linkis-engineconn-plugins/flink/pom.xml
@@ -216,7 +216,7 @@
org.xerial.snappy
snappy-java
- ${snappy-java.version}
+ 1.1.10.4
org.apache.flink
@@ -350,7 +350,7 @@
org.apache.avro
avro
- ${avro.version}
+ 1.11.4
org.apache.hadoop
diff --git a/linkis-engineconn-plugins/hive/pom.xml b/linkis-engineconn-plugins/hive/pom.xml
index f83596326d..f29a93f290 100644
--- a/linkis-engineconn-plugins/hive/pom.xml
+++ b/linkis-engineconn-plugins/hive/pom.xml
@@ -121,7 +121,7 @@
io.airlift
aircompressor
- ${aircompressor.version}
+ 0.27
diff --git a/linkis-engineconn-plugins/jdbc/pom.xml b/linkis-engineconn-plugins/jdbc/pom.xml
index d0da9170ab..e914976c29 100644
--- a/linkis-engineconn-plugins/jdbc/pom.xml
+++ b/linkis-engineconn-plugins/jdbc/pom.xml
@@ -148,19 +148,19 @@
io.airlift
aircompressor
- ${aircompressor.version}
+ 0.27
org.xerial.snappy
snappy-java
- ${snappy-java.version}
+ 1.1.10.4
org.apache.avro
avro
- ${avro.version}
+ 1.11.4
diff --git a/linkis-engineconn-plugins/presto/pom.xml b/linkis-engineconn-plugins/presto/pom.xml
index e0a8c1d1d0..dc346988b2 100644
--- a/linkis-engineconn-plugins/presto/pom.xml
+++ b/linkis-engineconn-plugins/presto/pom.xml
@@ -79,7 +79,7 @@
com.squareup.okio
okio
- ${okio.version}
+ 3.4.0
com.facebook.presto
diff --git a/linkis-engineconn-plugins/trino/pom.xml b/linkis-engineconn-plugins/trino/pom.xml
index db53e63f62..38cc9285e9 100644
--- a/linkis-engineconn-plugins/trino/pom.xml
+++ b/linkis-engineconn-plugins/trino/pom.xml
@@ -77,7 +77,7 @@
com.squareup.okio
okio
- ${okio.version}
+ 3.4.0
diff --git a/linkis-extensions/linkis-et-monitor/pom.xml b/linkis-extensions/linkis-et-monitor/pom.xml
index 491d6b0a6c..215bda5752 100644
--- a/linkis-extensions/linkis-et-monitor/pom.xml
+++ b/linkis-extensions/linkis-et-monitor/pom.xml
@@ -90,7 +90,7 @@
io.projectreactor.netty
reactor-netty-http
- ${reactor-netty-http.version}
+ 1.0.39
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
index e69abe6eeb..ed2b32ea34 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
@@ -157,7 +157,7 @@
io.airlift
aircompressor
- ${aircompressor.version}
+ 0.27
org.apache.hive
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
index 4154227902..8460c7ea59 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
@@ -60,7 +60,7 @@
org.xerial.snappy
snappy-java
- ${snappy-java.version}
+ 1.1.10.4
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml
index b6c98dba0e..d5917b242d 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml
@@ -101,7 +101,7 @@
io.projectreactor.netty
reactor-netty-http
- ${reactor-netty-http.version}
+ 1.0.39
org.springframework.boot
diff --git a/pom.xml b/pom.xml
index 8073a53633..f12ae0d0b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,11 +118,6 @@
2.7.1
33.2.1-jre
4.1.108.Final
- 3.4.0
- 1.1.10.4
- 1.11.3
- 0.27
- 1.0.39
2.8.9
From 0d76a3e6b0557b1e51e02060a3caa7829453dfc8 Mon Sep 17 00:00:00 2001
From: taoran1250 <543121890@qq.com>
Date: Tue, 5 Nov 2024 19:56:42 +0800
Subject: [PATCH 4/5] Revert "chore: pom update"
This reverts commit ffa839f22457e34dad74d2963181afab58666b31.
---
linkis-engineconn-plugins/flink/pom.xml | 4 ++--
linkis-engineconn-plugins/hive/pom.xml | 2 +-
linkis-engineconn-plugins/jdbc/pom.xml | 6 +++---
linkis-engineconn-plugins/presto/pom.xml | 2 +-
linkis-engineconn-plugins/trino/pom.xml | 2 +-
linkis-extensions/linkis-et-monitor/pom.xml | 2 +-
.../linkis-metadata-query/service/hive/pom.xml | 2 +-
.../linkis-metadata-query/service/kafka/pom.xml | 2 +-
.../linkis-spring-cloud-gateway/pom.xml | 2 +-
pom.xml | 5 +++++
10 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/linkis-engineconn-plugins/flink/pom.xml b/linkis-engineconn-plugins/flink/pom.xml
index d656c41eab..72a1872172 100644
--- a/linkis-engineconn-plugins/flink/pom.xml
+++ b/linkis-engineconn-plugins/flink/pom.xml
@@ -216,7 +216,7 @@
org.xerial.snappy
snappy-java
- 1.1.10.4
+ ${snappy-java.version}
org.apache.flink
@@ -350,7 +350,7 @@
org.apache.avro
avro
- 1.11.4
+ ${avro.version}
org.apache.hadoop
diff --git a/linkis-engineconn-plugins/hive/pom.xml b/linkis-engineconn-plugins/hive/pom.xml
index f29a93f290..f83596326d 100644
--- a/linkis-engineconn-plugins/hive/pom.xml
+++ b/linkis-engineconn-plugins/hive/pom.xml
@@ -121,7 +121,7 @@
io.airlift
aircompressor
- 0.27
+ ${aircompressor.version}
diff --git a/linkis-engineconn-plugins/jdbc/pom.xml b/linkis-engineconn-plugins/jdbc/pom.xml
index e914976c29..d0da9170ab 100644
--- a/linkis-engineconn-plugins/jdbc/pom.xml
+++ b/linkis-engineconn-plugins/jdbc/pom.xml
@@ -148,19 +148,19 @@
io.airlift
aircompressor
- 0.27
+ ${aircompressor.version}
org.xerial.snappy
snappy-java
- 1.1.10.4
+ ${snappy-java.version}
org.apache.avro
avro
- 1.11.4
+ ${avro.version}
diff --git a/linkis-engineconn-plugins/presto/pom.xml b/linkis-engineconn-plugins/presto/pom.xml
index dc346988b2..e0a8c1d1d0 100644
--- a/linkis-engineconn-plugins/presto/pom.xml
+++ b/linkis-engineconn-plugins/presto/pom.xml
@@ -79,7 +79,7 @@
com.squareup.okio
okio
- 3.4.0
+ ${okio.version}
com.facebook.presto
diff --git a/linkis-engineconn-plugins/trino/pom.xml b/linkis-engineconn-plugins/trino/pom.xml
index 38cc9285e9..db53e63f62 100644
--- a/linkis-engineconn-plugins/trino/pom.xml
+++ b/linkis-engineconn-plugins/trino/pom.xml
@@ -77,7 +77,7 @@
com.squareup.okio
okio
- 3.4.0
+ ${okio.version}
diff --git a/linkis-extensions/linkis-et-monitor/pom.xml b/linkis-extensions/linkis-et-monitor/pom.xml
index 215bda5752..491d6b0a6c 100644
--- a/linkis-extensions/linkis-et-monitor/pom.xml
+++ b/linkis-extensions/linkis-et-monitor/pom.xml
@@ -90,7 +90,7 @@
io.projectreactor.netty
reactor-netty-http
- 1.0.39
+ ${reactor-netty-http.version}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
index ed2b32ea34..e69abe6eeb 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
@@ -157,7 +157,7 @@
io.airlift
aircompressor
- 0.27
+ ${aircompressor.version}
org.apache.hive
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
index 8460c7ea59..4154227902 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
@@ -60,7 +60,7 @@
org.xerial.snappy
snappy-java
- 1.1.10.4
+ ${snappy-java.version}
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml
index d5917b242d..b6c98dba0e 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml
@@ -101,7 +101,7 @@
io.projectreactor.netty
reactor-netty-http
- 1.0.39
+ ${reactor-netty-http.version}
org.springframework.boot
diff --git a/pom.xml b/pom.xml
index f12ae0d0b2..8073a53633 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,11 @@
2.7.1
33.2.1-jre
4.1.108.Final
+ 3.4.0
+ 1.1.10.4
+ 1.11.3
+ 0.27
+ 1.0.39
2.8.9
From 574d2f07383cc0d1e3b12f96948cc1e829fc0591 Mon Sep 17 00:00:00 2001
From: taoran1250 <543121890@qq.com>
Date: Tue, 5 Nov 2024 19:57:43 +0800
Subject: [PATCH 5/5] chore: pom update
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8073a53633..49551bbb4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
4.1.108.Final
3.4.0
1.1.10.4
- 1.11.3
+ 1.11.4
0.27
1.0.39