From 681d03fbe7f0c32cdae6af3c44877ffb69f30638 Mon Sep 17 00:00:00 2001 From: "jianghang.loujh" Date: Fri, 1 Sep 2023 13:59:05 +0800 Subject: [PATCH] upgrade dependency version for CVE --- admin/pom.xml | 69 +---------- client-adapter/common/pom.xml | 1 - client-adapter/hbase/pom.xml | 1 - client-adapter/kudu/pom.xml | 3 - client-adapter/logger/pom.xml | 1 - client-adapter/phoenix/pom.xml | 4 +- client-adapter/pom.xml | 82 +++++++------ client-adapter/rdb/pom.xml | 1 - client-adapter/tablestore/pom.xml | 3 - client/pom.xml | 12 +- connector/kafka-connector/pom.xml | 4 +- connector/pulsarmq-connector/pom.xml | 2 + connector/rabbitmq-connector/pom.xml | 6 +- connector/rocketmq-connector/pom.xml | 6 +- driver/pom.xml | 4 + example/pom.xml | 76 ------------ pom.xml | 173 +++++++++++++++++---------- server/pom.xml | 1 - 18 files changed, 176 insertions(+), 273 deletions(-) diff --git a/admin/pom.xml b/admin/pom.xml index 23354256..f4ae8b00 100644 --- a/admin/pom.xml +++ b/admin/pom.xml @@ -1,5 +1,11 @@ + + com.alibaba.otter + canal + 1.1.7-SNAPSHOT + ../pom.xml + 4.0.0 com.alibaba.otter canal.admin @@ -18,7 +24,6 @@ 1.8 1.8 UTF-8 - 2.17.0 @@ -28,38 +33,6 @@ spring-cloud-context 2.0.0.RELEASE - - org.springframework - spring-core - 5.0.5.RELEASE - - - org.springframework - spring-aop - 5.0.5.RELEASE - - - org.springframework - spring-context - 5.0.5.RELEASE - - - org.springframework - spring-jdbc - 5.0.5.RELEASE - - - org.springframework - spring-orm - 5.0.5.RELEASE - - - org.springframework - spring-test - 5.0.5.RELEASE - test - - org.springframework.boot spring-boot-dependencies @@ -67,46 +40,16 @@ pom import - - mysql - mysql-connector-java - 5.1.48 - com.github.ben-manes.caffeine caffeine 2.6.2 - - commons-beanutils - commons-beanutils - 1.8.2 - - - commons-lang - commons-lang - 2.6 - io.ebean ebean 11.41.1 - - org.apache.logging.log4j - log4j-core - ${log4j_version} - - - org.apache.logging.log4j - log4j-api - ${log4j_version} - - - org.apache.logging.log4j - log4j-to-slf4j - ${log4j_version} - diff --git a/client-adapter/common/pom.xml b/client-adapter/common/pom.xml index 21213cf0..2bab94c2 100644 --- a/client-adapter/common/pom.xml +++ b/client-adapter/common/pom.xml @@ -60,5 +60,4 @@ test - diff --git a/client-adapter/hbase/pom.xml b/client-adapter/hbase/pom.xml index bdc17fb3..68513c52 100644 --- a/client-adapter/hbase/pom.xml +++ b/client-adapter/hbase/pom.xml @@ -21,7 +21,6 @@ org.apache.hbase hbase-shaded-client - 1.1.2 org.slf4j diff --git a/client-adapter/kudu/pom.xml b/client-adapter/kudu/pom.xml index e2d30c89..1e865bd5 100644 --- a/client-adapter/kudu/pom.xml +++ b/client-adapter/kudu/pom.xml @@ -21,18 +21,15 @@ org.apache.kudu kudu-client - 1.6.0 junit junit - 4.12 test mysql mysql-connector-java - 5.1.48 test diff --git a/client-adapter/logger/pom.xml b/client-adapter/logger/pom.xml index ce8bd4c0..b4923a78 100644 --- a/client-adapter/logger/pom.xml +++ b/client-adapter/logger/pom.xml @@ -20,7 +20,6 @@ - diff --git a/client-adapter/phoenix/pom.xml b/client-adapter/phoenix/pom.xml index 91a4b3b1..6d61a00c 100644 --- a/client-adapter/phoenix/pom.xml +++ b/client-adapter/phoenix/pom.xml @@ -17,13 +17,12 @@ org.apache.phoenix phoenix-core - 4.14.1-HBase-1.4 org.apache.hbase hbase-client - 1.4.8 + com.google.protobuf protobuf-java @@ -71,7 +70,6 @@ fastjson2 provided - mysql mysql-connector-java diff --git a/client-adapter/pom.xml b/client-adapter/pom.xml index 463ea2e6..7f916036 100644 --- a/client-adapter/pom.xml +++ b/client-adapter/pom.xml @@ -126,35 +126,35 @@ org.apache.rocketmq rocketmq-client - 4.5.1 + ${rocketmq_version} org.apache.kafka kafka-clients - 1.1.1 + ${kafka_version} - + com.rabbitmq amqp-client - 5.5.0 + ${rabbitmq_version} com.alibaba.mq-amqp mq-amqp-client - 1.0.3 + ${mq_amqp_client} mysql mysql-connector-java - 5.1.48 + ${mysql_driver_version} org.postgresql postgresql - 42.1.4 + 42.3.3 com.oracle.database.jdbc @@ -166,7 +166,6 @@ mssql-jdbc 7.0.0.jre8 - org.apache.hbase hbase-shaded-client @@ -182,6 +181,37 @@ + + org.apache.phoenix + phoenix-core + 4.14.1-HBase-1.4 + + + org.apache.hbase + hbase-client + 1.4.8 + + + com.aliyun.openservices + tablestore + 5.10.3 + jar-with-dependencies + + + com.google.protobuf + protobuf-java + + + org.apache.httpcomponents + httpasyncclient + + + + + org.apache.kudu + kudu-client + 1.6.0 + org.apache.curator curator-recipes @@ -201,8 +231,9 @@ org.yaml snakeyaml - 1.19 + 1.29 + org.powermock powermock-api-mockito @@ -233,39 +264,6 @@ 1.9.0 test - - - com.aliyun.openservices - tablestore - 5.10.3 - jar-with-dependencies - - - com.google.protobuf - protobuf-java - - - org.apache.httpcomponents - httpasyncclient - - - - - - org.apache.logging.log4j - log4j-core - ${log4j_version} - - - org.apache.logging.log4j - log4j-api - ${log4j_version} - - - org.apache.logging.log4j - log4j-to-slf4j - ${log4j_version} - diff --git a/client-adapter/rdb/pom.xml b/client-adapter/rdb/pom.xml index 8ba819fb..14f9c22f 100644 --- a/client-adapter/rdb/pom.xml +++ b/client-adapter/rdb/pom.xml @@ -42,7 +42,6 @@ junit junit - 4.12 test diff --git a/client-adapter/tablestore/pom.xml b/client-adapter/tablestore/pom.xml index da4b448d..42deed18 100644 --- a/client-adapter/tablestore/pom.xml +++ b/client-adapter/tablestore/pom.xml @@ -30,7 +30,6 @@ com.aliyun.openservices tablestore - 5.10.3 jar-with-dependencies @@ -43,8 +42,6 @@ - - diff --git a/client/pom.xml b/client/pom.xml index 6618ed91..3e69c4eb 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -101,42 +101,44 @@ org.apache.rocketmq rocketmq-client - 4.5.2 + ${rocketmq_version} provided org.apache.rocketmq rocketmq-acl - 4.5.2 + ${rocketmq_version} provided com.rabbitmq amqp-client - 5.5.0 + ${rabbitmq_version} provided com.alibaba.mq-amqp mq-amqp-client - 1.0.3 + ${mq_amqp_client} provided org.apache.kafka kafka-clients - 1.1.1 + ${kafka_version} provided org.apache.pulsar pulsar-client + ${pulsar_version} provided org.apache.pulsar pulsar-client-admin + ${pulsar_version} provided diff --git a/connector/kafka-connector/pom.xml b/connector/kafka-connector/pom.xml index 2996e111..20f243bb 100644 --- a/connector/kafka-connector/pom.xml +++ b/connector/kafka-connector/pom.xml @@ -29,7 +29,7 @@ org.apache.kafka kafka_2.11 - 1.1.1 + ${kafka_version} junit @@ -89,4 +89,4 @@ - \ No newline at end of file + diff --git a/connector/pulsarmq-connector/pom.xml b/connector/pulsarmq-connector/pom.xml index a2e68a17..180b8feb 100644 --- a/connector/pulsarmq-connector/pom.xml +++ b/connector/pulsarmq-connector/pom.xml @@ -35,10 +35,12 @@ org.apache.pulsar pulsar-client + ${pulsar_version} org.apache.pulsar pulsar-client-admin + ${pulsar_version} diff --git a/connector/rabbitmq-connector/pom.xml b/connector/rabbitmq-connector/pom.xml index e2a1e011..6c7beeda 100644 --- a/connector/rabbitmq-connector/pom.xml +++ b/connector/rabbitmq-connector/pom.xml @@ -29,12 +29,12 @@ com.rabbitmq amqp-client - 5.5.0 + ${rabbitmq_version} com.alibaba.mq-amqp mq-amqp-client - 1.0.3 + ${mq_amqp_client} junit @@ -94,4 +94,4 @@ - \ No newline at end of file + diff --git a/connector/rocketmq-connector/pom.xml b/connector/rocketmq-connector/pom.xml index 5cbd57a0..f2b45334 100644 --- a/connector/rocketmq-connector/pom.xml +++ b/connector/rocketmq-connector/pom.xml @@ -13,10 +13,6 @@ jar canal connector rocketMQ module for otter ${project.version} - - 4.8.0 - - com.alibaba.otter @@ -99,4 +95,4 @@ - \ No newline at end of file + diff --git a/driver/pom.xml b/driver/pom.xml index 9ca31dff..508ba26b 100644 --- a/driver/pom.xml +++ b/driver/pom.xml @@ -33,6 +33,10 @@ org.slf4j slf4j-api + + org.jboss.netty + netty + junit diff --git a/example/pom.xml b/example/pom.xml index 1a79e760..aca63ed9 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -21,82 +21,6 @@ canal.protocol ${project.version} - - com.alibaba - druid - - - mysql - mysql-connector-java - - - org.apache.ddlutils - ddlutils - 1.0 - - - commons-beanutils - commons-beanutils-core - - - commons-lang - commons-lang - - - commons-dbcp - commons-dbcp - - - commons-pool - commons-pool - - - commons-logging - commons-logging-api - - - dom4j - dom4j - - - stax - stax-api - - - commons-collections - commons-collections - - - commons-digester - commons-digester - - - commons-betwixt - commons-betwixt - - - - - org.apache.commons - commons-pool2 - 2.5.0 - - - commons-beanutils - commons-beanutils - 1.8.2 - - - org.apache.commons - commons-lang3 - 3.7 - - - commons-collections - commons-collections - 3.2 - - junit diff --git a/pom.xml b/pom.xml index da31bd11..7438fb10 100644 --- a/pom.xml +++ b/pom.xml @@ -99,8 +99,14 @@ 1.8 UTF-8 true - 5.0.5.RELEASE + 5.3.9 2.17.0 + 4.8.0 + 5.5.0 + 1.0.3 + 1.1.1 + 2.8.1 + 5.1.48 0.8.3 2.22.1 -server -Xms512m -Xmx1024m -Dfile.encoding=UTF-8 @@ -135,29 +141,59 @@ - org.springframework - spring-core - ${spring_version} + org.springframework + spring-core + ${spring_version} - org.springframework - spring-aop - ${spring_version} + org.springframework + spring-aop + ${spring_version} - org.springframework - spring-context - ${spring_version} + org.springframework + spring-context + ${spring_version} - org.springframework - spring-jdbc - ${spring_version} + org.springframework + spring-jdbc + ${spring_version} - org.springframework - spring-orm - ${spring_version} + org.springframework + spring-orm + ${spring_version} + + + org.springframework + spring-tx + ${spring_version} + + + org.springframework + spring-web + ${spring_version} + + + org.springframework + spring-webmvc + ${spring_version} + + + org.springframework + spring-jcl + ${spring_version} + + + org.springframework + spring-expression + ${spring_version} + + + org.springframework + spring-beans + ${spring_version} org.springframework @@ -171,6 +207,11 @@ commons-lang 2.6 + + org.apache.commons + commons-lang3 + 3.7 + commons-io commons-io @@ -181,6 +222,11 @@ commons-codec 1.9 + + commons-beanutils + commons-beanutils + 1.9.4 + org.apache.commons commons-compress @@ -199,7 +245,7 @@ org.apache.zookeeper zookeeper - 3.4.5 + 3.5.6 log4j @@ -217,6 +263,14 @@ jline jline + + io.netty + netty-handler + + + io.netty + netty-transport-native-epoll + @@ -249,6 +303,11 @@ netty-all 4.1.6.Final + + org.jboss.netty + netty + 3.2.10.Final + com.google.protobuf protobuf-java @@ -262,7 +321,7 @@ org.mybatis mybatis - 3.5.4 + 3.5.6 com.alibaba @@ -278,12 +337,12 @@ ch.qos.logback logback-core - 1.1.3 + 1.2.8 ch.qos.logback logback-classic - 1.1.3 + 1.2.8 org.slf4j @@ -300,6 +359,37 @@ h2 1.4.196 + + mysql + mysql-connector-java + ${mysql_driver_version} + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + javax.annotation + javax.annotation-api + ${javax.annotation-api.version} + + + org.apache.logging.log4j + log4j-core + ${log4j_version} + + + org.apache.logging.log4j + log4j-api + ${log4j_version} + + + org.apache.logging.log4j + log4j-to-slf4j + ${log4j_version} + + junit @@ -331,49 +421,6 @@ 1.9.0 test - - mysql - mysql-connector-java - 5.1.48 - - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - javax.annotation - javax.annotation-api - ${javax.annotation-api.version} - - - - org.apache.pulsar - pulsar-client - 2.8.1 - - - org.apache.pulsar - pulsar-client-admin - 2.8.1 - - - - org.apache.logging.log4j - log4j-core - ${log4j_version} - - - org.apache.logging.log4j - log4j-api - ${log4j_version} - - - org.apache.logging.log4j - log4j-to-slf4j - ${log4j_version} - diff --git a/server/pom.xml b/server/pom.xml index cdfe0de5..ed32183d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -33,7 +33,6 @@ org.apache.commons commons-lang3 - 3.7