Merge pull request #2887 from liuliaozhong/3.7.x_issue_2865

feat: 修复第三方组件安全漏洞 #2865
TencentBlueKing · Apr 10, 2024 · 40179ea · 40179ea
2 parents 6f573c2 + 525d433
commit 40179ea
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/src/backend/build.gradle b/src/backend/build.gradle
@@ -75,7 +75,7 @@ ext {
     // https://mvnrepository.com/artifact/org.projectlombok/lombok
     set('lombokVersion', "1.18.10")
     // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
-    set('jacksonVersion', "2.13.4")
+    set('jacksonVersion', "2.13.5")
     set('jaxrsVersion', "2.0")
     // https://mvnrepository.com/artifact/ch.qos.logback/logback-core
     set('logbackVersion', "1.2.10")
@@ -100,7 +100,7 @@ ext {
     set('h2Version', "1.4.199")
     set('gradleJooqVersion', "2.0.11")
     // https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient
-    set('apacheHttpClientVersion', "4.5.10")
+    set('apacheHttpClientVersion', "4.5.13")
     set('apacheThriftVersion', "0.15.0")
     set('commonsIOVersion', "2.6")
     set('javaxServletVersion', "4.0.1")
@@ -110,7 +110,7 @@ ext {
     set('micrometerPrometheusVersion', "1.5.1")
     set('flapdoodleEmbeddedMongdbDBVersion', "4.4.0")
     set('jodaTimeVersion', "2.10.5")
-    set('bcprovVersion', "1.64")
+    set('bcprovVersion', "1.70")
     set('reflectionsVersion', "0.9.12")
     set('cronUtilsVersion', "9.1.6")
     set('otelJdbcVersion', "1.24.0-alpha")

diff --git a/src/backend/commons/gse-sdk/build.gradle b/src/backend/commons/gse-sdk/build.gradle
@@ -25,7 +25,7 @@
 dependencies {
     api project(':commons:common')
     api project(':commons:esb-sdk')
-    api files('libs/ee-gse-task-3.1.jar')
+    api files('libs/ee-gse-task-3.2.jar')
     implementation 'com.fasterxml.jackson.core:jackson-core'
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'com.fasterxml.jackson.core:jackson-annotations'

diff --git a/.../commons/gse-sdk/libs/ee-gse-task-3.1.jar → .../commons/gse-sdk/libs/ee-gse-task-3.2.jar b/.../commons/gse-sdk/libs/ee-gse-task-3.1.jar → .../commons/gse-sdk/libs/ee-gse-task-3.2.jar
diff --git a/src/backend/job-file-worker/service-job-file-worker/build.gradle b/src/backend/job-file-worker/service-job-file-worker/build.gradle
@@ -23,7 +23,7 @@
  */
 
 dependencies {
-    api(files("libs/innercos-java-sdk-5.6.9.jar"))
+    api(files("libs/innercos-java-sdk-5.6.10.jar"))
     api project(":commons:artifactory-sdk")
     api project(":job-file-worker:api-job-file-worker")
     api project(":job-file-worker-sdk:api-job-file-worker-sdk")

diff --git a/...e-worker/libs/innercos-java-sdk-5.6.9.jar → ...-worker/libs/innercos-java-sdk-5.6.10.jar b/...e-worker/libs/innercos-java-sdk-5.6.9.jar → ...-worker/libs/innercos-java-sdk-5.6.10.jar
diff --git a/support-files/dependJarInfo/md5List.txt b/support-files/dependJarInfo/md5List.txt
@@ -3,7 +3,7 @@ a77a4f0e9645fb5e17fb17f8b1c7cc1b
 5725bdda5da45c1a62c385dcb77c7fed
 a4d97c5a2f94b8b5d132761a769e5eeb
 c6f7fe841c62cbbeeede7510fe8d72ee
-1d172df000184d005b49bc6d30892a05
+1809d0449a6374279c01fdd3be26cd92
 1fbcaeee655ec252afc9233d04c8ebe1
 a96b369566dce549d0f4ccfc68df1ea3
 53802337d51998f11f9614b6a104710d
@@ -53,17 +53,17 @@ b53954fc8475542d5740dc0315556ea7
 bb1517da5023eadbd4a78ca836723525
 b1f2b595c174b2e399416a9f26f6dbad
 f2aa34cc77e2f7839735ec79592e1b00
-367221dde0ef94ea3507928ef40cbe75
+40d6b9075fbd28fa10292a45a0db9457
 e07a248f61c52776a2366c075dcd4963
 d1bf2df33d7ae4dcfc12a6b1956d3e4c
 5fa4ec4ec0c5aa70af8a7d4922df1931
-fb3fd29c5c990b78c8d1b40b9e8839de
-1cf7bf96372fd34cb4a450f19d8e706b
-14fd0effa4d1d3e09edb36423be82aff
-8ce4743e07d8553fb8b57558973de9f7
-a43cefe1a03a5a6f1967b5832873b123
-10fc883f659e2407ea2639fe6dd5b112
-eed352dcdf5b22864084e25ed0671e84
+0b1245f3245cbfa53e61d9d366006041
+2272453c780d1383ecd2efde00c1a7a9
+1dbb98839964a6967a428d868b2d8714
+fef4733925c9b64b00996ed874be2075
+3803e35b61c5812310fd093c398b43b6
+712138e14895b15181e0b9af3292e222
+5c28a6ef0d19bcc62976eea35714047e
 1cbb480310fa1987f9db7a3ed7118af7
 8b165cf58df5f8c2a222f637c0a07c97
 6bb54dbf912bf1b6c79592838db76b51

diff --git a/support-files/dependJarInfo/versionList.txt b/support-files/dependJarInfo/versionList.txt
@@ -3,7 +3,7 @@
 1.9.7
 1.9.7
 1.69
-1.64
+1.70
 5.10.1
 5.10.1
 5.10.1
@@ -53,17 +53,17 @@
 3.4.5
 2.4.13
 2.1.0.RELEASE
-4.5.10
+4.5.13
 4.4.13
 1.5.18
 1.3
-2.11.2
-2.11.2
-2.11.2
-2.11.2
-2.11.2
-2.11.2
-2.11.2
+2.13.5
+2.13.5
+2.13.5
+2.13.5
+2.13.5
+2.13.5
+2.13.5
 1.2.2
 1.3.5
 3.0.3
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
 .9.7
 .9.7
 .69
-.64
+.70
 .10.1
 .10.1
 .10.1
@@ Expand Down Expand Up / @@ -53,17 +53,17 @@ @@
 .4.5
 .4.13
 .1.0.RELEASE
-.5.10
+.5.13
 .4.13
 .5.18
 .3
-.11.2
-.11.2
-.11.2
-.11.2
-.11.2
-.11.2
-.11.2
+.13.5
+.13.5
+.13.5
+.13.5
+.13.5
+.13.5
+.13.5
 .2.2
 .3.5
 .0.3
@@ Expand Down @@