From 77f516cc4bc8bcb438825d687385a2d3e751e142 Mon Sep 17 00:00:00 2001
From: mystarry-sky <zilan1986@163.com>
Date: Sat, 19 Nov 2022 17:16:20 +0800
Subject: [PATCH] =?UTF-8?q?CVE-2022-41854=20=E6=BC=8F=E6=B4=9E=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3rd_src/pom.xml                                             | 6 ------
 Third_Party_Open_Source_Software_List.yaml                  | 5 -----
 code/datastudio/src/copyExternalsToBuild.bat                | 1 -
 code/datastudio/src/copyExternalsToBuild.sh                 | 1 -
 .../META-INF/MANIFEST.MF                                    | 1 -
 .../build.properties                                        | 1 -
 6 files changed, 15 deletions(-)

diff --git a/3rd_src/pom.xml b/3rd_src/pom.xml
index 7ee27804..d1b1f344 100644
--- a/3rd_src/pom.xml
+++ b/3rd_src/pom.xml
@@ -327,12 +327,6 @@
             <version>1.10.19</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.30</version>
-        </dependency>
-
         <dependency>
             <groupId>org.eclipse.core</groupId>
             <artifactId>org.eclipse.core.contenttype</artifactId>
diff --git a/Third_Party_Open_Source_Software_List.yaml b/Third_Party_Open_Source_Software_List.yaml
index 419348db..02378705 100644
--- a/Third_Party_Open_Source_Software_List.yaml
+++ b/Third_Party_Open_Source_Software_List.yaml
@@ -238,11 +238,6 @@ mockito-all:
   groupId: org.mockito
   url: null
   version: 1.10.19
-snakeyaml: 
-  cpeName: snakeyaml
-  groupId: org.yaml
-  url: null
-  version: 1.30
 org.eclipse.core.contenttype: 
   cpeName: org.eclipse.core.contenttype
   groupId: org.eclipse.core
diff --git a/code/datastudio/src/copyExternalsToBuild.bat b/code/datastudio/src/copyExternalsToBuild.bat
index 0be7b37b..5bc20683 100644
--- a/code/datastudio/src/copyExternalsToBuild.bat
+++ b/code/datastudio/src/copyExternalsToBuild.bat
@@ -119,7 +119,6 @@ xcopy %SOURCE%\3rd_src\target\dependency\javassist-3.20.0-GA.jar %TEST%\org.open
 xcopy %SOURCE%\3rd_src\target\dependency\jcommander-1.27.jar %TEST%\org.opengauss.mppdbide.bl.test.fragment\lib\.
 xcopy %SOURCE%\3rd_src\target\dependency\mockito-all-1.10.19.jar %TEST%\org.opengauss.mppdbide.bl.test.fragment\lib\.
 xcopy %SOURCE%\3rd_src\target\dependency\objenesis-3.2.jar %TEST%\org.opengauss.mppdbide.bl.test.fragment\lib\.
-xcopy %SOURCE%\3rd_src\target\dependency\snakeyaml-1.30.jar %TEST%\org.opengauss.mppdbide.bl.test.fragment\lib\.
 xcopy %SOURCE%\platform\Gauss200\gs_jdbc\gsjdbc4.jar %TEST%\org.opengauss.mppdbide.bl.test.fragment\lib\.
 xcopy %SOURCE%\platform\Gauss200\gs_jdbc\mockrunner-jdbc.jar %TEST%\org.opengauss.mppdbide.bl.test.fragment\lib\.
 
diff --git a/code/datastudio/src/copyExternalsToBuild.sh b/code/datastudio/src/copyExternalsToBuild.sh
index b23aead6..1fa6c1a3 100644
--- a/code/datastudio/src/copyExternalsToBuild.sh
+++ b/code/datastudio/src/copyExternalsToBuild.sh
@@ -120,7 +120,6 @@ cp $SOURCE/3rd_src/target/dependency/javassist-3.20.0-GA.jar $TEST/org.opengauss
 cp $SOURCE/3rd_src/target/dependency/jcommander-1.27.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/.
 cp $SOURCE/3rd_src/target/dependency/mockito-all-1.10.19.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/.
 cp $SOURCE/3rd_src/target/dependency/objenesis-3.2.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/.
-cp $SOURCE/3rd_src/target/dependency/snakeyaml-1.30.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/.
 cp $SOURCE/platform/Gauss200/gs_jdbc/gsjdbc4.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/.
 cp $SOURCE/platform/Gauss200/gs_jdbc/mockrunner-jdbc.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/.
 
diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/META-INF/MANIFEST.MF b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/META-INF/MANIFEST.MF
index 93ec577f..f01a2529 100644
--- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/META-INF/MANIFEST.MF
+++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/META-INF/MANIFEST.MF
@@ -39,7 +39,6 @@ Bundle-ClassPath: lib/mockrunner-jdbc.jar,
  lib/jcommander-1.27.jar,
  lib/mockito-all-1.10.19.jar,
  lib/objenesis-3.2.jar,
- lib/snakeyaml-1.30.jar,
  lib/gsjdbc4.jar
 Eclipse-ExtensibleAPI: true 
 Require-Bundle: org.opengauss.dbdriver.jdbc.gauss;bundle-version="1.0.0",
diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/build.properties b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/build.properties
index 5b5ca495..9a494f59 100644
--- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/build.properties
+++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/build.properties
@@ -33,6 +33,5 @@ bin.includes = META-INF/,\
                lib/jcommander-1.27.jar,\
                lib/mockito-all-1.10.19.jar,\
                lib/objenesis-3.2.jar,\
-               lib/snakeyaml-1.30.jar,\
                lib/gsjdbc4.jar,\
                lib/mockrunner-jdbc.jar
-- 
Gitee