[antlr3.2] 02/03: Fixed the dependency cycle between antlr and antlr-maven-plugin

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository antlr3.2.

commit 282e9dffa5af0d7ecada3e84bf2d4100f5c3f6d7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 14 16:17:32 2015 +0100

    Fixed the dependency cycle between antlr and antlr-maven-plugin
---
 debian/changelog                            |  1 +
 debian/patches/01-ignore-antlr-plugin.patch | 21 +++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 26bc8d8..34580e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 antlr3.2 (3.2-14) UNRELEASED; urgency=medium
 
   * Use the plexus-compiler-api 2.x to fix a build failure with Maven 3
+  * Fixed the dependency cycle between antlr and antlr-maven-plugin
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 14 Dec 2015 15:36:17 +0100
 
diff --git a/debian/patches/01-ignore-antlr-plugin.patch b/debian/patches/01-ignore-antlr-plugin.patch
new file mode 100644
index 0000000..4d0285d
--- /dev/null
+++ b/debian/patches/01-ignore-antlr-plugin.patch
@@ -0,0 +1,21 @@
+Description: Disable the antlr plugin for the tool module only. The generated source files are already in debian/generated-sources
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/tool/pom.xml
++++ b/tool/pom.xml
+@@ -55,6 +55,7 @@
+          
+         <plugins>
+             
++<!--
+             <plugin>
+ 
+                 <groupId>org.antlr</groupId>
+@@ -74,6 +75,7 @@
+                 
+             </plugin>
+             
++-->
+             <plugin>
+                 <groupId>org.codehaus.mojo</groupId>
+                 <artifactId>antlr-maven-plugin</artifactId>
diff --git a/debian/patches/series b/debian/patches/series
index e071037..72d9f66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+01-ignore-antlr-plugin.patch
 java7-compat.patch
 java8-compat.patch

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