diff --git a/.github/workflows/mvn-deploy-release.yaml b/.github/workflows/mvn-deploy-release.yaml index 173f8cd..577108d 100644 --- a/.github/workflows/mvn-deploy-release.yaml +++ b/.github/workflows/mvn-deploy-release.yaml @@ -15,9 +15,9 @@ jobs: MVN_MASTER_PASSWORD: ${{ secrets.MVN_MASTER_PASSWORD }} steps: - name: Check out Git repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install Java and Maven - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 11 - name: Create settings-security.xml diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index d1c44a7..0806a02 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -10,8 +10,8 @@ jobs: java: [ '11', '15','17' ] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: ${{ matrix.java }} diff --git a/README.md b/README.md index 5be92ba..4896898 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ JDK 11 and above: io.logz.logback logzio-logback-appender - 2.0.1 + 2.1.0 ``` @@ -33,7 +33,7 @@ Logback appender also requires logback classic: ch.qos.logback logback-classic - 1.2.7 + 1.5.12 ``` @@ -175,6 +175,10 @@ Will send a log to Logz.io that looks like this: ``` ### Release notes +- 2.1.0 + - Updated LogzioSender version to 2.1.0 + - Upgrade packages version + - Upgrade packages version - 2.0.1 - Updated LogzioSender version to `2.0.1` - Add `User-Agent` header with logz.io information diff --git a/pom.xml b/pom.xml index 9b69b56..80b51bc 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.logz.logback logzio-logback-appender - 2.0.1 + 2.1.0 jar Logz.io Logback Appender @@ -22,8 +22,8 @@ - Tamir Michaeli - tamir.michaeli@logz.io + Naama Bendalak + naama.bendalak@logz.io Logz.io http://logz.io @@ -36,7 +36,7 @@ - 2.0.1 + 2.1.0 @@ -53,7 +53,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.13.0 11 11 @@ -62,7 +62,7 @@ org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.3.1 attach-sources @@ -75,7 +75,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.10.0 attach-javadocs @@ -184,19 +184,13 @@ ch.qos.logback logback-classic - 1.2.7 + 1.5.8 provided com.google.guava guava - 30.0-jre - - - org.assertj - assertj-core - 3.4.1 - test + 33.3.0-jre io.logz.sender @@ -207,13 +201,13 @@ junit junit - 4.13.1 + 4.13.2 test net.logstash.logback logstash-logback-encoder - 5.2 + 8.0 test diff --git a/src/test/java/io/logz/logback/BaseLogbackAppenderTest.java b/src/test/java/io/logz/logback/BaseLogbackAppenderTest.java index 31729e5..283fa73 100644 --- a/src/test/java/io/logz/logback/BaseLogbackAppenderTest.java +++ b/src/test/java/io/logz/logback/BaseLogbackAppenderTest.java @@ -34,7 +34,7 @@ public void stopMockListener() { protected void sleepSeconds(int seconds) { logger.info("Sleeping {} [sec]...", seconds); try { - Thread.sleep(seconds * 1000); + Thread.sleep(seconds * 1000L); } catch (InterruptedException e) { throw new RuntimeException(e); } diff --git a/src/test/java/io/logz/logback/LogzioLogbackAppenderTest.java b/src/test/java/io/logz/logback/LogzioLogbackAppenderTest.java index f84198b..73de57c 100644 --- a/src/test/java/io/logz/logback/LogzioLogbackAppenderTest.java +++ b/src/test/java/io/logz/logback/LogzioLogbackAppenderTest.java @@ -90,7 +90,7 @@ public void validateJsonMessage(){ } @Test - public void simpleAppending() throws Exception { + public void simpleAppending() { String token = "aBcDeFgHiJkLmNoPqRsT"; String type = "awesomeType" + random(8); String loggerName = "simpleAppending" + random(8); @@ -110,7 +110,7 @@ public void simpleAppending() throws Exception { } @Test - public void simpleGzipAppending() throws Exception { + public void simpleGzipAppending() { String token = "aBcDeFgHiJkLmNoPqRsTGzIp"; String type = "awesomeGzipType" + random(8); String loggerName = "simpleGzipAppending" + random(8); @@ -130,7 +130,7 @@ public void simpleGzipAppending() throws Exception { } @Test - public void validateAdditionalFields() throws Exception { + public void validateAdditionalFields() { String token = "validatingAdditionalFields"; String type = "willTryWithOrWithoutEnvironmentVariables" + random(8); String loggerName = "additionalLogger" + random(8); @@ -175,7 +175,7 @@ public void existingHostname() throws Exception { } @Test - public void existingLine() throws Exception { + public void existingLine() { String token = "checkingLine"; String type = "withLineType" + random(8); String loggerName = "test" + random(8); @@ -197,7 +197,7 @@ public void existingLine() throws Exception { @SuppressWarnings("ConstantConditions") @Test - public void sendException() throws Exception { + public void sendException() { String token = "checkingExceptions"; String type = "badType" + random(8); String loggerName = "exceptionProducer" + random(8); @@ -228,7 +228,7 @@ public void sendException() throws Exception { } @Test - public void testMDC() throws Exception { + public void testMDC() { String token = "mdcTokensAreTheBest"; String type = "mdcType" + random(8); String loggerName = "mdcTesting" + random(8); @@ -254,7 +254,7 @@ public void testMDC() throws Exception { } @Test - public void testMarker() throws Exception { + public void testMarker() { String token = "markerToken"; String type = "markerType" + random(8); String loggerName = "markerTesting" + random(8);