[plexus-classworlds] 06/10: Enabled the unit tests
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Sep 21 15:37:40 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository plexus-classworlds.
commit 9064c565c63a71ccca45c296b6cbfd568e820e62
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Sep 21 15:30:24 2017 +0200
Enabled the unit tests
---
debian/changelog | 1 +
debian/control | 5 ++-
debian/maven.ignoreRules | 1 -
debian/maven.properties | 2 +-
debian/maven.rules | 1 +
debian/patches/01-tests.patch | 72 +++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
7 files changed, 80 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index de1d161..455a6fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ plexus-classworlds2 (2.5.2-2) UNRELEASED; urgency=medium
* Team upload.
* Build with maven-debian-helper instead of maven-ant-helper
+ * Enabled the unit tests
* Standards-Version updated to 4.1.0
* Switch to debhelper level 10
* Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index d4d8f13..390b151 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,14 @@ Uploaders:
Ludovic Claude <ludovic.claude at laposte.net>,
Damien Raude-Morvan <drazzib at debian.org>
Build-Depends:
- ant-optional,
+ ant,
debhelper (>= 10),
default-jdk,
default-jdk-doc,
+ libcommons-logging-java,
+ libjaxp1.3-java,
libmaven-bundle-plugin-java,
+ libmaven-dependency-plugin-java,
libmaven-javadoc-plugin-java,
maven-debian-helper (>= 2.2)
Standards-Version: 4.1.0
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index dfdeabe..aa95fef 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -14,7 +14,6 @@
# from the POM
# junit junit jar s/3\\..*/3.x/
-org.apache.maven.plugins maven-dependency-plugin * * * *
org.apache.maven.plugins maven-enforcer-plugin * * * *
org.apache.maven.plugins maven-release-plugin * * * *
org.apache.maven.plugins maven-scm-publish-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
index e593715..4e30f34 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -2,4 +2,4 @@
# For example:
# maven.test.skip=true
-maven.test.skip=true
+maven.test.skip=false
diff --git a/debian/maven.rules b/debian/maven.rules
index 9054674..51490ce 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,5 +16,6 @@
# and version starting with 3., replacing the version with 3.x
# junit junit jar s/3\\..*/3.x/
+junit junit jar s/.*/4.x/ * *
org.codehaus.plexus plexus-classworlds * s/2\..*/2.x/ * *
org.codehaus.plexus plexus pom s/2\..*/2.x/ * *
diff --git a/debian/patches/01-tests.patch b/debian/patches/01-tests.patch
new file mode 100644
index 0000000..735dddc
--- /dev/null
+++ b/debian/patches/01-tests.patch
@@ -0,0 +1,72 @@
+Description: Tweaks for running the unit tests
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -46,6 +46,15 @@
+ </site>
+ </distributionManagement>
+
++ <dependencies>
++ <dependency>
++ <groupId>junit</groupId>
++ <artifactId>junit</artifactId>
++ <version>4.12</version>
++ <scope>test</scope>
++ </dependency>
++ </dependencies>
++
+ <build>
+ <pluginManagement>
+ <plugins>
+@@ -137,17 +146,17 @@
+ <artifactItem>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+- <version>1.9.0</version>
++ <version>debian</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+- <version>1.0.3</version>
++ <version>debian</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+- <version>1.3.02</version>
++ <version>debian</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/test-lib</outputDirectory>
+--- a/src/test/test-data/optionally-existent.conf
++++ b/src/test/test-data/optionally-existent.conf
+@@ -10,5 +10,5 @@
+ # ------------------------------------------------------------
+
+ [opt]
+- optionally ${basedir}/target/test-lib/xml-apis-1.3.02.jar
++ optionally ${basedir}/target/test-lib/xml-apis-debian.jar
+
+--- a/src/test/test-data/valid.conf
++++ b/src/test/test-data/valid.conf
+@@ -10,15 +10,15 @@
+ # ------------------------------------------------------------
+
+ [xml]
+- load ${basedir}/target/test-lib/xml-apis-1.3.02.jar
++ load ${basedir}/target/test-lib/xml-apis-debian.jar
+
+ [ant]
+ import org.xml.sax from xml
+- load ${basedir}/target/test-lib/ant-1.9.0.jar
++ load ${basedir}/target/test-lib/ant-debian.jar
+
+ [maven]
+ import org.xml.sax from xml
+- load ${basedir}/target/test-lib/commons-logging-1.0.3.jar
++ load ${basedir}/target/test-lib/commons-logging-debian.jar
+
+ [glob]
+ load ${basedir}/src/test/test-data/*.jar
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2fbc70e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-tests.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds.git
More information about the pkg-java-commits
mailing list