From eeef82cfb085760257798a526501d32bf2487350 Mon Sep 17 00:00:00 2001
From: Tamir Michaeli <tamir.michaeli@logz.io>
Date: Wed, 3 Aug 2022 19:16:38 +0300
Subject: [PATCH] changed jetty version, updated tests (#62)

* changed jetty version, updated tests

* upgraded javadoc version
---
 README.md                                              |  2 +-
 .../src/test/java/io/logz/sender/LogzioSenderTest.java | 10 +++++-----
 pom.xml                                                |  7 ++-----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 98a782a..dcb818d 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ This appender uses [BigQueue](https://github.com/bulldog2011/bigqueue) implement
 If you use Gradle, add the dependency to your project as follows:
 
 ```java
-implementation 'io.logz.sender:logzio-java-sender:1.1.4'
+implementation 'io.logz.sender:logzio-java-sender:1.1.5'
 ```
 
 ### Parameters
diff --git a/logzio-sender/src/test/java/io/logz/sender/LogzioSenderTest.java b/logzio-sender/src/test/java/io/logz/sender/LogzioSenderTest.java
index 585a2b4..acc8252 100644
--- a/logzio-sender/src/test/java/io/logz/sender/LogzioSenderTest.java
+++ b/logzio-sender/src/test/java/io/logz/sender/LogzioSenderTest.java
@@ -12,7 +12,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.UUID;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -396,7 +396,7 @@ public void checkExceedingMaxSizeJsonLogWithCut() throws LogzioParameterErrorExc
         String loggerName = "checkExceedingMaxSizeJsonLogWithCutName";
         int drainTimeout = 2;
 
-        String message = Files.readString(Path.of(EXCEEDING_MESSAGE_FILE_PATH));
+        String message = new String(Files.readAllBytes(Paths.get(EXCEEDING_MESSAGE_FILE_PATH)), StandardCharsets.UTF_8);
         JsonObject log = createJsonMessage(loggerName, message);
 
         int logSize = log.toString().getBytes(StandardCharsets.UTF_8).length;
@@ -416,7 +416,7 @@ public void checkExceedingMaxSizeBytesLogWithCut() throws LogzioParameterErrorEx
         String loggerName = "checkExceedingMaxSizeBytesLogWithCutName";
         int drainTimeout = 2;
 
-        String message = Files.readString(Path.of(EXCEEDING_MESSAGE_FILE_PATH));
+        String message = new String(Files.readAllBytes(Paths.get(EXCEEDING_MESSAGE_FILE_PATH)), StandardCharsets.UTF_8);
         JsonObject log = createJsonMessage(loggerName, message);
 
         int logSize = log.toString().getBytes(StandardCharsets.UTF_8).length;
@@ -437,7 +437,7 @@ public void checkExceedingMaxSizeJsonLogWithDrop() throws LogzioParameterErrorEx
         String loggerName = "checkExceedingMaxSizeJsonLogWithDropName";
         int drainTimeout = 2;
 
-        String message = Files.readString(Path.of(EXCEEDING_MESSAGE_FILE_PATH));
+        String message = new String(Files.readAllBytes(Paths.get(EXCEEDING_MESSAGE_FILE_PATH)), StandardCharsets.UTF_8);
         JsonObject log = createJsonMessage(loggerName, message);
 
         int logSize = log.toString().getBytes(StandardCharsets.UTF_8).length;
@@ -456,7 +456,7 @@ public void checkExceedingMaxSizeBytesLogWithDrop() throws LogzioParameterErrorE
         String loggerName = "checkExceedingMaxSizeBytesLogWithDropName";
         int drainTimeout = 2;
 
-        String message = Files.readString(Path.of(EXCEEDING_MESSAGE_FILE_PATH));
+        String message = new String(Files.readAllBytes(Paths.get(EXCEEDING_MESSAGE_FILE_PATH)), StandardCharsets.UTF_8);
         JsonObject log = createJsonMessage(loggerName, message);
 
         int logSize = log.toString().getBytes(StandardCharsets.UTF_8).length;
diff --git a/pom.xml b/pom.xml
index 293417f..5af7efb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -75,9 +75,6 @@
                         <goals>
                             <goal>sign</goal>
                         </goals>
-                        <configuration>
-                            <keyname>marina@logz.io</keyname>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -125,7 +122,7 @@
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-server</artifactId>
-                <version>10.0.10</version>
+                <version>9.4.48.v20220622</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>