[apache-log4j2] 07/15: Fixed the build failure with Java 9 (Closes: #893085)

[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 4d2db9d21005ae6334ed9685065be30c008d6c8d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Mar 16 16:39:55 2018 +0100

    Fixed the build failure with Java 9 (Closes: #893085)
---
 debian/changelog                                   |  1 +
 debian/patches/01-disable-kafka-appender.patch     | 25 +++++++++++++++++++++
 debian/patches/04-disable-cassandra-appender.patch | 26 ++++++++++++++++++++++
 3 files changed, 52 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d23b05b..e09211c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ apache-log4j2 (2.9.0-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patches
+  * Fixed the build failure with Java 9 (Closes: #893085)
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 11
   * Removed the Maven wrapper from the upstream tarball
diff --git a/debian/patches/01-disable-kafka-appender.patch b/debian/patches/01-disable-kafka-appender.patch
index 578e707..d45ddce 100644
--- a/debian/patches/01-disable-kafka-appender.patch
+++ b/debian/patches/01-disable-kafka-appender.patch
@@ -19,3 +19,28 @@ Forwarded: not-needed
                </excludes>
                <proc>only</proc>
              </configuration>
+@@ -434,6 +436,14 @@
+           </instructions>
+         </configuration>
+       </plugin>
++      <plugin>
++        <groupId>org.apache.maven.plugins</groupId>
++        <artifactId>maven-javadoc-plugin</artifactId>
++        <version>${javadoc.plugin.version}</version>
++        <configuration>
++          <excludePackageNames>*.kafka.*</excludePackageNames>
++        </configuration>
++      </plugin>
+     </plugins>
+   </build>
+   <reporting>
+--- a/pom.xml
++++ b/pom.xml
+@@ -846,6 +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>
+           </configuration>
+         </plugin>
+         <plugin>
diff --git a/debian/patches/04-disable-cassandra-appender.patch b/debian/patches/04-disable-cassandra-appender.patch
index a10b838..acf5797 100644
--- a/debian/patches/04-disable-cassandra-appender.patch
+++ b/debian/patches/04-disable-cassandra-appender.patch
@@ -18,3 +18,29 @@ Forwarded: not-needed
          <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>

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