Skip to content

Commit

Permalink
bump guava and logback classic versions (#82)
Browse files Browse the repository at this point in the history
* bump guava and logback classic versions

* version and flatten mode change

* reverted maven shade invalid confiugration

* updated readme
  • Loading branch information
tamir-michaeli authored Jun 16, 2022
1 parent 469a6b3 commit ca5473b
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 24 deletions.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ This appender uses [LogzioSender](https://github.com/logzio/logzio-java-sender)
<dependency>
<groupId>io.logz.logback</groupId>
<artifactId>logzio-logback-appender</artifactId>
<version>1.0.24</version>
<version>1.0.27</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<version>1.2.7</version>
</dependency>
```

Expand Down Expand Up @@ -148,6 +148,9 @@ Will send a log to Logz.io that looks like this:
```

### Release notes
- 1.0.27
- Dependency version bump
- Reverted invalid maven shade configuration
- 1.0.25
- added ability to flush sender manually
- 1.0.24
Expand Down
46 changes: 24 additions & 22 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>0-SNAPSHOT</version>
<version>1.0.27</version>

<packaging>jar</packaging>
<name>Logz.io Logback Appender</name>
Expand Down Expand Up @@ -38,7 +38,16 @@
<properties>
<logzio-sender-version>1.1.1</logzio-sender-version>
</properties>

<distributionManagement>
<snapshotRepository>
<id>ossrh-nexus</id>
<url>https:/oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh-nexus</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -93,7 +102,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.3</version>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh-nexus</serverId>
Expand All @@ -116,24 +125,10 @@
<configuration>
<minimizeJar>true</minimizeJar>
<createDependencyReducedPom>true</createDependencyReducedPom>
<artifactSet>
<includes>
<include>*:*</include>
</includes>
<excludes>
<exclude>ch.qos.logback:*</exclude>
<exclude>org.slf4j:*</exclude>
</excludes>
</artifactSet>
<relocations>
<relocation>
<pattern></pattern>
<!-- shade everything to the same dir as sender, to avoid duplicate classes -->
<shadedPattern>io.logz.sender.</shadedPattern>
<excludes>
<exclude>%regex[^io.logz.*]</exclude>
<exclude>%regex[^META-INF/.*]</exclude>
</excludes>
<pattern>io.logz.sender</pattern>
<shadedPattern>io.logz.logback-appender.sender</shadedPattern>
</relocation>
</relocations>
<filters>
Expand All @@ -151,7 +146,7 @@
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.7</version>
<configuration>
<flattenMode>clean</flattenMode>
<flattenMode>oss</flattenMode>
<updatePomFile>true</updatePomFile>
</configuration>
<executions>
Expand All @@ -171,16 +166,23 @@
<groupId>io.logz.sender</groupId>
<artifactId>logzio-sender</artifactId>
<version>${logzio-sender-version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<version>1.2.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>25.0-jre</version>
<version>30.0-jre</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
Expand Down

0 comments on commit ca5473b

Please sign in to comment.