[maven-replacer-plugin] 05/06: 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 maven-replacer-plugin.

commit 589cf2ad44c453ab51765de63ee61c6d77a6602b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 2 11:28:25 2017 +0200

    Enabled the unit tests
---
 debian/changelog                               |  1 +
 debian/control                                 |  2 ++
 debian/maven.ignoreRules                       |  3 ---
 debian/maven.properties                        |  3 ++-
 debian/maven.rules                             |  1 +
 debian/patches/01-hamcrest-compatibility.patch | 14 ++++++++++++++
 debian/patches/series                          |  1 +
 7 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c53c59b..5e59c50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ maven-replacer-plugin (1.5.3-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Depend on libmaven3-core-java instead of libmaven2-core-java
+  * Enabled the unit tests
   * 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 35971d8..caadd08 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,12 @@ Uploaders: Timo Aaltonen <tjaalton at debian.org>
 Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 1.5)
 Build-Depends-Indep:
  ant,
+ junit4,
  libcommons-io-java,
  libcommons-lang-java (>= 2.6),
  libmaven-plugin-tools-java (>= 3.2),
  libmaven3-core-java,
+ libmockito-java,
  libxerces2-java
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-replacer-plugin.git
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 8d52247..774f957 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,7 +1,4 @@
 
-junit junit * * * *
 org.apache.maven.plugins maven-pmd-plugin * * * *
 org.apache.maven.plugins maven-release-plugin * * * *
 org.codehaus.mojo dashboard-maven-plugin * * * *
-org.hamcrest hamcrest-all * * * *
-org.mockito mockito-all * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
index 242da7e..2b5a5e6 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -2,5 +2,6 @@
 # For example:
 # maven.test.skip=true
 
-maven.test.skip=true
+maven.test.skip=false
 project.build.sourceEncoding=UTF-8
+user.home=.
diff --git a/debian/maven.rules b/debian/maven.rules
index 4fd42e3..5d2f05d 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,3 +1,4 @@
 
+junit junit * s/.*/4.x/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
 org.apache.maven maven-plugin-api * s/.*/3.x/ * *
diff --git a/debian/patches/01-hamcrest-compatibility.patch b/debian/patches/01-hamcrest-compatibility.patch
new file mode 100644
index 0000000..5db2656
--- /dev/null
+++ b/debian/patches/01-hamcrest-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fixes the compatibility with the version of Hamcrest in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/test/java/com/google/code/maven_replacer_plugin/file/FileUtilsTest.java
++++ b/src/test/java/com/google/code/maven_replacer_plugin/file/FileUtilsTest.java
+@@ -5,7 +5,7 @@
+ import static org.hamcrest.MatcherAssert.assertThat;
+ import static org.hamcrest.Matchers.equalTo;
+ import static org.hamcrest.Matchers.not;
+-import static org.hamcrest.text.StringStartsWith.startsWith;
++import static org.hamcrest.core.StringStartsWith.startsWith;
+ import static org.junit.Assert.assertFalse;
+ import static org.junit.Assert.assertTrue;
+ import static org.junit.Assert.fail;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b7bce57
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-hamcrest-compatibility.patch

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