[java-identity-provider COMMIT] /trunk/idp-distribution/src/main/resources/bin/build.xml

[noreply at shibboleth.net]

Author: scantor
Date: Sun Nov 16 16:04:31 2014
New Revision: 6919

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6919&view=rev
Log:
V2 upgrade didn't do nameid.prop merge.

Modified:
    trunk/idp-distribution/src/main/resources/bin/build.xml

Modified: trunk/idp-distribution/src/main/resources/bin/build.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/build.xml?rev=6919&r1=6918&r2=6919&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Sun Nov 16 16:04:31 2014
@@ -403,7 +403,7 @@
      GENERAL V3 TO V3 UPGRADE
     -->
 
-	<target name="upgrade" depends="editproperties, editservicesproperties, editldapproperties">
+	<target name="upgrade" depends="editproperties, editservicesproperties, editnameidproperties, editldapproperties">
 		<echo append="true" file="idp_ant.log">target: upgrade
 		</echo>
 		<!-- Create edit-webapp tree -->