diff --git a/logback-build.xml b/logback-build.xml index 44fe312f95..e1d7f3ebf6 100644 --- a/logback-build.xml +++ b/logback-build.xml @@ -9,7 +9,7 @@ - + diff --git a/pom.xml b/pom.xml index a0bedf5552..a0b843f3c0 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 2.27 - 9.4.10.v20180503 + 9.4.17.v20190418 UTF-8 1.8 1.8 diff --git a/server/pom.xml b/server/pom.xml index 84ec0693f4..ff582246e7 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,9 +6,6 @@ server pom - - 9.4.14.v20181114 - tessera diff --git a/server/server-utils/pom.xml b/server/server-utils/pom.xml index ee479e12ab..3158c3efef 100644 --- a/server/server-utils/pom.xml +++ b/server/server-utils/pom.xml @@ -9,33 +9,29 @@ server-utils jar - - org.eclipse.jetty - jetty-server - jar - + com.jpmorgan.quorum config jar + com.jpmorgan.quorum security jar + org.eclipse.jetty jetty-unixsocket jar + org.eclipse.jetty jetty-server - - org.eclipse.jetty - jetty-unixsocket - + \ No newline at end of file diff --git a/tests/acceptance-test/src/test/java/config/ConfigBuilder.java b/tests/acceptance-test/src/test/java/config/ConfigBuilder.java index d91a4e7e7c..1488b83fe1 100644 --- a/tests/acceptance-test/src/test/java/config/ConfigBuilder.java +++ b/tests/acceptance-test/src/test/java/config/ConfigBuilder.java @@ -169,9 +169,9 @@ public Config build() { null, null ); - enclaveServerConfig.setBindingAddress("https://0.0.0.0:" + enclavePort); - enclaveServerConfig.setServerAddress("https://localhost:" + enclavePort); - enclaveServerConfig.setSslConfig(sslConfig); + enclaveServerConfig.setBindingAddress("http://0.0.0.0:" + enclavePort); + enclaveServerConfig.setServerAddress("http://localhost:" + enclavePort); + // enclaveServerConfig.setSslConfig(sslConfig); enclaveServerConfig.setCommunicationType(CommunicationType.REST); servers.add(enclaveServerConfig); diff --git a/tests/acceptance-test/src/test/java/suite/HttpsServerStatusCheck.java b/tests/acceptance-test/src/test/java/suite/HttpsServerStatusCheck.java index 10552d0307..759d162e64 100644 --- a/tests/acceptance-test/src/test/java/suite/HttpsServerStatusCheck.java +++ b/tests/acceptance-test/src/test/java/suite/HttpsServerStatusCheck.java @@ -7,9 +7,13 @@ import javax.net.ssl.SSLContext; import java.io.IOException; import java.net.URL; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HttpsServerStatusCheck implements ServerStatusCheck { + private static final Logger LOGGER = LoggerFactory.getLogger(HttpsServerStatusCheck.class); + private final URL url; private final SslConfig sslConfig; @@ -32,7 +36,7 @@ public boolean checkStatus() { return true; } catch (IOException ex) { - LOGGER.warn(ex.getMessage()); + LOGGER.warn("url: {}, message: {}",url,ex.getMessage()); LOGGER.debug(null, ex); return false; } finally { diff --git a/tests/acceptance-test/src/test/resources/logback-test.xml b/tests/acceptance-test/src/test/resources/logback-test.xml index 9eb5ceccb0..59610682ec 100644 --- a/tests/acceptance-test/src/test/resources/logback-test.xml +++ b/tests/acceptance-test/src/test/resources/logback-test.xml @@ -14,8 +14,8 @@ - - + +