周伟鹏 / cnlive_shenhe · Commits

Commit 5ab17a5c2ae05d1a6374f6d6211d0cf906ddacee

Authored by 王言钊
1 parent 31af4e61

解决依赖冲突问题

Inline Side-by-side
Showing 1 changed file with 10 additions and 0 deletions
@@ -50,6 +50,10 @@ @@ -50,6 +50,10 @@
50 <groupId>org.springframework.boot</groupId> 50 <groupId>org.springframework.boot</groupId>
51 <artifactId>spring-boot-starter-logging</artifactId> 51 <artifactId>spring-boot-starter-logging</artifactId>
52 </exclusion> 52 </exclusion>
  53 + <exclusion>
  54 + <artifactId>tomcat-embed-websocket</artifactId>
  55 + <groupId>org.apache.tomcat.embed</groupId>
  56 + </exclusion>
53 </exclusions> 57 </exclusions>
54 </dependency> 58 </dependency>
55 59
@@ -158,6 +162,12 @@ @@ -158,6 +162,12 @@
158 <groupId>org.apache.httpcomponents</groupId> 162 <groupId>org.apache.httpcomponents</groupId>
159 <artifactId>httpmime</artifactId> 163 <artifactId>httpmime</artifactId>
160 <version>4.5.3</version> 164 <version>4.5.3</version>
  165 + <exclusions>
  166 + <exclusion>
  167 + <artifactId>httpclient</artifactId>
  168 + <groupId>org.apache.httpcomponents</groupId>
  169 + </exclusion>
  170 + </exclusions>
161 </dependency> 171 </dependency>
162 172
163 <dependency> 173 <dependency>