diff --git a/.travis.yml b/.travis.yml index 2593475a..ff7df902 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,7 @@ branches: only: - develop - master - - develop-domainDesigner - + env: global: - secure: "Dwb41Mdes13RFaB9Pf4fViLVt9U0NK8EvbzrD/GcWfHjKi1GpAgQ0WyUdQSKrxLViH2OL4BqQIQmOtugkW1rNQn/Gnnb4Hu4/rZ06+tLStcvmrm9+Pph++niqzCxZe206/VwDV393UVPWtVpFtbhDTaiJOf0dP+3BX7NAzqW+JU=" diff --git a/pom.xml b/pom.xml index 5200555a..4a1a0acd 100644 --- a/pom.xml +++ b/pom.xml @@ -7,16 +7,16 @@ com.jaspersoft jrs-rest-java-client - 8.1.0 + 8.2.0 REST client for JasperReports server http://github.com/Jaspersoft/jrs-rest-java-client UTF-8 - 8.1.0 + 8.2.0 2.0.9 - 2.36 - 2.13.3 + 2.39 + 2.13.5 @@ -90,7 +90,7 @@ org.codehaus.jettison jettison - 1.5.0 + 1.5.4 @@ -240,7 +240,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.0.0 false false diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/reporting/util/ReportOutputFormat.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/reporting/util/ReportOutputFormat.java index 3b1e2e47..8a67b367 100644 --- a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/reporting/util/ReportOutputFormat.java +++ b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/reporting/util/ReportOutputFormat.java @@ -23,6 +23,6 @@ public enum ReportOutputFormat { - PDF, HTML, XLS, XLSX, RTF, CSV, XML, DOCX, ODT, + PDF, HTML, XLS, XLSX, RTF, CSV, XML, DOCX, ODT, PPTX, ODS, JRPRINT } diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/SessionStorage.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/SessionStorage.java index 657125c7..8046fd3b 100644 --- a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/SessionStorage.java +++ b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/SessionStorage.java @@ -120,7 +120,7 @@ protected WebTarget configClient() { if (sessionId != null) { rootTarget.register(new SessionOutputFilter(sessionId)); } - if (configuration.getLogHttp()) { + if (Boolean.TRUE.equals(configuration.getLogHttp())) { rootTarget.property(LoggingFeature.LOGGING_FEATURE_LOGGER_LEVEL, "INFO"); rootTarget.register(initLoggingFilter()); } @@ -131,7 +131,7 @@ private LoggingFeature initLoggingFilter() { Logger logger = Logger.getLogger(this.getClass().getName()); SLF4JBridgeHandler.removeHandlersForRootLogger(); SLF4JBridgeHandler.install(); - LoggingFeature.Verbosity verbosity = configuration.getLogHttpEntity() ? LoggingFeature.Verbosity.PAYLOAD_ANY : LoggingFeature.Verbosity.HEADERS_ONLY; + LoggingFeature.Verbosity verbosity = Boolean.TRUE.equals(configuration.getLogHttpEntity()) ? LoggingFeature.Verbosity.PAYLOAD_ANY : LoggingFeature.Verbosity.HEADERS_ONLY; return new LoggingFeature(logger, verbosity); }