From 9e2074f1996f787f8099ab102f3fa5558eeb3b49 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 18 Aug 2010 09:55:34 +0000
Subject: [PATCH] remove mvncobertura phase

svn path=/nixpkgs/trunk/; revision=23219
---
 pkgs/build-support/release/maven-build.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix
index 2fa42dd1b101..acd74eb194e0 100644
--- a/pkgs/build-support/release/maven-build.nix
+++ b/pkgs/build-support/release/maven-build.nix
@@ -17,7 +17,7 @@ in
 
 stdenv.mkDerivation ( rec {
   inherit name src; 
-  phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest mvnCobertura" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase";
+  phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase";
 
   setupPhase = ''
     runHook preSetupPhase
@@ -44,6 +44,16 @@ stdenv.mkDerivation ( rec {
 
   mvnTest = ''
     mvn test ${mvnFlags}
+
+    if [ -d target/site/cobertura ] ; then
+      cp -R target/site/cobertura $out/cobertura
+      echo "report cobertura $out/cobertura" >> $out/nix-support/hydra-build-products
+    fi
+
+    if [ -d target/target/surefire-reports ] ; then
+      cp -R target/target/surefire-reports $out/surefire
+      echo "report surefire $out/surefire" >> $out/nix-support/hydra-build-products
+    fi
   '';  
 
   mvnJavadoc = ''
@@ -52,12 +62,6 @@ stdenv.mkDerivation ( rec {
     echo "report javadoc $out/apidocs" >> $out/nix-support/hydra-build-products
   '';  
 
-  mvnCobertura = ''
-    mvn cobertura:cobertura ${mvnFlags}
-    cp -R target/site/cobertura $out/cobertura
-    echo "report cobertura $out/cobertura" >> $out/nix-support/hydra-build-products
-  '';  
-
   mvnCheckstyle = ''
     mvn checkstyle:checkstyle ${mvnFlags}
     ensureDir $out/checkstyle