diff --git a/lib/com/github/bohnman/package-info-maven-plugin/1.0.2-m2e/package-info-maven-plugin-1.0.2-m2e.jar b/lib/com/github/bohnman/package-info-maven-plugin/1.0.2-m2e/package-info-maven-plugin-1.0.2-m2e.jar deleted file mode 100644 index cd041108..00000000 Binary files a/lib/com/github/bohnman/package-info-maven-plugin/1.0.2-m2e/package-info-maven-plugin-1.0.2-m2e.jar and /dev/null differ diff --git a/lib/com/github/bohnman/package-info-maven-plugin/1.0.2-m2e/package-info-maven-plugin-1.0.2-m2e.pom b/lib/com/github/bohnman/package-info-maven-plugin/1.0.2-m2e/package-info-maven-plugin-1.0.2-m2e.pom deleted file mode 100644 index a2ca2e13..00000000 --- a/lib/com/github/bohnman/package-info-maven-plugin/1.0.2-m2e/package-info-maven-plugin-1.0.2-m2e.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - com.github.bohnman - package-info-maven-plugin - 1.0.2-m2e - POM was created from install:install-file - diff --git a/lib/com/github/bohnman/package-info-maven-plugin/maven-metadata-local.xml b/lib/com/github/bohnman/package-info-maven-plugin/maven-metadata-local.xml deleted file mode 100644 index cf15831d..00000000 --- a/lib/com/github/bohnman/package-info-maven-plugin/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - com.github.bohnman - package-info-maven-plugin - - 1.0.2-m2e - - 1.0.2-m2e - - 20190326110305 - - diff --git a/pom.xml b/pom.xml index abce85aa..b04cf82e 100644 --- a/pom.xml +++ b/pom.xml @@ -11,14 +11,14 @@ 1.2.2 r5970 2.4.1 - 9.4.12.v20180830 + 9.4.17.v20190418 2.27 2.11.0 1.7.12 2.0.6 3.19.0 3.5.0 - 1.0.2-m2e + 1.1.0 ${maven.build.timestamp} @@ -312,7 +312,7 @@ com.github.bohnman package-info-maven-plugin - 1.0.1 + ${package-info-maven-plugin.version} org.apache.felix diff --git a/src/main/java/org/qora/api/ApiService.java b/src/main/java/org/qora/api/ApiService.java index fc2f0685..d5fe62de 100644 --- a/src/main/java/org/qora/api/ApiService.java +++ b/src/main/java/org/qora/api/ApiService.java @@ -4,7 +4,9 @@ import io.swagger.v3.jaxrs2.integration.resources.OpenApiResource; import org.eclipse.jetty.rewrite.handler.RedirectPatternRule; import org.eclipse.jetty.rewrite.handler.RewriteHandler; -import org.eclipse.jetty.server.NCSARequestLog; +import org.eclipse.jetty.server.CustomRequestLog; +import org.eclipse.jetty.server.RequestLog; +import org.eclipse.jetty.server.RequestLogWriter; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.ErrorHandler; import org.eclipse.jetty.server.handler.InetAccessHandler; @@ -40,11 +42,10 @@ public class ApiService { // Request logging if (Settings.getInstance().isApiLoggingEnabled()) { - NCSARequestLog requestLog = new NCSARequestLog("API-requests.log"); - requestLog.setAppend(true); - requestLog.setExtended(false); - requestLog.setLogTimeZone("UTC"); - requestLog.setLogLatency(true); + RequestLogWriter logWriter = new RequestLogWriter("API-requests.log"); + logWriter.setAppend(true); + logWriter.setTimeZone("UTC"); + RequestLog requestLog = new CustomRequestLog(logWriter, CustomRequestLog.EXTENDED_NCSA_FORMAT); server.setRequestLog(requestLog); }