diff --git a/3rd_src/pom.xml b/3rd_src/pom.xml index d1b1f344cd29b10d35598d7909d544012c4f6509..e7ffc0036723fec2cd2d1d528b5c0ea552d1500d 100644 --- a/3rd_src/pom.xml +++ b/3rd_src/pom.xml @@ -128,7 +128,7 @@ junit junit - 4.11 + 4.13.2 diff --git a/Third_Party_Open_Source_Software_List.yaml b/Third_Party_Open_Source_Software_List.yaml index 023787056a0fbb3cd6cba6d9b029111cadfc28a0..5b8de497695ea9e4280bede7e574d917c1596b86 100644 --- a/Third_Party_Open_Source_Software_List.yaml +++ b/Third_Party_Open_Source_Software_List.yaml @@ -87,7 +87,7 @@ junit: cpeName: junit groupId: junit url: null - version: 4.11 + version: 4.13.2 log4j: cpeName: log4j groupId: log4j diff --git a/code/datastudio/src/copyExternalsToBuild.bat b/code/datastudio/src/copyExternalsToBuild.bat index 5bc2068393f5e2ac7d4ab0644476a8168a36e609..d72e0f9b600d8d6918dbe8852683b350e6c8040f 100644 --- a/code/datastudio/src/copyExternalsToBuild.bat +++ b/code/datastudio/src/copyExternalsToBuild.bat @@ -11,7 +11,7 @@ rmdir /Q /S %DEST%\db_assistant xcopy %SOURCE%\platform\Gauss200\gs_jdbc\gsjdbc4.jar %DEST%\org.opengauss.mppdbide.presentation\src-test\. xcopy %SOURCE%\3rd_src\target\dependency\hamcrest-api-1.0.jar %DEST%\org.opengauss.mppdbide.presentation\src-test\. -xcopy %SOURCE%\3rd_src\target\dependency\junit-4.11.jar %DEST%\org.opengauss.mppdbide.presentation\src-test\. +xcopy %SOURCE%\3rd_src\target\dependency\junit-4.13.2.jar %DEST%\org.opengauss.mppdbide.presentation\src-test\. xcopy %SOURCE%\3rd_src\target\dependency\log4j-1.2.15.jar %DEST%\org.opengauss.mppdbide.presentation\src-test\. xcopy %SOURCE%\3rd_src\target\dependency\commons-logging-1.0.4.jar %DEST%\org.opengauss.mppdbide.presentation\src-test\. xcopy %SOURCE%\3rd_src\target\dependency\oro-2.0.8.jar %DEST%\org.opengauss.mppdbide.presentation\src-test\. @@ -80,7 +80,7 @@ xcopy %SOURCE%\3rd_src\target\dependency\gson-2.8.6.jar %TEST%\org.opengauss.mp xcopy %SOURCE%\3rd_src\target\dependency\log4j-1.2.15.jar %TEST%\org.opengauss.mppdbide.bl.debug.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\mockrunner-jdbc-2.0.6.jar %TEST%\org.opengauss.mppdbide.bl.debug.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\mockrunner-core-2.0.6.jar %TEST%\org.opengauss.mppdbide.bl.debug.test.fragment\lib\. -xcopy %SOURCE%\3rd_src\target\dependency\junit-4.11.jar %TEST%\org.opengauss.mppdbide.bl.debug.test.fragment\lib\. +xcopy %SOURCE%\3rd_src\target\dependency\junit-4.13.2.jar %TEST%\org.opengauss.mppdbide.bl.debug.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\commons-io-2.11.0.jar %TEST%\org.opengauss.mppdbide.bl.debug.test.fragment\lib\. rmdir /Q /S %TEST%\org.opengauss.mppdbide.bl.test.fragment\lib @@ -94,7 +94,7 @@ xcopy %SOURCE%\3rd_src\target\dependency\hamcrest-api-1.0.jar %TEST%\org.openga xcopy %SOURCE%\3rd_src\target\dependency\easymock-4.3.jar %TEST%\org.opengauss.mppdbide.bl.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\gson-2.8.6.jar %TEST%\org.opengauss.mppdbide.bl.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\log4j-1.2.15.jar %TEST%\org.opengauss.mppdbide.bl.test.fragment\lib\. -xcopy %SOURCE%\3rd_src\target\dependency\junit-4.11.jar %TEST%\org.opengauss.mppdbide.bl.test.fragment\lib\. +xcopy %SOURCE%\3rd_src\target\dependency\junit-4.13.2.jar %TEST%\org.opengauss.mppdbide.bl.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\jsqlparser-3.2.jar %TEST%\org.opengauss.mppdbide.bl.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\org.eclipse.osgi-3.9.1.v20130814-1242.jar %TEST%\org.opengauss.mppdbide.bl.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\commons-io-2.11.0.jar %TEST%\org.opengauss.mppdbide.bl.test.fragment\lib\. @@ -133,7 +133,7 @@ xcopy %SOURCE%\3rd_src\target\dependency\gson-2.8.6.jar %TEST%\org.opengauss.mp xcopy %SOURCE%\platform\Gauss200\gs_jdbc\gsjdbc4.jar %TEST%\org.opengauss.mppdbide.bl.windows.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\hamcrest-api-1.0.jar %TEST%\org.opengauss.mppdbide.bl.windows.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\jsqlparser-3.2.jar %TEST%\org.opengauss.mppdbide.bl.windows.test.fragment\lib\. -xcopy %SOURCE%\3rd_src\target\dependency\junit-4.11.jar %TEST%\org.opengauss.mppdbide.bl.windows.test.fragment\lib\. +xcopy %SOURCE%\3rd_src\target\dependency\junit-4.13.2.jar %TEST%\org.opengauss.mppdbide.bl.windows.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\log4j-1.2.15.jar %TEST%\org.opengauss.mppdbide.bl.windows.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\commons-io-2.11.0.jar %TEST%\org.opengauss.mppdbide.bl.windows.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\objenesis-3.2.jar %TEST%\org.opengauss.mppdbide.bl.windows.test.fragment\lib\. @@ -159,7 +159,7 @@ xcopy %SOURCE%\3rd_src\target\dependency\antlr4-runtime-4.9.2.jar %TEST%\org.ope xcopy %SOURCE%\3rd_src\target\dependency\log4j-1.2.15.jar %TEST%\org.opengauss.mppdbide.editor.extension.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\commons-codec-1.15.jar %TEST%\org.opengauss.mppdbide.editor.extension.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\hamcrest-api-1.0.jar %TEST%\org.opengauss.mppdbide.editor.extension.test.fragment\lib\. -xcopy %SOURCE%\3rd_src\target\dependency\junit-4.11.jar %TEST%\org.opengauss.mppdbide.editor.extension.test.fragment\lib\. +xcopy %SOURCE%\3rd_src\target\dependency\junit-4.13.2.jar %TEST%\org.opengauss.mppdbide.editor.extension.test.fragment\lib\. rmdir /Q /S %TEST%\org.opengauss.mppdbide.explainplan.test.fragment\lib mkdir %TEST%\org.opengauss.mppdbide.explainplan.test.fragment\lib @@ -172,7 +172,7 @@ xcopy %SOURCE%\3rd_src\target\dependency\easymock-4.3.jar %TEST%\org.opengauss.m xcopy %SOURCE%\3rd_src\target\dependency\gson-2.8.6.jar %TEST%\org.opengauss.mppdbide.explainplan.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\log4j-1.2.15.jar %TEST%\org.opengauss.mppdbide.explainplan.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\commons-codec-1.15.jar %TEST%\org.opengauss.mppdbide.explainplan.test.fragment\lib\. -xcopy %SOURCE%\3rd_src\target\dependency\junit-4.11.jar %TEST%\org.opengauss.mppdbide.explainplan.test.fragment\lib\. +xcopy %SOURCE%\3rd_src\target\dependency\junit-4.13.2.jar %TEST%\org.opengauss.mppdbide.explainplan.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\mockrunner-jdbc-2.0.6.jar %TEST%\org.opengauss.mppdbide.explainplan.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\mockrunner-core-2.0.6.jar %TEST%\org.opengauss.mppdbide.explainplan.test.fragment\lib\. @@ -187,7 +187,7 @@ xcopy %SOURCE%\3rd_src\target\dependency\easymock-4.3.jar %TEST%\org.opengauss.m xcopy %SOURCE%\3rd_src\target\dependency\gson-2.8.6.jar %TEST%\org.opengauss.mppdbide.parser.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\log4j-1.2.15.jar %TEST%\org.opengauss.mppdbide.parser.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\commons-codec-1.15.jar %TEST%\org.opengauss.mppdbide.parser.test.fragment\lib\. -xcopy %SOURCE%\3rd_src\target\dependency\junit-4.11.jar %TEST%\org.opengauss.mppdbide.parser.test.fragment\lib\. +xcopy %SOURCE%\3rd_src\target\dependency\junit-4.13.2.jar %TEST%\org.opengauss.mppdbide.parser.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\antlr4-runtime-4.9.2.jar %TEST%\org.opengauss.mppdbide.parser.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\mockrunner-jdbc-2.0.6.jar %TEST%\org.opengauss.mppdbide.parser.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\mockrunner-core-2.0.6.jar %TEST%\org.opengauss.mppdbide.parser.test.fragment\lib\. @@ -212,7 +212,7 @@ xcopy %SOURCE%\3rd_src\target\dependency\poi-4.1.2.jar %TEST%\org.opengauss.mppd xcopy %SOURCE%\3rd_src\target\dependency\poi-ooxml-4.1.2.jar %TEST%\org.opengauss.mppdbide.presentation.windows.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\poi-ooxml-schemas-4.1.2.jar %TEST%\org.opengauss.mppdbide.presentation.windows.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\xmlbeans-3.1.0.jar %TEST%\org.opengauss.mppdbide.presentation.windows.test.fragment\lib\. -xcopy %SOURCE%\3rd_src\target\dependency\junit-4.11.jar %TEST%\org.opengauss.mppdbide.presentation.windows.test.fragment\lib\. +xcopy %SOURCE%\3rd_src\target\dependency\junit-4.13.2.jar %TEST%\org.opengauss.mppdbide.presentation.windows.test.fragment\lib\. rmdir /Q /S %TEST%\org.opengauss.mppdbide.util.windows.test.fragment\lib mkdir %TEST%\org.opengauss.mppdbide.util.windows.test.fragment\lib @@ -226,7 +226,7 @@ xcopy %SOURCE%\3rd_src\target\dependency\gson-2.8.6.jar %TEST%\org.opengauss.mpp xcopy %SOURCE%\platform\Gauss200\gs_jdbc\gsjdbc4.jar %TEST%\org.opengauss.mppdbide.util.windows.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\hamcrest-api-1.0.jar %TEST%\org.opengauss.mppdbide.util.windows.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\jsqlparser-3.2.jar %TEST%\org.opengauss.mppdbide.util.windows.test.fragment\lib\. -xcopy %SOURCE%\3rd_src\target\dependency\junit-4.11.jar %TEST%\org.opengauss.mppdbide.util.windows.test.fragment\lib\. +xcopy %SOURCE%\3rd_src\target\dependency\junit-4.13.2.jar %TEST%\org.opengauss.mppdbide.util.windows.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\log4j-1.2.15.jar %TEST%\org.opengauss.mppdbide.util.windows.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\commons-codec-1.15.jar %TEST%\org.opengauss.mppdbide.util.windows.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\commons-io-2.11.0.jar %TEST%\org.opengauss.mppdbide.util.windows.test.fragment\lib\. @@ -242,7 +242,7 @@ xcopy %SOURCE%\3rd_src\target\dependency\easymock-4.3.jar %TEST%\org.opengauss.m xcopy %SOURCE%\3rd_src\target\dependency\gson-2.8.6.jar %TEST%\org.opengauss.mppdbide.utils.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\log4j-1.2.15.jar %TEST%\org.opengauss.mppdbide.utils.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\commons-codec-1.15.jar %TEST%\org.opengauss.mppdbide.utils.test.fragment\lib\. -xcopy %SOURCE%\3rd_src\target\dependency\junit-4.11.jar %TEST%\org.opengauss.mppdbide.utils.test.fragment\lib\. +xcopy %SOURCE%\3rd_src\target\dependency\junit-4.13.2.jar %TEST%\org.opengauss.mppdbide.utils.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\jsqlparser-3.2.jar %TEST%\org.opengauss.mppdbide.utils.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\commons-io-2.11.0.jar %TEST%\org.opengauss.mppdbide.utils.test.fragment\lib\. xcopy %SOURCE%\3rd_src\target\dependency\mockrunner-jdbc-2.0.6.jar %TEST%\org.opengauss.mppdbide.utils.test.fragment\lib\. diff --git a/code/datastudio/src/copyExternalsToBuild.sh b/code/datastudio/src/copyExternalsToBuild.sh index 1fa6c1a37d0086b279a4fdcd813a37db8b9cf157..485df20f48a5fda10de3cfd841a5dbf1bc2968e0 100644 --- a/code/datastudio/src/copyExternalsToBuild.sh +++ b/code/datastudio/src/copyExternalsToBuild.sh @@ -12,7 +12,7 @@ rm -rf $DEST/db_assistant cp $SOURCE/platform/Gauss200/gs_jdbc/gsjdbc4.jar $DEST/org.opengauss.mppdbide.presentation/src-test/. cp $SOURCE/3rd_src/target/dependency/hamcrest-api-1.0.jar $DEST/org.opengauss.mppdbide.presentation/src-test/. -cp $SOURCE/3rd_src/target/dependency/junit-4.11.jar $DEST/org.opengauss.mppdbide.presentation/src-test/. +cp $SOURCE/3rd_src/target/dependency/junit-4.13.2.jar $DEST/org.opengauss.mppdbide.presentation/src-test/. cp $SOURCE/3rd_src/target/dependency/log4j-1.2.15.jar $DEST/org.opengauss.mppdbide.presentation/src-test/. cp $SOURCE/3rd_src/target/dependency/commons-logging-1.0.4.jar $DEST/org.opengauss.mppdbide.presentation/src-test/. cp $SOURCE/3rd_src/target/dependency/oro-2.0.8.jar $DEST/org.opengauss.mppdbide.presentation/src-test/. @@ -81,7 +81,7 @@ cp $SOURCE/3rd_src/target/dependency/gson-2.8.6.jar $TEST/org.opengauss.mppdbid cp $SOURCE/3rd_src/target/dependency/log4j-1.2.15.jar $TEST/org.opengauss.mppdbide.bl.debug.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/mockrunner-jdbc-2.0.6.jar $TEST/org.opengauss.mppdbide.bl.debug.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/mockrunner-core-2.0.6.jar $TEST/org.opengauss.mppdbide.bl.debug.test.fragment/lib/. -cp $SOURCE/3rd_src/target/dependency/junit-4.11.jar $TEST/org.opengauss.mppdbide.bl.debug.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/junit-4.13.2.jar $TEST/org.opengauss.mppdbide.bl.debug.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/commons-io-2.11.0.jar $TEST/org.opengauss.mppdbide.bl.debug.test.fragment/lib/. rm -rf $TEST/org.opengauss.mppdbide.bl.test.fragment/lib @@ -95,7 +95,7 @@ cp $SOURCE/3rd_src/target/dependency/hamcrest-api-1.0.jar $TEST/org.opengauss.m cp $SOURCE/3rd_src/target/dependency/easymock-4.3.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/gson-2.8.6.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/log4j-1.2.15.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/. -cp $SOURCE/3rd_src/target/dependency/junit-4.11.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/junit-4.13.2.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/jsqlparser-3.2.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/org.eclipse.osgi-3.9.1.v20130814-1242.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/commons-io-2.11.0.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/. @@ -134,7 +134,7 @@ cp $SOURCE/3rd_src/target/dependency/gson-2.8.6.jar $TEST/org.opengauss.mppdbid cp $SOURCE/platform/Gauss200/gs_jdbc/gsjdbc4.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/hamcrest-api-1.0.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/jsqlparser-3.2.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. -cp $SOURCE/3rd_src/target/dependency/junit-4.11.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/junit-4.13.2.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/log4j-1.2.15.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/commons-io-2.11.0.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/objenesis-3.2.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. @@ -160,7 +160,7 @@ cp $SOURCE/3rd_src/target/dependency/antlr4-runtime-4.9.2.jar $TEST/org.opengaus cp $SOURCE/3rd_src/target/dependency/log4j-1.2.15.jar $TEST/org.opengauss.mppdbide.editor.extension.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/commons-codec-1.15.jar $TEST/org.opengauss.mppdbide.editor.extension.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/hamcrest-api-1.0.jar $TEST/org.opengauss.mppdbide.editor.extension.test.fragment/lib/. -cp $SOURCE/3rd_src/target/dependency/junit-4.11.jar $TEST/org.opengauss.mppdbide.editor.extension.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/junit-4.13.2.jar $TEST/org.opengauss.mppdbide.editor.extension.test.fragment/lib/. rm -rf $TEST/org.opengauss.mppdbide.explainplan.test.fragment/lib mkdir $TEST/org.opengauss.mppdbide.explainplan.test.fragment/lib @@ -173,7 +173,7 @@ cp $SOURCE/3rd_src/target/dependency/easymock-4.3.jar $TEST/org.opengauss.mppdbi cp $SOURCE/3rd_src/target/dependency/gson-2.8.6.jar $TEST/org.opengauss.mppdbide.explainplan.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/log4j-1.2.15.jar $TEST/org.opengauss.mppdbide.explainplan.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/commons-codec-1.15.jar $TEST/org.opengauss.mppdbide.explainplan.test.fragment/lib/. -cp $SOURCE/3rd_src/target/dependency/junit-4.11.jar $TEST/org.opengauss.mppdbide.explainplan.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/junit-4.13.2.jar $TEST/org.opengauss.mppdbide.explainplan.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/mockrunner-jdbc-2.0.6.jar $TEST/org.opengauss.mppdbide.explainplan.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/mockrunner-core-2.0.6.jar $TEST/org.opengauss.mppdbide.explainplan.test.fragment/lib/. @@ -188,7 +188,7 @@ cp $SOURCE/3rd_src/target/dependency/easymock-4.3.jar $TEST/org.opengauss.mppdbi cp $SOURCE/3rd_src/target/dependency/gson-2.8.6.jar $TEST/org.opengauss.mppdbide.parser.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/log4j-1.2.15.jar $TEST/org.opengauss.mppdbide.parser.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/commons-codec-1.15.jar $TEST/org.opengauss.mppdbide.parser.test.fragment/lib/. -cp $SOURCE/3rd_src/target/dependency/junit-4.11.jar $TEST/org.opengauss.mppdbide.parser.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/junit-4.13.2.jar $TEST/org.opengauss.mppdbide.parser.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/antlr4-runtime-4.9.2.jar $TEST/org.opengauss.mppdbide.parser.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/mockrunner-jdbc-2.0.6.jar $TEST/org.opengauss.mppdbide.parser.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/mockrunner-core-2.0.6.jar $TEST/org.opengauss.mppdbide.parser.test.fragment/lib/. @@ -213,7 +213,7 @@ cp $SOURCE/3rd_src/target/dependency/poi-4.1.2.jar $TEST/org.opengauss.mppdbide. cp $SOURCE/3rd_src/target/dependency/poi-ooxml-4.1.2.jar $TEST/org.opengauss.mppdbide.presentation.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/poi-ooxml-schemas-4.1.2.jar $TEST/org.opengauss.mppdbide.presentation.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/xmlbeans-3.1.0.jar $TEST/org.opengauss.mppdbide.presentation.windows.test.fragment/lib/. -cp $SOURCE/3rd_src/target/dependency/junit-4.11.jar $TEST/org.opengauss.mppdbide.presentation.windows.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/junit-4.13.2.jar $TEST/org.opengauss.mppdbide.presentation.windows.test.fragment/lib/. rm -rf $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib mkdir $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib @@ -227,7 +227,7 @@ cp $SOURCE/3rd_src/target/dependency/gson-2.8.6.jar $TEST/org.opengauss.mppdbide cp $SOURCE/platform/Gauss200/gs_jdbc/gsjdbc4.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/hamcrest-api-1.0.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/jsqlparser-3.2.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. -cp $SOURCE/3rd_src/target/dependency/junit-4.11.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/junit-4.13.2.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/log4j-1.2.15.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/commons-codec-1.15.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/commons-io-2.11.0.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. @@ -243,7 +243,7 @@ cp $SOURCE/3rd_src/target/dependency/easymock-4.3.jar $TEST/org.opengauss.mppdbi cp $SOURCE/3rd_src/target/dependency/gson-2.8.6.jar $TEST/org.opengauss.mppdbide.utils.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/log4j-1.2.15.jar $TEST/org.opengauss.mppdbide.utils.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/commons-codec-1.15.jar $TEST/org.opengauss.mppdbide.utils.test.fragment/lib/. -cp $SOURCE/3rd_src/target/dependency/junit-4.11.jar $TEST/org.opengauss.mppdbide.utils.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/junit-4.13.2.jar $TEST/org.opengauss.mppdbide.utils.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/jsqlparser-3.2.jar $TEST/org.opengauss.mppdbide.utils.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/commons-io-2.11.0.jar $TEST/org.opengauss.mppdbide.utils.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/mockrunner-jdbc-2.0.6.jar $TEST/org.opengauss.mppdbide.utils.test.fragment/lib/. diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/pom.xml b/code/datastudio/src/org.opengauss.mppdbide.presentation/pom.xml index 7995bf340a4b1934af2ccbb29a683e7c91ce3b83..a7b72612e0f5cb4ac665601b6af8669ca1b5b08f 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/pom.xml +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/pom.xml @@ -15,7 +15,7 @@ junit junit - 4.11 + 4.13.2 test diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/build.properties b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/build.properties index d8f0cad1be0362d9a07e5b6fac2152273a6693de..a4c475bfa880f4a5795d18c7492d4eec5ffde4ea 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/build.properties +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/build.properties @@ -9,7 +9,7 @@ bin.includes = META-INF/,\ lib/easymock-4.3.jar,\ lib/gson-2.8.6.jar,\ lib/log4j-1.2.15.jar,\ - lib/junit-4.11.jar,\ + lib/junit-4.13.2.jar,\ lib/commons-io-2.11.0.jar,\ lib/mockrunner-jdbc-2.0.6.jar,\ lib/mockrunner-core-2.0.6.jar \ No newline at end of file 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 9a494f598514b489fb59c4a852d5f8edcf9e09c4..b98c05ccd329e323ad2b759f1a9d9c9fef741182 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 @@ -9,7 +9,7 @@ bin.includes = META-INF/,\ lib/easymock-4.3.jar,\ lib/gson-2.8.6.jar,\ lib/log4j-1.2.15.jar,\ - lib/junit-4.11.jar,\ + lib/junit-4.13.2.jar,\ lib/org.eclipse.osgi-3.9.1.v20130814-1242.jar,\ lib/commons-io-2.11.0.jar,\ lib/powermock-api-mockito-1.6.6.jar,\ diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.windows.test.fragment/build.properties b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.windows.test.fragment/build.properties index dca0445536102d7c6ed2aadfff39852c4cb093d5..51107db76807cfeda18a82ba6bc43286ff4685db 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.windows.test.fragment/build.properties +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.windows.test.fragment/build.properties @@ -11,7 +11,7 @@ bin.includes = META-INF/,\ lib/gsjdbc4.jar,\ lib/hamcrest-api-1.0.jar,\ lib/jsqlparser-3.2.jar,\ - lib/junit-4.11.jar,\ + lib/junit-4.13.2.jar,\ lib/log4j-1.2.15.jar,\ lib/commons-io-2.11.0.jar,\ lib/objenesis-3.2.jar,\ diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.editor.extension.test.fragment/build.properties b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.editor.extension.test.fragment/build.properties index 0523b2079538de0a2575fd89bab2a8042f31b978..af027e3347f7df238093e9353efd0429dc49e48e 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.editor.extension.test.fragment/build.properties +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.editor.extension.test.fragment/build.properties @@ -6,4 +6,4 @@ bin.includes = META-INF/,\ lib/log4j-1.2.15.jar,\ lib/commons-codec-1.15.jar,\ lib/hamcrest-api-1.0.jar,\ - lib/junit-4.11.jar \ No newline at end of file + lib/junit-4.13.2.jar \ No newline at end of file diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.explainplan.test.fragment/build.properties b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.explainplan.test.fragment/build.properties index 371c4421ead14e93c5c194f45bec54839b0b8884..90590063998ccbd073e64b568f37f82e61eebd1e 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.explainplan.test.fragment/build.properties +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.explainplan.test.fragment/build.properties @@ -10,6 +10,6 @@ bin.includes = META-INF/,\ lib/gson-2.8.6.jar,\ lib/log4j-1.2.15.jar,\ lib/commons-codec-1.15.jar,\ - lib/junit-4.11.jar,\ + lib/junit-4.13.2.jar,\ lib/mockrunner-jdbc-2.0.6.jar,\ lib/mockrunner-core-2.0.6.jar diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.parser.test.fragment/build.properties b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.parser.test.fragment/build.properties index 382f52cc4dcc7c55bf6818047b5279207dc05448..c83a0c78c974a5ec2888867c05ea08358f707ccf 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.parser.test.fragment/build.properties +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.parser.test.fragment/build.properties @@ -10,6 +10,6 @@ bin.includes = META-INF/,\ lib/gson-2.8.6.jar,\ lib/log4j-1.2.15.jar,\ lib/commons-codec-1.15.jar,\ - lib/junit-4.11.jar,\ + lib/junit-4.13.2.jar,\ lib/antlr4-runtime-4.9.2.jar,\ lib/mockrunner-jdbc-2.0.6.jar diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/build.properties b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/build.properties index b0de0415d93d226e4ffda41a19146b22223818eb..d6b80dbf36675f424ff5e43d0b2e1675b56448da 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/build.properties +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/build.properties @@ -20,4 +20,4 @@ bin.includes = META-INF/,\ lib/poi-ooxml-4.1.2.jar,\ lib/poi-ooxml-schemas-4.1.2.jar,\ lib/xmlbeans-3.1.0.jar,\ - lib/junit-4.11.jar \ No newline at end of file + lib/junit-4.13.2.jar \ No newline at end of file diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.util.windows.test.fragment/build.properties b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.util.windows.test.fragment/build.properties index 533461313ba55c2d36aadb7960c2f22b01db6cc4..c00ed611b498f6880761c08d0c64a0856b8ed282 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.util.windows.test.fragment/build.properties +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.util.windows.test.fragment/build.properties @@ -10,7 +10,7 @@ bin.includes = META-INF/,\ lib/gsjdbc4.jar,\ lib/hamcrest-api-1.0.jar,\ lib/jsqlparser-3.2.jar,\ - lib/junit-4.11.jar,\ + lib/junit-4.13.2.jar,\ lib/log4j-1.2.15.jar,\ lib/commons-codec-1.15.jar,\ lib/commons-io-2.11.0.jar diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.utils.test.fragment/build.properties b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.utils.test.fragment/build.properties index a875506bfcb62c8ed75e24b000379e962a6d9212..84a854e15321b9071fb8050d0267e6808c6ee23e 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.utils.test.fragment/build.properties +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.utils.test.fragment/build.properties @@ -10,7 +10,7 @@ bin.includes = META-INF/,\ lib/gson-2.8.6.jar,\ lib/log4j-1.2.15.jar,\ lib/commons-codec-1.15.jar,\ - lib/junit-4.11.jar,\ + lib/junit-4.13.2.jar,\ lib/jsqlparser-3.2.jar,\ lib/commons-io-2.11.0.jar,\ lib/mockrunner-jdbc-2.0.6.jar,\