Merge remote-tracking branch 'origin/develop' into develop

Author: arcuri82

jdk_8_maven/em/embedded/rest/catwatch/src/main/java/em/embedded/org/zalando/EmbeddedEvoMasterController.java

@@ -6,6 +6,7 @@
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
 import org.evomaster.client.java.controller.db.DbCleaner;
 import org.evomaster.client.java.controller.internal.db.DbSpecification;
+import org.evomaster.client.java.controller.problem.ExternalService;
 import org.evomaster.client.java.controller.problem.ProblemInfo;
 import org.evomaster.client.java.controller.problem.RestProblem;
 import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
@@ -21,6 +22,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static java.util.Arrays.asList;
+
 /**
  * Class used to start/stop the SUT. This will be controller by the EvoMaster process
  */
@@ -78,7 +81,7 @@ public String startSut() {
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }
-        dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.H2,sqlConnection));
+        dbSpecification = asList(new DbSpecification(DatabaseType.H2,sqlConnection));
 
         return "http://localhost:" + getSutPort();
     }
@@ -114,8 +117,9 @@ public void resetStateOfSUT() {
     public ProblemInfo getProblemInfo() {
         return new RestProblem(
                 "http://localhost:" + getSutPort() + "/v2/api-docs",
-                Arrays.asList("/health", "/health.json", "/error")
-        );
+                asList("/health", "/health.json", "/error")
+                //TODO remove when dealing OAuth2 with Docker
+        ).withServicesToNotMock(asList(new ExternalService("info.services.auth.zalando.com",443)));
     }
 
     @Override

jdk_8_maven/em/external/rest/catwatch/src/main/java/em/external/org/zalando/ExternalEvoMasterController.java

@@ -5,6 +5,7 @@
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
 import org.evomaster.client.java.controller.db.DbCleaner;
 import org.evomaster.client.java.controller.internal.db.DbSpecification;
+import org.evomaster.client.java.controller.problem.ExternalService;
 import org.evomaster.client.java.controller.problem.ProblemInfo;
 import org.evomaster.client.java.controller.problem.RestProblem;
 import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
@@ -17,6 +18,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static java.util.Arrays.asList;
+
 public class ExternalEvoMasterController extends ExternalSutController {
 
     public static void main(String[] args) {
@@ -192,7 +195,8 @@ public ProblemInfo getProblemInfo() {
         return new RestProblem(
                 getBaseURL() + "/v2/api-docs",
                 Arrays.asList("/health", "/health.json", "/error")
-        );
+                //TODO remove when dealing OAuth2 with Docker
+        ).withServicesToNotMock(asList(new ExternalService("info.services.auth.zalando.com",443)));
     }
 
     @Override

jdk_8_maven/em/pom.xml

@@ -60,7 +60,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>dns-cache-manipulator</artifactId>
-            <version>1.7.1</version>
+            <version>1.8.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>