[pkg-java] r16078 - trunk/libcommons-net2-java/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2012-05-29 23:28:31 +0000 (Tue, 29 May 2012)
New Revision: 16078

Modified:
   trunk/libcommons-net2-java/debian/build.properties
   trunk/libcommons-net2-java/debian/changelog
   trunk/libcommons-net2-java/debian/control
   trunk/libcommons-net2-java/debian/maven-build.xml
   trunk/libcommons-net2-java/debian/rules
Log:
* Team upload.
* Enablement of JUnit test suite (LP: #876413) (Closes: #646089):
  - d/build.properties: enable test suite execution.
  - d/control: Added junit to B-D's to support testing.
  - d/rules: Added ant-junit and junit to DEB_JARS to support testing.
  - d/maven-build.xml: Exclude tests that require network access, fail 
    build when tests fail.
* d/control: Bumped Standards-Version: 3.9.2, no changes

Modified: trunk/libcommons-net2-java/debian/build.properties
===================================================================
--- trunk/libcommons-net2-java/debian/build.properties	2012-05-29 23:19:38 UTC (rev 16077)
+++ trunk/libcommons-net2-java/debian/build.properties	2012-05-29 23:28:31 UTC (rev 16078)
@@ -1,5 +1,4 @@
 javadoc.dir=build/docs/api
-maven.test.skip=true
+#maven.test.skip=true
 build.javaVersion=1.5
 manifest=debian/tmp/MANIFEST.MF
-

Modified: trunk/libcommons-net2-java/debian/changelog
===================================================================
--- trunk/libcommons-net2-java/debian/changelog	2012-05-29 23:19:38 UTC (rev 16077)
+++ trunk/libcommons-net2-java/debian/changelog	2012-05-29 23:28:31 UTC (rev 16078)
@@ -1,3 +1,20 @@
+libcommons-net2-java (2.2-2) unstable; urgency=low
+
+  * Team upload.
+
+  [ James Page ]
+  * Enablement of JUnit test suite (LP: #876413) (Closes: #646089):
+    - d/build.properties: enable test suite execution.
+    - d/control: Added junit to B-D's to support testing.
+    - d/rules: Added ant-junit and junit to DEB_JARS to support testing.
+    - d/maven-build.xml: Exclude tests that require network access, fail 
+      build when tests fail.
+
+  [ Damien Raude-Morvan ]
+  * d/control: Bumped Standards-Version: 3.9.2, no changes
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 30 May 2012 01:17:01 +0200
+
 libcommons-net2-java (2.2-1) unstable; urgency=low
 
   [ Niels Thykier ]

Modified: trunk/libcommons-net2-java/debian/control
===================================================================
--- trunk/libcommons-net2-java/debian/control	2012-05-29 23:19:38 UTC (rev 16077)
+++ trunk/libcommons-net2-java/debian/control	2012-05-29 23:28:31 UTC (rev 16078)
@@ -4,8 +4,8 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk
-Build-Depends-Indep: ant, ant-optional, maven-ant-helper, maven-repo-helper, default-jdk-doc
-Standards-Version: 3.9.1
+Build-Depends-Indep: ant, ant-optional, maven-ant-helper, maven-repo-helper, default-jdk-doc, junit
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-net2-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-net2-java/
 Homepage: http://commons.apache.org/net/

Modified: trunk/libcommons-net2-java/debian/maven-build.xml
===================================================================
--- trunk/libcommons-net2-java/debian/maven-build.xml	2012-05-29 23:19:38 UTC (rev 16077)
+++ trunk/libcommons-net2-java/debian/maven-build.xml	2012-05-29 23:28:31 UTC (rev 16078)
@@ -320,7 +320,7 @@
 
     <target name="test" depends="test-compile" unless="maven.test.skip">
         <mkdir dir="${build.directory}/test-output"/>
-        <junit printsummary="yes" haltonfailure="no"> <!--  fork="yes" forkmode="once" -->
+        <junit printsummary="yes" haltonfailure="yes"> <!--  fork="yes" forkmode="once" -->
             <sysproperty key="basedir" value="${basedir}"/>
             <classpath>
                 <pathelement path="${classpath.full.test}"/>
@@ -331,6 +331,8 @@
                 <fileset dir="${build.testSourceDirectory}">
                     <include name="**/*Test.java"/>
                     <exclude name="**/Abstract*"/>
+                    <exclude name="**/*FunctionalTest.java"/>
+                    <exclude name="**/POP3*"/>
                     <exclude name="${maven.test.exclude}"/>
                 </fileset>
             </batchtest>

Modified: trunk/libcommons-net2-java/debian/rules
===================================================================
--- trunk/libcommons-net2-java/debian/rules	2012-05-29 23:19:38 UTC (rev 16077)
+++ trunk/libcommons-net2-java/debian/rules	2012-05-29 23:28:31 UTC (rev 16078)
@@ -9,7 +9,7 @@
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps
+DEB_JARS             := ant-nodeps ant-junit junit
 DEB_ANT_BUILD_TARGET := package javadoc
 # work with a slightly modified version of maven-ant-helper's build file:
 DEB_ANT_BUILDFILE    := debian/maven-build.xml