You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/11/24 01:37:54 UTC

svn commit: r1641303 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/CHANGES.txt lucene/common-build.xml

Author: uschindler
Date: Mon Nov 24 00:37:53 2014
New Revision: 1641303

URL: http://svn.apache.org/r1641303
Log:
Merged revision(s) 1641302 from lucene/dev/trunk:
LUCENE-6070: Fix forbidden-apis and deprecations of Java 8 when used with Java 9

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

Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1641303&r1=1641302&r2=1641303&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Mon Nov 24 00:37:53 2014
@@ -340,6 +340,8 @@ Build
 
 * LUCENE-5995: Upgrade ICU to 54.1 (Robert Muir)
 
+* LUCENE-6070: Upgrade forbidden-apis to 1.7 (Uwe Schindler)
+
 Other
 
 * LUCENE-5563: Removed sep layout: which has fallen behind on features and doesn't

Modified: lucene/dev/branches/branch_5x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/common-build.xml?rev=1641303&r1=1641302&r2=1641303&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/common-build.xml Mon Nov 24 00:37:53 2014
@@ -2344,7 +2344,7 @@ ${ant.project.name}.test.dependencies=${
   <property name="forbidden-sysout-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.6.1"
+    <ivy:cachepath organisation="de.thetaphi" module="forbiddenapis" revision="1.7"
       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"/>