[maven] 06/07: Removed the unused patch no_maven_assembly.diff

[Emmanuel Bourg]

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

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

commit 2c0c5e6b6eb82a63e8f4d689293a9a02537d7944
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 9 10:46:43 2015 +0200

    Removed the unused patch no_maven_assembly.diff
---
 debian/maven.ignoreRules              |  2 +-
 debian/patches/no_maven_assembly.diff | 34 ----------------------------------
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 97d393d..5480b0e 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,4 +1,4 @@
 org.codehaus.mojo animal-sniffer-maven-plugin * * * *
 org.codehaus.mojo buildnumber-maven-plugin * * * *
-org.apache.maven maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-assembly-plugin * * * *
 org.apache.rat apache-rat-plugin * * * *
diff --git a/debian/patches/no_maven_assembly.diff b/debian/patches/no_maven_assembly.diff
deleted file mode 100644
index c8df0c7..0000000
--- a/debian/patches/no_maven_assembly.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/apache-maven/pom.xml
-+++ b/apache-maven/pom.xml
-@@ -148,6 +148,7 @@
-           </execution>
-         </executions>
-       </plugin>
-+<!--
-       <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-assembly-plugin</artifactId>
-@@ -166,6 +167,7 @@
-           </execution>
-         </executions>
-       </plugin>
-+-->
-     </plugins>
-   </build>
- 
---- a/pom.xml
-+++ b/pom.xml
-@@ -414,11 +414,13 @@
-           <artifactId>maven-bundle-plugin</artifactId>
-           <version>1.0.0</version>
-         </plugin>
-+<!--
-         <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-assembly-plugin</artifactId>
-           <version>2.4</version>
-         </plugin>
-+-->
-         <plugin>
-           <groupId>org.codehaus.mojo</groupId>
-           <artifactId>buildnumber-maven-plugin</artifactId>

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