You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2020/02/09 03:41:56 UTC
[logging-log4j2] 02/02: Fix build errors
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 2f44dc088eabbc0ceee30516187921c9d6fde88e
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sat Feb 8 20:41:42 2020 -0700
Fix build errors
---
log4j-api/revapi.json | 13 +++++++++++++
.../apache/logging/log4j/internal/DefaultLogBuilder.java | 2 ++
.../log4j/core/appender/rolling/RollingFileManagerTest.java | 6 +++---
src/changes/changes.xml | 3 +++
4 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/log4j-api/revapi.json b/log4j-api/revapi.json
index 433bdae..0c95daa 100644
--- a/log4j-api/revapi.json
+++ b/log4j-api/revapi.json
@@ -36,6 +36,19 @@
"new": "field org.apache.logging.log4j.spi.AbstractLogger.serialVersionUID",
"serialVersionUID": "2",
"justification": "LOG4J2-2639 - Add builder pattern to Logger interface"
+ },
+ {
+ "code": "java.field.serialVersionUIDChanged",
+ "new": "field org.apache.logging.log4j.internal.DefaultLogBuilder.serialVersionUID",
+ "oldSerialVersionUID": "-4931273176502023439",
+ "newSerialVersionUID": "8851553895299192531",
+ "justification": "New overloaded methods added",
+ "package": "org.apache.logging.log4j.internal",
+ "classQualifiedName": "org.apache.logging.log4j.internal.DefaultLogBuilder",
+ "classSimpleName": "DefaultLogBuilder",
+ "fieldName": "serialVersionUID",
+ "newArchive": "org.apache.logging.log4j:log4j-api:jar:2.13.1-SNAPSHOT",
+ "elementKind": "field"
}
]
}
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultLogBuilder.java b/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultLogBuilder.java
index bbabb24..0db3e70 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultLogBuilder.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultLogBuilder.java
@@ -34,6 +34,8 @@ import org.apache.logging.log4j.util.Supplier;
* Collects data for a log event and then logs it. This class should be considered private.
*/
public class DefaultLogBuilder implements LogBuilder, Serializable {
+
+ private static final long serialVersionUID = 8851553895299192531L;
private static Message EMPTY_MESSAGE = new SimpleMessage("");
private static final String FQCN = DefaultLogBuilder.class.getName();
private static final Logger LOGGER = StatusLogger.getLogger();
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManagerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManagerTest.java
index 9619a18..d134525 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManagerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManagerTest.java
@@ -66,11 +66,11 @@ public class RollingFileManagerTest {
file.deleteOnExit();
final RollingFileAppender appender = RollingFileAppender.newBuilder()
- .setFilePattern("FilePattern")
+ .withFilePattern("FilePattern")
.setName("RollingFileAppender")
.setConfiguration(config)
- .setStrategy(new CustomDirectFileRolloverStrategy(file, config.getStrSubstitutor()))
- .setPolicy(new SizeBasedTriggeringPolicy(100))
+ .withStrategy(new CustomDirectFileRolloverStrategy(file, config.getStrSubstitutor()))
+ .withPolicy(new SizeBasedTriggeringPolicy(100))
.build();
Assert.assertNotNull(appender);
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 1e90c0c..57c391e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,6 +30,9 @@
- "remove" - Removed
-->
<release version="2.13.1" date="2019-MM-DD" description="GA Release 2.13.1">
+ <action issue="LOG4J2-2758" dev="rgoers" type="fix" due-to="Christoph Kaser">
+ NullPointerException when using a custom DirectFileRolloverStrategy without a file name.
+ </action>
<action issue="LOG4J2-2768" dev="rgoers" type="fix" due-to="Marius Volkhart">
Add mulit-parameter overloads to LogBuilder.
</action>