[apache-log4j2] 05/07: Updated the Maven rules

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

    Updated the Maven rules
---
 debian/changelog           | 1 +
 debian/liblog4j2-java.poms | 4 ++--
 debian/maven.ignoreRules   | 5 ++++-
 debian/maven.rules         | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index df8d8ae..d5c182e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ apache-log4j2 (2.8.2-1) UNRELEASED; urgency=medium
     - Refreshed the patches
     - Ignore the new test modules log4j-osgi and log4j-core-its
     - Disabled the Cassandra appender (missing dependencies)
+    - Updated the Maven rules
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 21 Jun 2017 12:10:30 +0200
 
diff --git a/debian/liblog4j2-java.poms b/debian/liblog4j2-java.poms
index 8c8e0b0..74ce8ad 100644
--- a/debian/liblog4j2-java.poms
+++ b/debian/liblog4j2-java.poms
@@ -25,7 +25,7 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --has-package-version
+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
@@ -39,8 +39,8 @@ log4j-flume-ng/pom.xml --ignore
 log4j-taglib/pom.xml --ignore
 log4j-jmx-gui/pom.xml --ignore
 log4j-samples/pom.xml --ignore
-log4j-bom/pom.xml --has-package-version
 log4j-osgi/pom.xml --ignore
+log4j-bom/pom.xml --no-parent --has-package-version
 log4j-nosql/pom.xml --has-package-version --java-lib
 log4j-web/pom.xml --has-package-version --java-lib
 log4j-jul/pom.xml --has-package-version --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index aac7e37..7a9c81c 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -4,6 +4,7 @@ org.apache.logging.log4j log4j-api test-jar * * *
 org.apache.logging.log4j log4j-core test-jar * * *
 org.apache.logging.log4j log4j-flume-ng jar * * *
 org.apache.logging.log4j log4j-jmx-gui jar * * *
+org.apache.logging.log4j log4j-slf4j-impl jar * * *
 org.apache.logging.log4j log4j-taglib jar * * *
 org.apache.logging.log4j.osgi log4j-osgi pom * * *
 org.apache.logging.log4j.samples log4j-samples pom * * *
@@ -38,11 +39,13 @@ 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.tycho org.eclipse.osgi * * * *
 org.eclipse.persistence org.eclipse.persistence.jpa * * * *
+org.jmdns jmdns * * * *
 org.hdrhistogram HdrHistogram * * * *
 org.hsqldb hsqldb * * * *
 org.mockejb mockejb * * * *
+org.mockito mockito-core * * * *
 org.slf4j slf4j-ext * * * *
 org.springframework spring-test * * * *
 org.tukaani xz * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 0dfc892..ab782cb 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -21,3 +21,4 @@ org.apache.commons commons-lang3 jar s/3\..*/3.x/ * *
 s/org\.jboss\.spec\.javax\.jms/org.apache.geronimo.specs/ s/jboss-jms-api_1\.1_spec/geronimo-jms_1.1_spec/ * s/.*/debian/ * *
 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/.*// *

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