Skip to content

Commit 11b49a1

Browse files
committed
docs:update GitHub Actions.
1 parent f76c290 commit 11b49a1

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

polaris-common/polaris-logging/src/main/java/com/tencent/polaris/logging/logback/PolarisJoranConfigurator.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import ch.qos.logback.classic.joran.JoranConfigurator;
2121
import ch.qos.logback.core.joran.event.SaxEvent;
2222
import ch.qos.logback.core.joran.spi.JoranException;
23+
import ch.qos.logback.core.model.Model;
2324

2425
import java.io.IOException;
2526
import java.io.InputStream;
@@ -32,10 +33,22 @@
3233
*/
3334
public class PolarisJoranConfigurator extends JoranConfigurator {
3435

35-
@Override
36+
/**
37+
* Override when using 1.12.x.
38+
*
39+
* @param eventList
40+
*/
3641
public void registerSafeConfiguration(List<SaxEvent> eventList) {
3742
}
3843

44+
/**
45+
* Override when using 1.13.x.
46+
*
47+
* @param top
48+
*/
49+
public void registerSafeConfiguration(Model top) {
50+
}
51+
3952
public void doPolarisConfigure(URL url) throws JoranException {
4053
InputStream in = null;
4154
try {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<commons.codec.version>1.15</commons.codec.version>
9090
<guava.version>32.0.1-jre</guava.version>
9191
<slf4j.version>1.7.25</slf4j.version>
92-
<logback.version>1.2.13</logback.version>
92+
<logback.version>1.3.15</logback.version>
9393
<log4j2.version>2.19.0</log4j2.version>
9494
<disruptor.version>3.4.4</disruptor.version>
9595
<log4j.version>1.2.17</log4j.version>

0 commit comments

Comments
 (0)