svn commit: r1418728 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/common-build.xml

[us...@apache.org]

Author: uschindler
Date: Sat Dec  8 18:19:23 2012
New Revision: 1418728

URL: http://svn.apache.org/viewvc?rev=1418728&view=rev
Log:
Merged revision(s) 1418727 from lucene/dev/trunk:
Upgrade Pegdown for MarkDown converts to 1.2.0 (which uses ASM 4.0, too)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/common-build.xml   (contents, props changed)

Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1418728&r1=1418727&r2=1418728&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Sat Dec  8 18:19:23 2012
@@ -1880,7 +1880,7 @@ ${tests-output}/junit4-*.suites     - pe
   <!-- PEGDOWN macro: Before using depend on the target "resolve-pegdown" -->
   
   <target name="resolve-pegdown" unless="pegdown.loaded" depends="ivy-availability-check,ivy-fail,ivy-configure">
-    <ivy:cachepath organisation="org.pegdown" module="pegdown" revision="1.1.0"
+    <ivy:cachepath organisation="org.pegdown" module="pegdown" revision="1.2.0"
       inline="true" conf="default" type="jar" transitive="true" pathid="pegdown.classpath"/>
     <property name="pegdown.loaded" value="true"/>
   </target>