[apache-log4j2] 04/07: Disabled the Cassandra appender (missing dependencies)

[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 43d6bb78f7ff8b018ffe030535466081ae6aa1d5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jun 21 12:54:13 2017 +0200

    Disabled the Cassandra appender (missing dependencies)
---
 debian/changelog                                   |  1 +
 debian/maven.ignoreRules                           |  2 ++
 debian/patches/04-disable-cassandra-appender.patch | 20 ++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0ddbf51..df8d8ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ apache-log4j2 (2.8.2-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patches
     - Ignore the new test modules log4j-osgi and log4j-core-its
+    - Disabled the Cassandra appender (missing dependencies)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 21 Jun 2017 12:10:30 +0200
 
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 4c53c1d..aac7e37 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,4 +1,5 @@
 
+org.apache.cassandra cassandra-all * * * *
 org.apache.logging.log4j log4j-api test-jar * * *
 org.apache.logging.log4j log4j-core test-jar * * *
 org.apache.logging.log4j log4j-flume-ng jar * * *
@@ -8,6 +9,7 @@ org.apache.logging.log4j.osgi log4j-osgi pom * * *
 org.apache.logging.log4j.samples log4j-samples pom * * *
 ch.qos.logback logback-classic * * * *
 ch.qos.logback logback-core * * * *
+com.datastax.cassandra cassandra-driver-core * * * *
 com.google.code.java-allocation-instrumenter java-allocation-instrumenter * * * *
 com.h2database h2 * * * *
 commons-httpclient commons-httpclient * * * *
diff --git a/debian/patches/04-disable-cassandra-appender.patch b/debian/patches/04-disable-cassandra-appender.patch
new file mode 100644
index 0000000..a10b838
--- /dev/null
+++ b/debian/patches/04-disable-cassandra-appender.patch
@@ -0,0 +1,20 @@
+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>
diff --git a/debian/patches/series b/debian/patches/series
index a5195ad..81b6fa2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-disable-kafka-appender.patch
 02-jackson-compatibility.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