合并3.3.0分支

This commit is contained in:
zengqiao
2023-02-24 17:13:50 +08:00
616 changed files with 32894 additions and 8421 deletions

45
pom.xml
View File

@@ -25,15 +25,18 @@
<swagger2.version>2.9.2</swagger2.version>
<swagger.version>1.5.21</swagger.version>
<kafka-clients.version>2.8.1</kafka-clients.version>
<!-- kafka -->
<kafka.version>2.8.1</kafka.version>
<kafka-clients.version>2.8.1</kafka-clients.version>
<kafka-connect-runtime.version>2.8.1</kafka-connect-runtime.version>
<elasticsearch.version>6.6.2</elasticsearch.version>
<mybatis-plus.version>3.4.2</mybatis-plus.version>
<caffeine.version>2.8.8</caffeine.version>
<springboot.version>2.3.7.RELEASE</springboot.version>
<spring.version>5.3.18</spring.version>
<spring.version>5.3.19</spring.version>
<tomcat.version>9.0.41</tomcat.version>
<fastjson.version>1.2.83</fastjson.version>
@@ -53,12 +56,13 @@
<module>km-biz</module>
<module>km-extends/km-account</module>
<module>km-extends/km-monitor</module>
<module>km-extends/km-license</module>
<module>km-extends/km-rebalance</module>
<module>km-extends/km-license</module>
<module>km-task</module>
<module>km-collector</module>
<module>km-rest</module>
<module>km-dist</module>
<module>km-enterprise/km-ha</module>
<module>km-enterprise/km-testing</module>
</modules>
@@ -140,11 +144,6 @@
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@@ -199,6 +198,7 @@
<scope>provided</scope>
</dependency>
<!-- kafka -->
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
@@ -209,6 +209,25 @@
<artifactId>kafka_2.13</artifactId>
<version>${kafka.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-runtime</artifactId>
<version>${kafka-connect-runtime.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-transforms</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -302,6 +321,16 @@
<version>1.5.4</version>
</dependency>
<!-- prometheus end -->
<!--testcontainers-->
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>1.17.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!--testcontainers end-->
</dependencies>
</dependencyManagement>
</project>