Commit 4d2db9d2 authored by Emmanuel Bourg's avatar Emmanuel Bourg

Fixed the build failure with Java 9 (Closes: #893085)

parent c907e8d8
......@@ -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
......
......@@ -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>
......@@ -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>
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