[apache-log4j2] 08/15: Build the new log4j-api-java9 module

[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 86a1dbb7098098c7d68e620673184c8ffe38904e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Mar 16 16:41:52 2018 +0100

    Build the new log4j-api-java9 module
---
 debian/changelog           | 1 +
 debian/control             | 3 +++
 debian/liblog4j2-java.poms | 3 +--
 debian/maven.rules         | 1 +
 debian/rules               | 2 ++
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e09211c..beec87d 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
+    - Build the new log4j-api-java9 module
   * Fixed the build failure with Java 9 (Closes: #893085)
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 11
diff --git a/debian/control b/debian/control
index 370c7de..698a84b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends:
  groovy,
  libapache-pom-java (>= 10),
  libbsh-java,
+ libbuild-helper-maven-plugin-java,
  libcommons-compress-java,
  libcommons-csv-java (>= 1.2),
  libcommons-lang3-java,
@@ -29,7 +30,9 @@ Build-Depends:
  libjpa-2.1-spec-java,
  liblightcouch-java,
  libmail-java,
+ libmaven-assembly-plugin-java,
  libmaven-bundle-plugin-java,
+ libmaven-dependency-plugin-java,
  libmaven-exec-plugin-java,
  libmaven-install-plugin-java,
  libmaven-javadoc-plugin-java,
diff --git a/debian/liblog4j2-java.poms b/debian/liblog4j2-java.poms
index 74ce8ad..1eff1f5 100644
--- a/debian/liblog4j2-java.poms
+++ b/debian/liblog4j2-java.poms
@@ -27,8 +27,7 @@
 #
 pom.xml --no-parent --has-package-version
 log4j-api/pom.xml --has-package-version --java-lib
-log4j-api-scala_2.10/pom.xml --ignore
-log4j-api-scala_2.11/pom.xml --ignore
+log4j-api-java9/pom.xml --has-package-version --java-lib
 log4j-core/pom.xml --has-package-version --java-lib
 log4j-core-its/pom.xml --ignore
 log4j-1.2-api/pom.xml --has-package-version --java-lib
diff --git a/debian/maven.rules b/debian/maven.rules
index ab782cb..8b67c33 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -22,3 +22,4 @@ s/org\.jboss\.spec\.javax\.jms/org.apache.geronimo.specs/ s/jboss-jms-api_1\.1_s
 s/org.apache-extras.beanshell/org.beanshell/ bsh * s/.*/debian/ * *
 s/com.fasterxml.woodstox/org.codehaus.woodstox/ s/woodstox-core/woodstox-core-lgpl/ * s/.*/debian/ * *
 com.conversantmedia disruptor * s/.*/debian/ s/.*// *
+org.apache.logging.log4j log4j-api-java9 zip * * *
diff --git a/debian/rules b/debian/rules
index 89a8463..15bf207 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 %:
 	dh $@
 
+override_dh_auto_test:
+
 override_dh_installchangelogs:
 	dh_installchangelogs RELEASE-NOTES.md
 

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