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 2012/12/01 17:11:39 UTC
svn commit: r1416012 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/tools/ lucene/tools/build.xml lucene/tools/custom-tasks.xml
lucene/tools/ivy.xml
lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java
Author: uschindler
Date: Sat Dec 1 16:11:38 2012
New Revision: 1416012
URL: http://svn.apache.org/viewvc?rev=1416012&view=rev
Log:
Merged revision(s) 1416011 from lucene/dev/trunk:
LUCENE-4582: Disable forbidden-APIs checker in JDK 8, upgrade to ASM 4.1.
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/tools/ (props changed)
lucene/dev/branches/branch_4x/lucene/tools/build.xml
lucene/dev/branches/branch_4x/lucene/tools/custom-tasks.xml
lucene/dev/branches/branch_4x/lucene/tools/ivy.xml
lucene/dev/branches/branch_4x/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java
Modified: lucene/dev/branches/branch_4x/lucene/tools/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/tools/build.xml?rev=1416012&r1=1416011&r2=1416012&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/tools/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/tools/build.xml Sat Dec 1 16:11:38 2012
@@ -26,7 +26,7 @@
<path id="classpath">
<fileset dir="lib">
- <include name="asm-debug-all-4.0.jar"/>
+ <include name="asm-debug-all-4.1.jar"/>
</fileset>
</path>
Modified: lucene/dev/branches/branch_4x/lucene/tools/custom-tasks.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/tools/custom-tasks.xml?rev=1416012&r1=1416011&r2=1416012&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/tools/custom-tasks.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/tools/custom-tasks.xml Sat Dec 1 16:11:38 2012
@@ -10,7 +10,7 @@
<taskdef resource="lucene-solr.antlib.xml">
<classpath>
<pathelement location="${custom-tasks.dir}/../build/tools/classes/java" />
- <fileset dir="${custom-tasks.dir}/lib" includes="asm-debug-all-4.0.jar" />
+ <fileset dir="${custom-tasks.dir}/lib" includes="asm-debug-all-4.1.jar" />
</classpath>
</taskdef>
<property name="custom-tasks.loaded" value="true"/>
Modified: lucene/dev/branches/branch_4x/lucene/tools/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/tools/ivy.xml?rev=1416012&r1=1416011&r2=1416012&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/tools/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/tools/ivy.xml Sat Dec 1 16:11:38 2012
@@ -23,7 +23,7 @@
We use the asm-debug-all library, as the as-all has no generics.
It's not really debug, just not "stripped":
-->
- <dependency org="org.ow2.asm" name="asm-debug-all" rev="4.0" transitive="false"/>
+ <dependency org="org.ow2.asm" name="asm-debug-all" rev="4.1" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java?rev=1416012&r1=1416011&r2=1416012&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java Sat Dec 1 16:11:38 2012
@@ -315,6 +315,16 @@ public class ForbiddenApisCheckTask exte
@Override
public void execute() throws BuildException {
+ // the checker is not compatible with JDK 1.8+ (changed class format: 52.0), don't fail just report warning:
+ try {
+ Collections.class.getMethod("emptySortedSet");
+ // this is Java 8 :(
+ log("Java 8 or later is currently not supported by this checker. Please run the checks with a previous JDK!", Project.MSG_WARN);
+ return;
+ } catch (NoSuchMethodException nsme) {
+ // ignore, we are fine!
+ }
+
AntClassLoader antLoader = null;
try {
if (classpath != null) {