diff --git a/webui/.gitrepo b/webui/.gitrepo index 8bc41dcdb0..1ad8ab1340 100644 --- a/webui/.gitrepo +++ b/webui/.gitrepo @@ -7,5 +7,5 @@ remote = git@github.com:daisy/pipeline-webui.git branch = master commit = da26286e59190919450b5409c20fe0a139f75b2b - parent = 32acda505b73dafceaee8e888d7a0b72e2523e68 + parent = 9054572ac20191f8e7ef341ef6e19a7bd37f05e6 cmdver = 0.3.1 diff --git a/webui/app/controllers/SystemStatus.java b/webui/app/controllers/SystemStatus.java index ebc2e39b54..d368788716 100644 --- a/webui/app/controllers/SystemStatus.java +++ b/webui/app/controllers/SystemStatus.java @@ -121,7 +121,7 @@ public static EngineAttempt engineAttempt(String url, String authid, String secr attempt.lastAuthTime = new Date(); if (attempt.alive != null && authid != null && secret != null && !attempt.alive.error && attempt.alive.authentication) { try { - attempt.authResponse = Pipeline2HttpClient.get(url, "", authid, secret, null); + attempt.authResponse = Pipeline2HttpClient.get(url, "/jobs", authid, secret, null); //attempt.authResponse = org.daisy.pipeline.client.Scripts.get(url, authid, secret); if (attempt.authResponse.status == 401) { attempt.authError = "Invalid authentication ID or secret text"; diff --git a/webui/build.sbt b/webui/build.sbt index 6ad30f1aad..0cbad53194 100644 --- a/webui/build.sbt +++ b/webui/build.sbt @@ -6,7 +6,7 @@ import com.typesafe.sbt.packager.windows.WixHelper organization := "org.daisy.pipeline" name := "webui" -version := "2.7.0" +version := "2.7.2-SNAPSHOT" organizationName := "The DAISY Consortium" organizationHomepage := Some(url("http://daisy.org")) @@ -190,12 +190,16 @@ libraryDependencies ++= Seq( "org.avaje.ebeanorm" % "avaje-ebeanorm-api" % "3.1.1", "org.apache.derby" % "derby" % "10.11.1.1", "mysql" % "mysql-connector-java" % "8.0.15", - "org.daisy.pipeline" % "clientlib-java" % "5.0.0", - "org.daisy.pipeline" % "clientlib-java-httpclient" % "2.1.1", + "org.daisy.pipeline" % "clientlib-java" % "5.0.1", + "org.daisy.pipeline" % "clientlib-java-httpclient" % "2.1.2", "org.apache.commons" % "commons-compress" % "1.9", "org.apache.commons" % "commons-email" % "1.4", - "log4j" % "log4j" % "1.2.17", - "log4j" % "apache-log4j-extras" % "1.2.17" + // override version included by default (1.1.3) + "ch.qos.logback" % "logback-core" % "1.2.8", + "ch.qos.logback" % "logback-classic" % "1.2.8", + "org.slf4j" % "slf4j-api" % "1.7.32", + "org.slf4j" % "jul-to-slf4j" % "1.7.32", + "org.slf4j" % "jcl-over-slf4j" % "1.7.32" ) scalacOptions += "-deprecation"