Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Bump logback-access to 2.0.2
Remove servlet-api test dependency

Rename some maven properties
  • Loading branch information
philsttr committed Jul 27, 2024
commit 4af3eec3a30a1341f18bb785920b7fea45468eec
37 changes: 15 additions & 22 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,15 @@
<!-- runtime dependencies -->
<jackson.version>2.15.2</jackson.version>
<java-uuid-generator.version>4.2.0</java-uuid-generator.version>
<logback.core.version>1.5.6</logback.core.version>
<logback.access.version>2.0.1</logback.access.version>
<logback-core.version>1.5.6</logback-core.version>
<logback-access.version>2.0.2</logback-access.version>

<!-- shaded runtime dependencies -->
<disruptor.version>3.4.4</disruptor.version>

<!-- test dependencies -->
<assertj.version>3.24.2</assertj.version>
<awaitility.version>4.2.0</awaitility.version>
<servlet-api.version>4.0.1</servlet-api.version>
<junit.version>5.9.2</junit.version>
<mockito.version>5.1.1</mockito.version>

Expand Down Expand Up @@ -135,27 +134,17 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.core.version}</version>
<version>${logback-core.version}</version>
<!--
Required for logging regular ILoggingEvents with a Logger.
Not needed if only logging IAccessEvents for access logs.
-->
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback.access</groupId>
<artifactId>common</artifactId>
<version>${logback.access.version}</version>
<!--
Required for logging IAccessEvents for access logs.
Not needed if only logging regular ILoggingEvents with a Logger.
-->
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.core.version}</version>
<version>${logback-core.version}</version>
<!--
"provided" since users of logstash-logback-encoder must also
directly depend on logback-classic or logback-access,
Expand All @@ -164,10 +153,14 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet-api.version}</version>
<scope>test</scope>
<groupId>ch.qos.logback.access</groupId>
<artifactId>common</artifactId>
<version>${logback-access.version}</version>
<!--
Required for logging IAccessEvents for access logs.
Not needed if only logging regular ILoggingEvents with a Logger.
-->
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down Expand Up @@ -535,9 +528,9 @@
<!-- Setup links to external api docs
-->
<links>
<link>https://javadoc.io/doc/ch.qos.logback/logback-core/${logback.core.version}</link>
<link>https://javadoc.io/doc/ch.qos.logback/logback-classic/${logback.core.version}</link>
<link>https://javadoc.io/doc/ch.qos.logback.access/common/${logback.access.version}</link>
<link>https://javadoc.io/doc/ch.qos.logback/logback-core/${logback-core.version}</link>
<link>https://javadoc.io/doc/ch.qos.logback/logback-classic/${logback-core.version}</link>
<link>https://javadoc.io/doc/ch.qos.logback.access/common/${logback-access.version}</link>

<link>https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/${jackson.version}</link>
<link>https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/${jackson.version}</link>
Expand Down