fixed for timbuctoo

Author: arcuri82

jdk_11_maven/cs/graphql/timbuctoo/timbuctoo-instancev4/pom.xml

@@ -982,6 +982,16 @@
             </goals>
             <configuration>
               <finalName>timbuctoo-sut</finalName>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
               <transformers>
                 <transformer
                         implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>

jdk_11_maven/em/embedded/graphql/timbuctoo/src/main/java/em/embedded/nl/knaw/huygens/EmbeddedEvoMasterController.java

@@ -87,7 +87,7 @@ public String startSut() {
 
 
         try {
-            application.run("server", "src/main/resources/timbuctoo_evomaster.yaml");
+            application.run("server", "em/embedded/graphql/timbuctoo/src/main/resources/timbuctoo_evomaster.yaml");
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -145,8 +145,8 @@ public void resetStateOfSUT() {
             if(!Files.exists(Path.of(tmpFolder))) {
                 Files.createDirectory(Path.of(tmpFolder));
             }
-            Files.copy(Path.of("src","main","resources","users.json"), Path.of(tmpFolder,"users.json"), StandardCopyOption.REPLACE_EXISTING);
-            Files.copy(Path.of("src","main","resources","logins.json"), Path.of(tmpFolder,"logins.json"), StandardCopyOption.REPLACE_EXISTING);
+            Files.copy(Path.of(getClass().getClassLoader().getResource("users.json").toURI()), Path.of(tmpFolder,"users.json"), StandardCopyOption.REPLACE_EXISTING);
+            Files.copy(Path.of(getClass().getClassLoader().getResource("logins.json").toURI()), Path.of(tmpFolder,"logins.json"), StandardCopyOption.REPLACE_EXISTING);
         }catch (Exception e){
             throw new RuntimeException(e);
         }

jdk_11_maven/em/external/graphql/timbuctoo/src/main/java/em/external/nl/knaw/huygens/ExternalEvoMasterController.java

@@ -156,7 +156,7 @@ public String getPathToExecutableJar() {
 
     @Override
     public String getLogMessageOfInitializedServer() {
-        return "Server: Started";
+        return "Started @";
     }
 
     @Override
@@ -167,6 +167,7 @@ public long getMaxAwaitForInitializationInSeconds() {
     @Override
     public void preStart() {
         elasticsearch.start();
+        resetStateOfSUT();
     }
 
     @Override