Merge branch 'develop' into catwatch-fetch

Author: man-zhang

jdk_8_maven/em/pom.xml

@@ -61,11 +61,13 @@
             <groupId>com.alibaba</groupId>
             <artifactId>dns-cache-manipulator</artifactId>
             <version>1.7.1</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <version>2.32.0</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>