diff --git a/3rd_src/pom.xml b/3rd_src/pom.xml index 7ee27804fc830bc455064cd0be0537aaf2a12d8c..d1b1f344cd29b10d35598d7909d544012c4f6509 100644 --- a/3rd_src/pom.xml +++ b/3rd_src/pom.xml @@ -327,12 +327,6 @@ 1.10.19 - - org.yaml - snakeyaml - 1.30 - - org.eclipse.core org.eclipse.core.contenttype diff --git a/Third_Party_Open_Source_Software_List.yaml b/Third_Party_Open_Source_Software_List.yaml index 419348db31335204931c862126654e353e52bc24..023787056a0fbb3cd6cba6d9b029111cadfc28a0 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 0be7b37bc0210bfce3878973b8780e42a8115a97..5bc2068393f5e2ac7d4ab0644476a8168a36e609 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 b23aead61171ef0fa8c72f1584b0fbeea026bd72..1fa6c1a37d0086b279a4fdcd813a37db8b9cf157 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 93ec577fc6294ca2fa995a3a1c0cb0d2c4998603..f01a252965412070b9339b5f2c8260fab7d59836 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 5b5ca495c3a46405e76c4ed513e7d614f4c988f0..9a494f598514b489fb59c4a852d5f8edcf9e09c4 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