Commit c907e8d8 authored by Emmanuel Bourg's avatar Emmanuel Bourg

Refreshed the patches

parent 46b6cf93
apache-log4j2 (2.8.2-3) UNRELEASED; urgency=medium
apache-log4j2 (2.9.0-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
- Refreshed the patches
* Standards-Version updated to 4.1.3
* Switch to debhelper level 11
* Removed the Maven wrapper from the upstream tarball
......
......@@ -3,15 +3,19 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -341,6 +341,11 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler.plugin.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>**/kafka/**</exclude>
+ </excludes>
+ </configuration>
<executions>
<execution>
<!-- disable annotation processing for first pass -->
@@ -351,6 +351,7 @@
<configuration>
<excludes>
<exclude>module-info.java</exclude>
+ <exclude>**/kafka/**</exclude>
</excludes>
<proc>none</proc>
</configuration>
@@ -365,6 +366,7 @@
<configuration>
<excludes>
<exclude>module-info.java</exclude>
+ <exclude>**/kafka/**</exclude>
</excludes>
<proc>only</proc>
</configuration>
Description: Fixes the compatibility with the version of jackson in Debian
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/InputStreamLogEventBridge.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/InputStreamLogEventBridge.java
@@ -45,7 +45,7 @@
this.bufferSize = bufferSize;
this.charset = charset;
this.eventEndMarker = eventEndMarker;
- this.objectReader = mapper.readerFor(Log4jLogEvent.class);
+ this.objectReader = mapper.reader(Log4jLogEvent.class);
}
abstract protected int[] getEventIndices(final String text, int beginIndex);
......@@ -3,12 +3,12 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java
+++ b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java
@@ -162,7 +162,7 @@
if (Strings.isNotEmpty(userName) && Strings.isNotEmpty(password)) {
description += ", username=" + userName + ", passwordHash="
+ NameUtil.md5(password + MongoDbProvider.class.getName());
- credentials.add(MongoCredential.createCredential(userName, databaseName, password.toCharArray()));
+ credentials.add(MongoCredential.createMongoCRCredential(userName, databaseName, password.toCharArray()));
}
try {
final int portInt = TypeConverters.convert(port, int.class, DEFAULT_PORT);
@@ -290,7 +290,7 @@
if (Strings.isNotEmpty(userName) && Strings.isNotEmpty(password)) {
description += ", username=" + userName + ", passwordHash="
+ NameUtil.md5(password + MongoDbProvider.class.getName());
- credentials.add(MongoCredential.createCredential(userName, databaseName, password.toCharArray()));
+ credentials.add(MongoCredential.createMongoCRCredential(userName, databaseName, password.toCharArray()));
}
try {
final int portInt = TypeConverters.convert(port, int.class, DEFAULT_PORT);
01-disable-kafka-appender.patch
02-jackson-compatibility.patch
03-mongodb-compatibility.patch
04-disable-cassandra-appender.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment