From aba96314647a88fabdb5839e52a30803374aba03 Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <britter@apache.org>
Date: Thu, 27 Feb 2014 11:22:46 +0000
Subject: [PATCH] Reverting changes from r1570821 since they didn't work as
 expected

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1572520 13f79535-47bb-0310-9956-ffa450edef68
---
 src/release-tools/build.xml | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/release-tools/build.xml b/src/release-tools/build.xml
index 9025bc43e..c45541cc3 100644
--- a/src/release-tools/build.xml
+++ b/src/release-tools/build.xml
@@ -22,7 +22,7 @@
    Build file for creating release candidates and releasing lang.
    $Id$
 -->
-<project name="release-lang" basedir="../../" xmlns:if="ant:if">
+<project name="release-lang" basedir="../../">
 
     <target name="-init">
         <property file="src/release-tools/build.properties" />
@@ -71,7 +71,7 @@
 
         <mvn goal="deploy">
             <arg value="-Prelease" />
-            <arg value="-Ptest-deploy" if:true="${test.run}"/>
+            <arg value="-Ptest-deploy" />
             <arg value="-Duser.name=${apache.id}" />
             <arg value="-Dgpg.passphrase=${gpg.pass}" />
         </mvn>
@@ -128,25 +128,8 @@
                  passphrase="${ssh.pass}"/>
     </target>
 
-    <target name="nexus-upload-test-run"
-            description="Creates all artifacts and deploys them to the target dir">
-        <antcall target="-build-maven-artifacts">
-            <param name="test.run" value="true"/>
-        </antcall>
-    </target>
-
-    <target name="nexus-upload"
-            description="Creates all artifacts and uploads them to Nexus">
-        <antcall target="-build-maven-artifacts">
-            <param name="test.run" value="false"/>
-        </antcall>
-    </target>
-
-    <target name="nexus-bundle"
+    <target name="nexus-bundle" depends="-build-maven-artifacts"
             description="Creates an upload bundle suitable for Nexus Snapshot Upload">
-        <antcall target="-build-maven-artifacts">
-            <param name="test.run" value="true"/>
-        </antcall>
         <jar destfile="target/upload-bundle.jar">
             <fileset dir="${repo.path}">
                 <include name="*.jar"/>