Commit 6f0629f0 authored by Emmanuel Bourg's avatar Emmanuel Bourg

Refreshed the patches

parent 0bd2097e
......@@ -19,7 +19,7 @@ Forwarded: not-needed
</excludes>
<proc>only</proc>
</configuration>
@@ -434,6 +436,14 @@
@@ -435,6 +437,14 @@
</instructions>
</configuration>
</plugin>
......@@ -36,7 +36,7 @@ Forwarded: not-needed
<reporting>
--- a/pom.xml
+++ b/pom.xml
@@ -846,6 +846,7 @@
@@ -856,6 +856,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-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
--- 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="
......
Description: Disable the Cassandra appender (not yet in Debian)
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/log4j-nosql/pom.xml
+++ b/log4j-nosql/pom.xml
@@ -102,6 +102,14 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/cassandra/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
@@ -111,6 +119,14 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc.plugin.version}</version>
+ <configuration>
+ <excludePackageNames>*.cassandra.*</excludePackageNames>
+ </configuration>
+ </plugin>
</plugins>
</build>
<reporting>
--- a/pom.xml
+++ b/pom.xml
@@ -846,7 +846,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>
- <excludePackageNames>*.kafka.*</excludePackageNames>
+ <excludePackageNames>*.kafka.*,*.cassandra.*</excludePackageNames>
</configuration>
</plugin>
<plugin>
01-disable-kafka-appender.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