[build-helper-maven-plugin] 19/21: Enabled the unit tests

[Emmanuel Bourg]

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

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

commit 8e900c79ee8e8760bc105594619d08381333fe19
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 20 01:24:12 2017 +0200

    Enabled the unit tests
---
 debian/changelog                             |  1 +
 debian/maven.properties                      |  2 +-
 debian/maven.rules                           |  3 ++-
 debian/patches/02-add-junit-dependency.patch | 18 ++++++++++++++++++
 debian/patches/series                        |  1 +
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5430eec..6a9c4ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ build-helper-maven-plugin (3.0.0-1) UNRELEASED; urgency=medium
     - New dependency on libmaven-file-management-java
     - New build dependency on libassertj-core-java and testng
     - Depend on libmaven3-core-java instead of libmaven2-core-java
+  * Enabled the unit tests
   * Build with the DH sequencer instead of CDBS
   * Track and download the new releases from GitHub
   * Removed the -java-doc package
diff --git a/debian/maven.properties b/debian/maven.properties
index 240d3bd..6510e39 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,5 +1,5 @@
 # Include here properties to pass to Maven during the build.
-maven.test.skip=true
+maven.test.skip=false
 maven.compiler.source=1.5
 maven.compiler.target=1.5
 project.build.sourceEncoding=UTF-8
diff --git a/debian/maven.rules b/debian/maven.rules
index 80d62d5..e5a721f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,4 +1,5 @@
- org.testng testng * s/.*/6.x/ * *
+junit junit * s/.*/4.x/ * *
+org.testng testng * s/.*/6.x/ * *
 org.apache.maven maven-compat * s/.*/3.x/ * *
 org.apache.maven maven-core * s/.*/3.x/ * *
 org.apache.maven maven-plugin-api * s/.*/3.x/ * *
diff --git a/debian/patches/02-add-junit-dependency.patch b/debian/patches/02-add-junit-dependency.patch
new file mode 100644
index 0000000..771b065
--- /dev/null
+++ b/debian/patches/02-add-junit-dependency.patch
@@ -0,0 +1,18 @@
+Description: Adds the missing junit dependency which should be inherited from the (ignored) parent pom
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -125,6 +125,12 @@
+       <version>1.7.1</version>
+       <scope>test</scope>
+     </dependency>
++    <dependency>
++      <groupId>junit</groupId>
++      <artifactId>junit</artifactId>
++      <version>4.12</version>
++      <scope>test</scope>
++    </dependency>
+   </dependencies>
+ 
+   <build>
diff --git a/debian/patches/series b/debian/patches/series
index 09d1b63..efb9e70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-maven-compatibility.patch
+02-add-junit-dependency.patch

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