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

[us...@apache.org]

Author: uschindler
Date: Thu Apr 17 21:55:24 2014
New Revision: 1588379

URL: http://svn.apache.org/r1588379
Log:
Merged revision(s) 1588378 from lucene/dev/trunk:
Update to bugfix release of forbidden-apis to work around annotations bug (may affect lucene in the future)

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=1588379&r1=1588378&r2=1588379&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Thu Apr 17 21:55:24 2014
@@ -2217,7 +2217,7 @@ ${ant.project.name}.test.dependencies=${
   <property name="forbidden-rue-excludes" value=""/>
   
   <target name="-install-forbidden-apis" unless="forbidden-apis.loaded" depends="ivy-availability-check,ivy-configure">
-    <ivy:cachepath organisation="de.thetaphi" module="forbiddenapis" revision="1.5"
+    <ivy:cachepath organisation="de.thetaphi" module="forbiddenapis" revision="1.5.1"
       inline="true" conf="default" transitive="true" pathid="forbidden-apis.classpath"/>
     <taskdef name="forbidden-apis" classname="de.thetaphi.forbiddenapis.AntTask" classpathref="forbidden-apis.classpath"/>
     <property name="forbidden-apis.loaded" value="true"/>