[plexus-cipher] 06/07: Fixed the scope of the junit dependency in the pom

[Emmanuel Bourg]

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

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

commit 4346898a4188501b2ac3dc843d89bfb941d506de
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 24 01:42:35 2017 +0200

    Fixed the scope of the junit dependency in the pom
---
 debian/changelog                          |  1 +
 debian/control                            |  1 +
 debian/maven.cleanIgnoreRules             | 17 -----------------
 debian/maven.publishedRules               | 19 -------------------
 debian/patches/0002_fix-junit-scope.patch | 14 ++++++++++++++
 debian/patches/series                     |  1 +
 6 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0815f0..cc55f4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 plexus-cipher (1.7-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the scope of the junit dependency in the pom
   * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index e958a10..675defa 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.2)
 Build-Depends-Indep: default-jdk-doc,
                      junit,
+                     junit4,
                      libmaven-javadoc-plugin-java,
                      libplexus-container-default-java,
                      libplexus-container-default-java-doc,
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
deleted file mode 100644
index b47b61d..0000000
--- a/debian/maven.cleanIgnoreRules
+++ /dev/null
@@ -1,17 +0,0 @@
-# Maven clean ignore rules - ignore some Maven dependencies and plugins
-# during the clean phase of a Maven build
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., this dependency is then removed
-# from the POM before mvn clean is called
-#   junit junit jar s/3\\..*/3.x/
-
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
deleted file mode 100644
index 822f087..0000000
--- a/debian/maven.publishedRules
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maven published rules - additional rules to publish, to help
-# the packaging work of Debian maintainers using mh_make
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-#   in this case, elements that match are transformed using
-#   the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-#   junit junit jar s/3\\..*/3.x/
-
diff --git a/debian/patches/0002_fix-junit-scope.patch b/debian/patches/0002_fix-junit-scope.patch
new file mode 100644
index 0000000..9461688
--- /dev/null
+++ b/debian/patches/0002_fix-junit-scope.patch
@@ -0,0 +1,14 @@
+Description: Fixes the scope of the junit dependency
+ (the right scope should be inherited from the parent pom which is ignored)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -125,6 +125,7 @@
+       <groupId>junit</groupId>
+       <artifactId>junit</artifactId>
+       <version>3.8.2</version>
++      <scope>test</scope>
+     </dependency>
+   </dependencies>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d55b59d..a647c3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001_PBECipherTest.patch
+0002_fix-junit-scope.patch

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