周伟鹏 / cnlive_shenhe · Commits

Commit e89633d96f5a0021038b1e2106de3f0d127b770e

Authored by 徐近程
2 parents 3ca349cf 705cae80

Merge branch 'dev'

Inline Side-by-side
Showing 1 changed file with 24 additions and 12 deletions
@@ -100,8 +100,30 @@ @@ -100,8 +100,30 @@
100 100
101 <dependency> 101 <dependency>
102 <groupId>org.apache.tomcat.embed</groupId> 102 <groupId>org.apache.tomcat.embed</groupId>
103 - <artifactId>tomcat-embed-jasper</artifactId>  
104 - <scope>provided</scope> 103 + <artifactId>tomcat-embed-core</artifactId>
  104 + <version>8.5.63</version>
  105 + <scope>compile</scope>
  106 + </dependency>
  107 +
  108 + <dependency>
  109 + <groupId>org.apache.tomcat.embed</groupId>
  110 + <artifactId>tomcat-embed-el</artifactId>
  111 + <version>8.5.63</version>
  112 + <scope>compile</scope>
  113 + </dependency>
  114 +
  115 + <dependency>
  116 + <groupId>org.apache.tomcat</groupId>
  117 + <artifactId>tomcat-annotations-api</artifactId>
  118 + <version>8.5.63</version>
  119 + <scope>compile</scope>
  120 + </dependency>
  121 +
  122 + <dependency>
  123 + <groupId>org.apache.tomcat.embed</groupId>
  124 + <artifactId>tomcat-embed-websocket</artifactId>
  125 + <version>8.5.63</version>
  126 + <scope>compile</scope>
105 </dependency> 127 </dependency>
106 128
107 <dependency> 129 <dependency>
@@ -163,16 +185,6 @@ @@ -163,16 +185,6 @@
163 </dependency> 185 </dependency>
164 </dependencies> 186 </dependencies>
165 187
166 - <dependencyManagement>  
167 - <dependencies>  
168 - <dependency>  
169 - <groupId>org.apache.tomcat</groupId>  
170 - <artifactId>tomcat-juli</artifactId>  
171 - <version>8.5.63</version>  
172 - </dependency>  
173 - </dependencies>  
174 - </dependencyManagement>  
175 -  
176 <build> 188 <build>
177 <plugins> 189 <plugins>
178 <plugin> 190 <plugin>