[apache-log4j2] 11/15: Refreshed the patches

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository apache-log4j2.

commit 6f0629f0e367e2859f58856c9bb8494332e06ae4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Mar 16 16:45:26 2018 +0100

    Refreshed the patches
---
 debian/patches/01-disable-kafka-appender.patch     |  4 +-
 debian/patches/03-mongodb-compatibility.patch      |  4 +-
 debian/patches/04-disable-cassandra-appender.patch | 46 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/debian/patches/01-disable-kafka-appender.patch b/debian/patches/01-disable-kafka-appender.patch
index d45ddce..78813a0 100644
--- a/debian/patches/01-disable-kafka-appender.patch
+++ b/debian/patches/01-disable-kafka-appender.patch
@@ -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>
diff --git a/debian/patches/03-mongodb-compatibility.patch b/debian/patches/03-mongodb-compatibility.patch
index d098e04..3fef463 100644
--- a/debian/patches/03-mongodb-compatibility.patch
+++ b/debian/patches/03-mongodb-compatibility.patch
@@ -1,8 +1,8 @@
 Description: Fixes the compatibility with the version of the MongoDB driver in Debian
 Author: Emmanuel Bourg <ebourg at 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="
diff --git a/debian/patches/04-disable-cassandra-appender.patch b/debian/patches/04-disable-cassandra-appender.patch
deleted file mode 100644
index acf5797..0000000
--- a/debian/patches/04-disable-cassandra-appender.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: Disable the Cassandra appender (not yet in Debian)
-Author: Emmanuel Bourg <ebourg at 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>
diff --git a/debian/patches/series b/debian/patches/series
index fb14a38..4bc3086 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-disable-kafka-appender.patch
 03-mongodb-compatibility.patch
-04-disable-cassandra-appender.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-log4j2.git