Skip to content

Commit 62d4508

Browse files
committed
Update Log4j2 to v2.12.0
1 parent b7b0c23 commit 62d4508

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ plugins {
33
}
44

55
group = 'com.andrew_flower.demo'
6-
version = '1.0.0'
6+
version = '1.1.0'
77
sourceCompatibility = '1.8'
88

99
repositories {
1010
mavenCentral()
1111
}
1212

1313
dependencies {
14-
compile 'org.apache.logging.log4j:log4j-api:2.1'
15-
compile 'org.apache.logging.log4j:log4j-core:2.1'
16-
annotationProcessor 'org.apache.logging.log4j:log4j-core:2.11.1'
14+
compile 'org.apache.logging.log4j:log4j-api:2.12.0'
15+
compile 'org.apache.logging.log4j:log4j-core:2.12.0'
16+
annotationProcessor 'org.apache.logging.log4j:log4j-core:2.12.0'
1717

1818
testImplementation 'junit:junit:4.9'
1919
}

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66

77
<groupId>com.andrew_flower.demo</groupId>
88
<artifactId>blog-extending-log4j2</artifactId>
9-
<version>1.0.0</version>
9+
<version>1.1.0</version>
1010

1111
<dependencies>
1212
<dependency>
1313
<groupId>org.apache.logging.log4j</groupId>
1414
<artifactId>log4j-api</artifactId>
15-
<version>2.1</version>
15+
<version>2.12.0</version>
1616
</dependency>
1717
<dependency>
1818
<groupId>org.apache.logging.log4j</groupId>
1919
<artifactId>log4j-core</artifactId>
20-
<version>2.1</version>
20+
<version>2.12.0</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>junit</groupId>

src/test/java/com/andrew_flower/demo/util/StringAppender.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,16 @@ public class StringAppender extends AbstractOutputStreamAppender<StringAppender.
1919
private static Configuration configuration = context.getConfiguration();
2020
private StringOutputStreamManager manager;
2121

22-
private StringAppender(String name, Layout<? extends Serializable> layout, Filter filter, StringOutputStreamManager manager, boolean ignoreExceptions, boolean immediateFlush) {
23-
super(name, layout, filter, ignoreExceptions, immediateFlush, manager);
22+
private StringAppender(String name, Layout<? extends Serializable> layout, StringOutputStreamManager manager, boolean ignoreExceptions, boolean immediateFlush) {
23+
super(name, layout, null, ignoreExceptions, immediateFlush, null,manager);
2424
this.manager = manager;
2525
}
2626

27+
/**
28+
* Create a StringAppender with a given output format
29+
* @param nullablePatternString Can be {@code null}. The PatternLayout string for log output.
30+
* @return a new StringAppender
31+
*/
2732
@PluginFactory
2833
public static StringAppender createStringAppender(final String nullablePatternString) {
2934
final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -32,13 +37,14 @@ public static StringAppender createStringAppender(final String nullablePatternSt
3237
if (nullablePatternString == null) {
3338
layout = PatternLayout.createDefaultLayout();
3439
} else {
35-
layout = PatternLayout.createLayout(nullablePatternString, configuration, null, null, true, false, null, null);
40+
layout = PatternLayout.newBuilder()
41+
.withPattern(nullablePatternString)
42+
.build();
3643
}
3744

3845
return new StringAppender(
3946
"StringAppender",
4047
layout,
41-
null,
4248
new StringOutputStreamManager(outputStream, "StringStream", layout),
4349
false,
4450
true);
@@ -68,7 +74,7 @@ static class StringOutputStreamManager extends OutputStreamManager {
6874
ByteArrayOutputStream stream;
6975

7076
StringOutputStreamManager(ByteArrayOutputStream os, String streamName, Layout<?> layout) {
71-
super(os, streamName, layout);
77+
super(os, streamName, layout, false);
7278
stream = os;
7379
}
7480

0 commit comments

Comments
 (0)