Commit 8bb34ffe authored by Emmanuel Bourg's avatar Emmanuel Bourg

Refreshed the patches

parent daabd418
apache-log4j2 (2.11.0-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
- Refreshed the patches
-- Emmanuel Bourg <ebourg@apache.org> Sun, 22 Apr 2018 22:39:47 +0200
apache-log4j2 (2.10.0-2) unstable; urgency=medium
* Team upload.
......
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -351,6 +351,7 @@
@@ -388,6 +388,7 @@
<configuration>
<excludes>
<exclude>module-info.java</exclude>
......@@ -11,7 +11,7 @@ Forwarded: not-needed
</excludes>
<proc>none</proc>
</configuration>
@@ -365,6 +366,7 @@
@@ -402,6 +403,7 @@
<configuration>
<excludes>
<exclude>module-info.java</exclude>
......@@ -19,7 +19,7 @@ Forwarded: not-needed
</excludes>
<proc>only</proc>
</configuration>
@@ -435,6 +437,14 @@
@@ -496,6 +498,14 @@
</instructions>
</configuration>
</plugin>
......@@ -36,7 +36,7 @@ Forwarded: not-needed
<reporting>
--- a/pom.xml
+++ b/pom.xml
@@ -856,6 +856,7 @@
@@ -882,6 +882,7 @@
Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, the Apache Logging project logo,
and the Apache Log4j logo are trademarks of The Apache Software Foundation.</p>]]></bottom>
<additionalparam>${javadoc.opts}</additionalparam>
......
Description: Fixes the compatibility with the version of the MongoDB driver in Debian
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbProvider.java
+++ b/log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbProvider.java
@@ -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);
--- a/log4j-mongodb3/src/main/java/org/apache/logging/log4j/mongodb3/MongoDbProvider.java
+++ b/log4j-mongodb3/src/main/java/org/apache/logging/log4j/mongodb3/MongoDbProvider.java
@@ -172,7 +172,7 @@
if (Strings.isNotEmpty(userName) && Strings.isNotEmpty(password)) {
description += ", username=" + userName + ", passwordHash="
+ NameUtil.md5(password + MongoDbProvider.class.getName());
- mongoCredential = MongoCredential.createCredential(userName, databaseName, password.toCharArray());
+ mongoCredential = MongoCredential.createMongoCRCredential(userName, databaseName, password.toCharArray());
}
try {
final int portInt = TypeConverters.convert(port, int.class, DEFAULT_PORT);
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