Skip to content

Commit 9de85d9

Browse files
committed
处理版本冲突的依赖包
1 parent 281ef43 commit 9de85d9

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

pom.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,22 @@
6565
<jaxb.version>2.3.0</jaxb.version>
6666
<jsr305.version>3.0.2</jsr305.version>
6767
<jrs.version>2.1.1</jrs.version>
68+
<j2objc.version>3.0.0</j2objc.version>
6869
<knife4j.version>4.0.0</knife4j.version>
6970
<kryo.version>5.6.0</kryo.version>
7071
<lombok.version>1.18.24</lombok.version>
7172
<mybatis.version>3.5.16</mybatis.version>
7273
<mybatis-spring.version>3.0.3</mybatis-spring.version>
7374
<mybatis-plus.version>3.5.7</mybatis-plus.version>
75+
<okio.version>3.6.0</okio.version>
7476
<perf4j.version>0.9.16</perf4j.version>
7577
<poi.version>5.3.0</poi.version>
7678
<protobuf.version>3.20.3</protobuf.version>
7779
<redisson.version>3.34.1</redisson.version>
7880
<resteasy.version>3.15.3.Final</resteasy.version>
7981
<rocketmq.version>5.1.0</rocketmq.version>
8082
<rocketmq-spring.version>2.3.0</rocketmq-spring.version>
83+
<rxjava.version>1.2.2</rxjava.version>
8184
<sentinel.version>1.8.4</sentinel.version>
8285
<sharding-jdbc.version>5.5.0</sharding-jdbc.version>
8386
<spring-boot.version>3.3.3</spring-boot.version>
@@ -619,6 +622,24 @@
619622
<artifactId>javax.ws.rs-api</artifactId>
620623
<version>${jrs.version}</version>
621624
</dependency>
625+
626+
<dependency>
627+
<groupId>com.google.j2objc</groupId>
628+
<artifactId>j2objc-annotations</artifactId>
629+
<version>${j2objc.version}</version>
630+
</dependency>
631+
632+
<dependency>
633+
<groupId>com.squareup.okio</groupId>
634+
<artifactId>okio-jvm</artifactId>
635+
<version>${okio.version}</version>
636+
</dependency>
637+
638+
<dependency>
639+
<groupId>io.reactivex</groupId>
640+
<artifactId>rxjava</artifactId>
641+
<version>${rxjava.version}</version>
642+
</dependency>
622643
</dependencies>
623644
</dependencyManagement>
624645

0 commit comments

Comments
 (0)