[libhibernate-validator-java] 10/14: Worked around a maven-repo-helper bug with plugin dependencies

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libhibernate-validator-java.

commit ab46de459d402fcc67c6072dbc27900bc04d889e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 31 22:32:31 2016 +0200

    Worked around a maven-repo-helper bug with plugin dependencies
---
 debian/changelog                                   |  1 +
 .../01-workaround-maven-repo-helper-bug.patch      | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 644c200..792f9bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libhibernate-validator-java (4.3.2-1) UNRELEASED; urgency=medium
     - New dependency on libjboss-logging-tools-java
     - Removed jaxb-binding-fixes.patch (fixed upstream)
     - Updated the build for the new project layout
+    - Worked around a maven-repo-helper bug with plugin dependencies
   * Added the missing Maven rule for log4j
   * Standards-Version updated to 3.9.7 (no changes)
   * Use a secure Vcs-Git URL
diff --git a/debian/patches/01-workaround-maven-repo-helper-bug.patch b/debian/patches/01-workaround-maven-repo-helper-bug.patch
new file mode 100644
index 0000000..ec97fbf
--- /dev/null
+++ b/debian/patches/01-workaround-maven-repo-helper-bug.patch
@@ -0,0 +1,24 @@
+Description: Work around the maven-repo-helper bug #802907. When two plugins have
+ dependencies, if the first plugin is ignored the dependencies of the second
+ plugin are replaced by the ones of the first plugin. Here the maven-jdocbook-plugin
+ dependency (hibernate-jdocbook-style) replaces the maven-processor-plugin
+ dependency (jboss-logging-processor) and breaks the build.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -298,14 +298,6 @@
+                     <artifactId>maven-jdocbook-plugin</artifactId>
+                     <version>2.3.5</version>
+                     <extensions>true</extensions>
+-                    <dependencies>
+-                        <dependency>
+-                            <groupId>org.hibernate</groupId>
+-                            <artifactId>hibernate-jdocbook-style</artifactId>
+-                            <version>2.0.1</version>
+-                            <type>jdocbook-style</type>
+-                        </dependency>
+-                    </dependencies>
+                 </plugin>
+                 <plugin>
+                     <groupId>org.apache.maven.plugins</groupId>
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..65f17a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-workaround-maven-repo-helper-bug.patch

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