[doxia] 10/15: Replaced the patch removing the dependency on doxia-core:test-jar with a Maven rule

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to annotated tag debian/1.1.4-3
in repository doxia.

commit 0165c39b55af3ea96346cf7f6220be1841bd2c53
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 5 12:57:05 2015 +0200

    Replaced the patch removing the dependency on doxia-core:test-jar with a Maven rule
---
 debian/changelog                                   |  2 +
 debian/maven.ignoreRules                           |  1 +
 .../patches/0004-remove-doxia-core-test-jar.patch  | 46 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c00651b..3bef888 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ doxia (1.1.4-3) UNRELEASED; urgency=medium
   * Removed the build dependency libclirr-maven-plugin-java
   * Replaced the patch disabling doxia-maven-plugin with a --ignore flag
     in debian/libdoxia-java.poms
+  * Replaced the patch removing the dependency on doxia-core:test-jar
+    with a Maven rule
   * Moved the package to Git
   * Standards-Version updated to 3.9.6 (no changes)
   * Switch to debhelper level 9
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 25f29c2..3372926 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -16,3 +16,4 @@
 
 org.apache.maven.plugins maven-project-info-reports-plugin * * * *
 org.codehaus.mojo clirr-maven-plugin * * * *
+org.apache.maven.doxia doxia-core test-jar * * *
diff --git a/debian/patches/0004-remove-doxia-core-test-jar.patch b/debian/patches/0004-remove-doxia-core-test-jar.patch
deleted file mode 100644
index 2c27cf3..0000000
--- a/debian/patches/0004-remove-doxia-core-test-jar.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Sat, 10 Sep 2011 00:09:54 +0200
-Subject: remove doxia-core test-jar
-
-There are issues with finding the artifact.
----
- doxia-book/pom.xml    |    7 -------
- doxia-modules/pom.xml |    7 -------
- 2 files changed, 0 insertions(+), 14 deletions(-)
-
-diff --git a/doxia-book/pom.xml b/doxia-book/pom.xml
-index 4e9ea7a..94b5dac 100644
---- a/doxia-book/pom.xml
-+++ b/doxia-book/pom.xml
-@@ -85,13 +85,6 @@ under the License.
-       <artifactId>plexus-utils</artifactId>
-     </dependency>
- 
--    <!-- test -->
--    <dependency>
--      <groupId>org.apache.maven.doxia</groupId>
--      <artifactId>doxia-core</artifactId>
--      <type>test-jar</type>
--      <scope>test</scope>
--    </dependency>
-   </dependencies>
- 
-   <build>
-diff --git a/doxia-modules/pom.xml b/doxia-modules/pom.xml
-index eed8abc..1fa8d8b 100644
---- a/doxia-modules/pom.xml
-+++ b/doxia-modules/pom.xml
-@@ -57,12 +57,5 @@ under the License.
-       <artifactId>doxia-sink-api</artifactId>
-     </dependency>
- 
--    <!-- test -->
--    <dependency>
--      <groupId>org.apache.maven.doxia</groupId>
--      <artifactId>doxia-core</artifactId>
--      <type>test-jar</type>
--      <scope>test</scope>
--    </dependency>
-   </dependencies>
- </project>
--- 
diff --git a/debian/patches/series b/debian/patches/series
index d8462e9..9f7e991 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 0001-modello.patch
 0002-add-version-to-plexus-container-default.patch
 0003-switch-to-plexus-component-metadata.patch
-0004-remove-doxia-core-test-jar.patch
 0006-specificy-source-and-target-version.patch
 0007-disable-plexus-javadoc.patch

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