Browse Source

安全:
1.调整xstream的引用方式
2.升级log4j-api到2.15.0

lijie 3 years ago
parent
commit
fb9d0fbcb6

+ 0 - 12
dmp-business/dmp-dic/pom.xml

@@ -16,18 +16,6 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>integrated-config-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>xstream</artifactId>
-                    <groupId>com.thoughtworks.xstream</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 阿里云扫描漏洞要求版本需>=1.4.18 -->
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
         </dependency>
         <!-- 项目启动 -->
         <dependency>

+ 0 - 12
dmp-business/dmp-rwd-plus/pom.xml

@@ -16,18 +16,6 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>integrated-config-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>xstream</artifactId>
-                    <groupId>com.thoughtworks.xstream</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 阿里云扫描漏洞要求版本需>=1.4.18 -->
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
         </dependency>
         <!-- 项目启动 -->
         <dependency>

+ 0 - 12
dmp-business/dmp-rwd-version/pom.xml

@@ -16,18 +16,6 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>integrated-config-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>xstream</artifactId>
-                    <groupId>com.thoughtworks.xstream</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 阿里云扫描漏洞要求版本需>=1.4.18 -->
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
         </dependency>
         <!-- 项目启动 -->
         <dependency>

+ 2 - 8
dmp-business/dmp-rwd/pom.xml

@@ -34,18 +34,12 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>integrated-config-client</artifactId>
-            <exclusions>
+<!--            <exclusions>
                 <exclusion>
                     <artifactId>xstream</artifactId>
                     <groupId>com.thoughtworks.xstream</groupId>
                 </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 阿里云扫描漏洞要求版本需>=1.4.18 -->
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
+            </exclusions>-->
         </dependency>
         <!-- 项目启动 -->
         <dependency>

+ 0 - 12
dmp-cloud/dmp-file/pom.xml

@@ -16,18 +16,6 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>integrated-config-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>xstream</artifactId>
-                    <groupId>com.thoughtworks.xstream</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 阿里云扫描漏洞要求版本需>=1.4.18 -->
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
         </dependency>
         <!-- 项目启动 -->
         <dependency>

+ 0 - 12
dmp-cloud/dmp-message/pom.xml

@@ -16,18 +16,6 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>integrated-config-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>xstream</artifactId>
-                    <groupId>com.thoughtworks.xstream</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 阿里云扫描漏洞要求版本需>=1.4.18 -->
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
         </dependency>
         <!-- 项目启动 -->
         <dependency>

+ 13 - 0
dmp-parent/pom.xml

@@ -60,6 +60,8 @@
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
+        <xstream.version>1.4.18</xstream.version>
+        <log4j-api.version>2.15.0</log4j-api.version>
     </properties>
 
     <dependencyManagement>
@@ -115,6 +117,11 @@
                 <version>${platform.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>${log4j-api.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.persagy</groupId>
                 <artifactId>integrated-ribbon-spring-boot-starter</artifactId>
                 <version>${platform.version}</version>
@@ -333,6 +340,12 @@
                 <artifactId>kotlin-stdlib-common</artifactId>
                 <version>${kotlin.version}</version>
             </dependency>
+            <!-- 阿里云扫描漏洞要求版本需>=1.4.18 -->
+            <dependency>
+                <groupId>com.thoughtworks.xstream</groupId>
+                <artifactId>xstream</artifactId>
+                <version>${xstream.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>