Browse Source

tomcat version update to 9.0.65

lijie 2 years ago
parent
commit
7b76c623de

+ 13 - 3
labsl/build.gradle

@@ -30,14 +30,24 @@ dependencies {
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // spring boot 依赖
-    compile(group: "org.springframework.boot", name: "spring-boot-starter-web", version: SPRING_BOOT_VERSION){exclude group: 'org.apache.logging.log4j',module:'log4j-api'}
+    compile(group: "org.springframework.boot", name: "spring-boot-starter-web", version: SPRING_BOOT_VERSION){
+        exclude group: 'org.apache.logging.log4j',module:'log4j-api'
+        exclude group: 'org.springframework.boot',module:'spring-boot-starter-tomcat'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-core'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-el'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-websocket'
+    }
+    compile group: "org.springframework.boot", name: "spring-boot-starter-tomcat", version: '2.6.10'
+    compile(group: "org.apache.tomcat.embed", name: "tomcat-embed-core", version: '9.0.65'){exclude group:'org.apache.tomcat',module:'tomcat-annotations-api'}
+    compile group: "org.apache.tomcat.embed", name: "tomcat-embed-el", version: '9.0.65'
+    compile(group: "org.apache.tomcat.embed", name: "tomcat-embed-websocket", version: '9.0.65'){exclude group:'org.apache.tomcat',module:'tomcat-annotations-api'}
     compile group: "org.apache.logging.log4j", name: "log4j-api", version: LOG4J_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-configuration-processor", version: SPRING_BOOT_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-starter-actuator", version: SPRING_BOOT_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-starter-logging", version: SPRING_BOOT_VERSION
     //消息
 //    compile group: "org.springframework.boot", name: "spring-boot-starter-activemq", version: SPRING_BOOT_VERSION
-    compile group: "org.springframework.boot", name:"spring-boot-starter-tomcat", version: SPRING_BOOT_VERSION
+    //compile group: "org.springframework.boot", name:"spring-boot-starter-tomcat", version: SPRING_BOOT_VERSION
     // spring boot 缓存
     compile group:"org.springframework.boot", name:"spring-boot-starter-cache", version: SPRING_BOOT_VERSION
     // 单元测试
@@ -49,7 +59,7 @@ dependencies {
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // spring cloud 依赖
-    compile(group: 'org.springframework.cloud', name: 'spring-cloud-starter-netflix-eureka-client', version:  SPRING_CLOUD_CONFIG_VERSION){exclude group: 'com.thoughtworks.xstream',module:'xstream'}
+    compile(group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version:  SPRING_CLOUD_CONFIG_VERSION){exclude group: 'com.thoughtworks.xstream',module:'xstream'}
     compile(group: 'com.thoughtworks.xstream', name: 'xstream', version:  XSTREAM_VERSION)
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

+ 11 - 1
meiku/build.gradle

@@ -44,7 +44,17 @@ dependencies {
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // spring boot 依赖
-    compile(group: "org.springframework.boot", name: "spring-boot-starter-web", version: SPRING_BOOT_VERSION){exclude group: 'org.apache.logging.log4j',module:'log4j-api'}
+    compile(group: "org.springframework.boot", name: "spring-boot-starter-web", version: SPRING_BOOT_VERSION){
+        exclude group: 'org.apache.logging.log4j',module:'log4j-api'
+        exclude group: 'org.springframework.boot',module:'spring-boot-starter-tomcat'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-core'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-el'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-websocket'
+    }
+    compile group: "org.springframework.boot", name: "spring-boot-starter-tomcat", version: '2.6.10'
+    compile(group: "org.apache.tomcat.embed", name: "tomcat-embed-core", version: '9.0.65'){exclude group:'org.apache.tomcat',module:'tomcat-annotations-api'}
+    compile group: "org.apache.tomcat.embed", name: "tomcat-embed-el", version: '9.0.65'
+    compile(group: "org.apache.tomcat.embed", name: "tomcat-embed-websocket", version: '9.0.65'){exclude group:'org.apache.tomcat',module:'tomcat-annotations-api'}
     compile group: "org.apache.logging.log4j", name: "log4j-api", version: LOG4J_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-configuration-processor", version: SPRING_BOOT_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-starter-actuator", version: SPRING_BOOT_VERSION

+ 11 - 1
message-center/build.gradle

@@ -52,7 +52,17 @@ dependencies {
     // 页面
     compile group: "org.springframework.boot", name: "spring-boot-starter-freemarker", version: SPRING_BOOT_VERSION
     // spring boot 依赖
-    compile(group: "org.springframework.boot", name: "spring-boot-starter-web", version: SPRING_BOOT_VERSION){exclude group: 'org.apache.logging.log4j',module:'log4j-api'}
+    compile(group: "org.springframework.boot", name: "spring-boot-starter-web", version: SPRING_BOOT_VERSION){
+        exclude group: 'org.apache.logging.log4j',module:'log4j-api'
+        exclude group: 'org.springframework.boot',module:'spring-boot-starter-tomcat'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-core'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-el'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-websocket'
+    }
+    compile group: "org.springframework.boot", name: "spring-boot-starter-tomcat", version: '2.6.10'
+    compile(group: "org.apache.tomcat.embed", name: "tomcat-embed-core", version: '9.0.65'){exclude group:'org.apache.tomcat',module:'tomcat-annotations-api'}
+    compile group: "org.apache.tomcat.embed", name: "tomcat-embed-el", version: '9.0.65'
+    compile(group: "org.apache.tomcat.embed", name: "tomcat-embed-websocket", version: '9.0.65'){exclude group:'org.apache.tomcat',module:'tomcat-annotations-api'}
     compile group: "org.apache.logging.log4j", name: "log4j-api", version: LOG4J_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-configuration-processor", version: SPRING_BOOT_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-starter-actuator", version: SPRING_BOOT_VERSION

+ 11 - 1
revit-algorithm/build.gradle

@@ -53,7 +53,17 @@ dependencies {
     // 页面
     compile group: "org.springframework.boot", name: "spring-boot-starter-freemarker", version: SPRING_BOOT_VERSION
     // spring boot 依赖
-    compile(group: "org.springframework.boot", name: "spring-boot-starter-web", version: SPRING_BOOT_VERSION){exclude group: 'org.apache.logging.log4j',module:'log4j-api'}
+    compile(group: "org.springframework.boot", name: "spring-boot-starter-web", version: SPRING_BOOT_VERSION){
+        exclude group: 'org.apache.logging.log4j',module:'log4j-api'
+        exclude group: 'org.springframework.boot',module:'spring-boot-starter-tomcat'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-core'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-el'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-websocket'
+    }
+    compile group: "org.springframework.boot", name: "spring-boot-starter-tomcat", version: '2.6.10'
+    compile(group: "org.apache.tomcat.embed", name: "tomcat-embed-core", version: '9.0.65'){exclude group:'org.apache.tomcat',module:'tomcat-annotations-api'}
+    compile group: "org.apache.tomcat.embed", name: "tomcat-embed-el", version: '9.0.65'
+    compile(group: "org.apache.tomcat.embed", name: "tomcat-embed-websocket", version: '9.0.65'){exclude group:'org.apache.tomcat',module:'tomcat-annotations-api'}
     compile group: "org.apache.logging.log4j", name: "log4j-api", version: LOG4J_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-configuration-processor", version: SPRING_BOOT_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-starter-actuator", version: SPRING_BOOT_VERSION

+ 11 - 1
scanbuilding/build.gradle

@@ -56,7 +56,17 @@ dependencies {
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // spring boot 依赖
-    compile(group: "org.springframework.boot", name: "spring-boot-starter-web", version: SPRING_BOOT_VERSION){exclude group: 'org.apache.logging.log4j',module:'log4j-api'}
+    compile(group: "org.springframework.boot", name: "spring-boot-starter-web", version: SPRING_BOOT_VERSION){
+        exclude group: 'org.apache.logging.log4j',module:'log4j-api'
+        exclude group: 'org.springframework.boot',module:'spring-boot-starter-tomcat'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-core'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-el'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-websocket'
+    }
+    compile group: "org.springframework.boot", name: "spring-boot-starter-tomcat", version: '2.6.10'
+    compile(group: "org.apache.tomcat.embed", name: "tomcat-embed-core", version: '9.0.65'){exclude group:'org.apache.tomcat',module:'tomcat-annotations-api'}
+    compile group: "org.apache.tomcat.embed", name: "tomcat-embed-el", version: '9.0.65'
+    compile(group: "org.apache.tomcat.embed", name: "tomcat-embed-websocket", version: '9.0.65'){exclude group:'org.apache.tomcat',module:'tomcat-annotations-api'}
     compile group: "org.apache.logging.log4j", name: "log4j-api", version: LOG4J_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-configuration-processor", version: SPRING_BOOT_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-starter-actuator", version: SPRING_BOOT_VERSION

+ 11 - 1
scheduler/build.gradle

@@ -53,7 +53,17 @@ dependencies {
     // 页面
     compile group: "org.springframework.boot", name: "spring-boot-starter-freemarker", version: SPRING_BOOT_VERSION
     // spring boot 依赖
-    compile(group: "org.springframework.boot", name: "spring-boot-starter-web", version: SPRING_BOOT_VERSION){exclude group: 'org.apache.logging.log4j',module:'log4j-api'}
+    compile(group: "org.springframework.boot", name: "spring-boot-starter-web", version: SPRING_BOOT_VERSION){
+        exclude group: 'org.apache.logging.log4j',module:'log4j-api'
+        exclude group: 'org.springframework.boot',module:'spring-boot-starter-tomcat'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-core'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-el'
+        exclude group: 'org.apache.tomcat.embed',module:'tomcat-embed-websocket'
+    }
+    compile group: "org.springframework.boot", name: "spring-boot-starter-tomcat", version: '2.6.10'
+    compile(group: "org.apache.tomcat.embed", name: "tomcat-embed-core", version: '9.0.65'){exclude group:'org.apache.tomcat',module:'tomcat-annotations-api'}
+    compile group: "org.apache.tomcat.embed", name: "tomcat-embed-el", version: '9.0.65'
+    compile(group: "org.apache.tomcat.embed", name: "tomcat-embed-websocket", version: '9.0.65'){exclude group:'org.apache.tomcat',module:'tomcat-annotations-api'}
     compile group: "org.apache.logging.log4j", name: "log4j-api", version: LOG4J_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-configuration-processor", version: SPRING_BOOT_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-starter-actuator", version: SPRING_BOOT_VERSION