[SQL] [TEST] [MINOR] Follow-up of PR #6493, use Guava API to ensure Java 6 friendliness#6547

liancheng wants to merge 2 commits intoapache:masterapache/spark:masterfrom

liancheng:override-log4jliancheng/spark:override-log4jCopy head branch name to clipboard