[felix-resolver] 03/03: 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 felix-resolver.

commit ef8bce763176397f6b1752bf4de4fe27d50cc9ac
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Mar 7 23:13:35 2018 +0100

    Enabled the unit tests
---
 debian/control                                    |  3 ++-
 debian/maven.ignoreRules                          |  1 -
 debian/maven.properties                           |  1 -
 debian/maven.rules                                |  2 ++
 debian/patches/01-missing-test-dependencies.patch | 18 ++++++++++++++++++
 debian/patches/series                             |  1 +
 6 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 38d867f..9511a02 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends:
  debhelper (>= 11),
  default-jdk-headless,
  libmaven-bundle-plugin-java,
+ libmockito-java,
  libosgi-core-java (>= 6.0.0),
  maven-debian-helper (>= 2.0)
 Standards-Version: 4.1.3
@@ -28,4 +29,4 @@ Description: OSGi Resolver implementation by Apache Felix
  principles to define a dynamic service deployment framework that is amenable
  to remote management.
  .
- This package provides the Resolver subproject.
\ No newline at end of file
+ This package provides the Resolver subproject.
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index fb6855b..76ec1a3 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -16,4 +16,3 @@
 
 org.apache.maven.plugins maven-javadoc-plugin * * * *
 org.apache.rat apache-rat-plugin * * * *
-junit junit * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
index e50b495..8052d08 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,3 +1,2 @@
 # Include here properties to pass to Maven during the build.
-maven.test.skip=true
 project.build.sourceEncoding=UTF-8
diff --git a/debian/maven.rules b/debian/maven.rules
index 548c579..7afc774 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -15,3 +15,5 @@
 # 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/
+
+junit junit jar s/.*/4.x/
diff --git a/debian/patches/01-missing-test-dependencies.patch b/debian/patches/01-missing-test-dependencies.patch
new file mode 100644
index 0000000..7d7e0bd
--- /dev/null
+++ b/debian/patches/01-missing-test-dependencies.patch
@@ -0,0 +1,18 @@
+Description: Adds the missing test dependencies that should be inherited from the (ignored) parent pom
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -49,6 +49,12 @@
+       <scope>test</scope>
+     </dependency>
+     <dependency>
++      <groupId>org.mockito</groupId>
++      <artifactId>mockito-core</artifactId>
++      <version>debian</version>
++      <scope>test</scope>
++    </dependency>
++    <dependency>
+       <groupId>org.apache.felix</groupId>
+       <artifactId>org.apache.felix.utils</artifactId>
+       <version>1.8.0</version>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..912d020
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-missing-test-dependencies.patch

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