Skip to content

Commit

Permalink
v2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
8naama authored Dec 31, 2024
1 parent 371e6f2 commit 6d7721b
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 31 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/mvn-deploy-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ JDK 11 and above:
<dependency>
<groupId>io.logz.logback</groupId>
<artifactId>logzio-logback-appender</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>
</dependency>
```

Expand All @@ -33,7 +33,7 @@ Logback appender also requires logback classic:
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.7</version>
<version>1.5.12</version>
</dependency>
```

Expand Down Expand Up @@ -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
Expand Down
28 changes: 11 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>io.logz.logback</groupId>
<artifactId>logzio-logback-appender</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>

<packaging>jar</packaging>
<name>Logz.io Logback Appender</name>
Expand All @@ -22,8 +22,8 @@

<developers>
<developer>
<name>Tamir Michaeli</name>
<email>tamir.michaeli@logz.io</email>
<name>Naama Bendalak</name>
<email>naama.bendalak@logz.io</email>
<organization>Logz.io</organization>
<organizationUrl>http://logz.io</organizationUrl>
</developer>
Expand All @@ -36,7 +36,7 @@
</scm>

<properties>
<logzio-sender-version>2.0.1</logzio-sender-version>
<logzio-sender-version>2.1.0</logzio-sender-version>
</properties>
<distributionManagement>
<snapshotRepository>
Expand All @@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<version>3.13.0</version>
<configuration>
<source>11</source>
<target>11</target>
Expand All @@ -62,7 +62,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -75,7 +75,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.10.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -184,19 +184,13 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.7</version>
<version>1.5.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.0-jre</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.4.1</version>
<scope>test</scope>
<version>33.3.0-jre</version>
</dependency>
<dependency>
<groupId>io.logz.sender</groupId>
Expand All @@ -207,13 +201,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
<version>5.2</version>
<version>8.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/logz/logback/BaseLogbackAppenderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
14 changes: 7 additions & 7 deletions src/test/java/io/logz/logback/LogzioLogbackAppenderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit 6d7721b

Please sign in to comment.