[apache-log4j2] 04/05: Disabled the new Kafka appender

[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 459ab5fcf190011ecdb7c1e299dbc1425001bfee
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 22 19:44:09 2015 +0200

    Disabled the new Kafka appender
---
 debian/changelog                               |  1 +
 debian/maven.ignoreRules                       | 10 +++++-----
 debian/patches/01-disable-kafka-appender.patch | 17 +++++++++++++++++
 debian/patches/series                          |  1 +
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5fbe9f5..4861291 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ apache-log4j2 (2.4-1) UNRELEASED; urgency=medium
     - New dependencies on libcommons-compress-java, libcommons-csv-java
       and libjeromq-java
     - Ignore the new liquibase module
+    - Disabled the new Kafka appender
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 18 Oct 2015 22:32:22 +0200
 
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 1137e8f..78800d3 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -13,22 +13,26 @@ commons-httpclient commons-httpclient * * * *
 javax.jmdns jmdns * * * *
 junit junit * * * *
 log4j log4j * * * *
+net.javacrumbs.json-unit json-unit * * * *
+org.apache.activemq activemq-broker * * * *
 org.apache.felix org.apache.felix.framework * * * *
+org.apache.kafka kafka-clients * * * *
 org.apache.maven maven-core * * * *
 org.apache.maven.plugins maven-changes-plugin * * * *
 org.apache.maven.plugins maven-checkstyle-plugin * * * *
+org.apache.maven.plugins maven-failsafe-plugin * * * *
 org.apache.maven.plugins maven-jxr-plugin * * * *
 org.apache.maven.plugins maven-pdf-plugin * * * *
 org.apache.maven.plugins maven-pmd-plugin * * * *
 org.apache.maven.plugins maven-project-info-reports-plugin * * * *
 org.apache.maven.plugins maven-remote-resources-plugin * * * *
 org.apache.maven.plugins maven-surefire-plugin * * * *
-org.apache.maven.plugins maven-failsafe-plugin * * * *
 org.apache.maven.wagon wagon-ssh * * * *
 org.apache.rat apache-rat-plugin * * * *
 org.apache.velocity velocity * * * *
 org.codehaus.mojo cobertura-maven-plugin * * * *
 org.codehaus.mojo findbugs-maven-plugin * * * *
+org.codehaus.woodstox woodstox-core-asl * * * *
 org.easymock easymock * * * *
 org.eclipse.osgi org.eclipse.osgi * * * *
 org.eclipse.persistence org.eclipse.persistence.jpa * * * *
@@ -36,7 +40,3 @@ org.hsqldb hsqldb * * * *
 org.mockejb mockejb * * * *
 org.slf4j slf4j-ext * * * *
 org.springframework spring-test * * * *
-org.codehaus.woodstox woodstox-core-asl * * * *
-net.javacrumbs.json-unit json-unit * * * *
-org.apache.activemq activemq-broker * * * *
-
diff --git a/debian/patches/01-disable-kafka-appender.patch b/debian/patches/01-disable-kafka-appender.patch
new file mode 100644
index 0000000..031d677
--- /dev/null
+++ b/debian/patches/01-disable-kafka-appender.patch
@@ -0,0 +1,17 @@
+Description: Disable the Kafka appender (not yet in Debian)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/log4j-core/pom.xml
++++ b/log4j-core/pom.xml
+@@ -267,6 +267,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 -->
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..037b703
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-disable-kafka-appender.patch

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