Skip to content

Commit d7437bd

Browse files
committed
Bump log4j dependency (keep in sync with 1.12.2)
1 parent 3741fb4 commit d7437bd

2 files changed

Lines changed: 14 additions & 11 deletions

File tree

pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<maven.minimumVersion>3.6.3</maven.minimumVersion>
6868

6969
<!-- Dependencies versions -->
70-
<spigot.version>1.19-R0.1-SNAPSHOT</spigot.version>
70+
<spigot.version>1.19.2-R0.1-SNAPSHOT</spigot.version>
7171

7272
<!-- Versioning properties -->
7373
<project.outputName>AuthMe</project.outputName>
@@ -649,15 +649,15 @@
649649
<dependency>
650650
<groupId>org.apache.logging.log4j</groupId>
651651
<artifactId>log4j-core</artifactId>
652-
<version>2.5</version>
652+
<version>2.8.1</version> <!-- Log4J version bundled in 1.12.2 -->
653653
<scope>provided</scope>
654654
</dependency>
655655

656656
<!-- Database Connection Pool -->
657657
<dependency>
658658
<groupId>com.zaxxer</groupId>
659659
<artifactId>HikariCP</artifactId>
660-
<version>4.0.3</version>
660+
<version>4.0.3</version> <!-- Latest java 8 release -->
661661
<optional>true</optional>
662662
<exclusions>
663663
<exclusion>
@@ -670,7 +670,7 @@
670670
<dependency>
671671
<groupId>org.slf4j</groupId>
672672
<artifactId>slf4j-simple</artifactId>
673-
<version>1.7.36</version>
673+
<version>1.7.36</version> <!-- We can't update to 2.x as long as we use HikariCP for java 8 -->
674674
<optional>true</optional>
675675
</dependency>
676676

@@ -684,9 +684,9 @@
684684

685685
<!-- MySQL connector, shaded into the legacy jar -->
686686
<dependency>
687-
<groupId>mysql</groupId>
688-
<artifactId>mysql-connector-java</artifactId>
689-
<version>8.0.30</version>
687+
<groupId>com.mysql</groupId>
688+
<artifactId>mysql-connector-j</artifactId>
689+
<version>8.0.31</version>
690690
<optional>true</optional>
691691
</dependency>
692692
<dependency>

src/test/java/fr/xephi/authme/output/Log4JFilterTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
import static org.junit.Assert.assertThat;
55
import static org.mockito.Mockito.when;
66

7+
import org.apache.logging.log4j.Level;
8+
import org.apache.logging.log4j.Marker;
79
import org.apache.logging.log4j.core.Filter.Result;
810
import org.apache.logging.log4j.core.LogEvent;
11+
import org.apache.logging.log4j.core.Logger;
912
import org.apache.logging.log4j.message.Message;
1013
import org.junit.Test;
1114
import org.mockito.Mockito;
@@ -134,7 +137,7 @@ public void shouldReturnNeutralForNullMessage() {
134137
@Test
135138
public void shouldFilterSensitiveObjectMessage() {
136139
// given / when
137-
Result result = log4JFilter.filter(null, null, null, SENSITIVE_COMMAND, new Exception());
140+
Result result = log4JFilter.filter(null, null, null, (Object) SENSITIVE_COMMAND, new Exception());
138141

139142
// then
140143
assertThat(result, equalTo(Result.DENY));
@@ -152,7 +155,7 @@ public void shouldNotFilterNullObjectParam() {
152155
@Test
153156
public void shouldNotFilterIrrelevantMessage() {
154157
// given / when
155-
Result result = log4JFilter.filter(null, null, null, OTHER_COMMAND, new Exception());
158+
Result result = log4JFilter.filter(null, null, null, (Object) OTHER_COMMAND, new Exception());
156159

157160
// then
158161
assertThat(result, equalTo(Result.NEUTRAL));
@@ -161,7 +164,7 @@ public void shouldNotFilterIrrelevantMessage() {
161164
@Test
162165
public void shouldNotFilterNonSensitiveCommand() {
163166
// given / when
164-
Result result = log4JFilter.filter(null, null, null, NORMAL_COMMAND, new Exception());
167+
Result result = log4JFilter.filter(null, null, null, (Object) NORMAL_COMMAND, new Exception());
165168

166169
// then
167170
assertThat(result, equalTo(Result.NEUTRAL));
@@ -209,7 +212,7 @@ public void shouldNotFilterNonCommandMessage() {
209212
@Test
210213
public void shouldNotFilterNullMessage() {
211214
// given / when
212-
Result result = log4JFilter.filter(null, null, null, null, new Exception());
215+
Result result = log4JFilter.filter(null, null, null, (Object) null, new Exception());
213216

214217
// then
215218
assertThat(result, equalTo(Result.NEUTRAL));

0 commit comments

Comments
 (0)