Switch to use ASM 6 with Java 9 support, see issue findbugsproject#105.

The asm 6.0 snapshot was built from SVN 1818 version, from ASM_6_FEATURE branch.
sebasjm · Jun 5, 2016 · 2e2c4ca · 2e2c4ca
1 parent c2a8a96
commit 2e2c4ca
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ findbugs/lib/findbugs-annotations.jar
 findbugs/lib/findbugs-ant.jar
 findbugs/lib/findbugs.jar
 findbugs/lib/apache-ant-1.8.3-src.zip
+findbugs/lib/asm-debug-all-6.0-SNAPSHOT.jar
 findbugs/local.properties
 findbugs/optionalPlugin/
 findbugs/design/architecture/architecture.aux

diff --git a/.settings/de.loskutov.anyedit.AnyEditTools.prefs b/.settings/de.loskutov.anyedit.AnyEditTools.prefs
@@ -1,4 +1,4 @@
-activeContentFilterList=*.makefile,makefile,*.Makefile,Makefile,Makefile.*,*.mk,MANIFEST.MF,.project
+activeContentFilterList=*.makefile,makefile,*.Makefile,Makefile,Makefile.*,*.mk,MANIFEST.MF,.project,.classpath
 addNewLine=true
 convertActionOnSaave=AnyEdit.CnvrtTabToSpaces
 eclipse.preferences.version=1

diff --git a/bluej/build.xml b/bluej/build.xml
@@ -66,7 +66,7 @@
             <fileset dir="${bin.dir}"/>
             <zipfileset src="lib/findbugs.jar"/>
             <zipfileset src="lib/bcel-6.0-SNAPSHOT.jar"/>
-            <zipfileset src="lib/asm-debug-all-5.0.2.jar"/>
+            <zipfileset src="lib/asm-debug-all-6.0-SNAPSHOT.jar"/>
             <zipfileset src="lib/dom4j-1.6.1.jar"/>
             <zipfileset src="lib/jsr305.jar"/>
             <fileset file="smallBuggy.png"/>

diff --git a/eclipsePlugin/.classpath b/eclipsePlugin/.classpath
@@ -7,7 +7,7 @@
 	<classpathentry kind="lib" path="lib/jFormatString.jar"/>
 	<classpathentry kind="lib" path="lib/bcel-6.0-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
-	<classpathentry kind="lib" path="lib/asm-debug-all-5.0.2.jar"/>
+	<classpathentry kind="lib" path="lib/asm-debug-all-6.0-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/jaxen-1.1.6.jar"/>
 	<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
 	<classpathentry kind="lib" path="lib/jsr305.jar"/>

diff --git a/eclipsePlugin/META-INF/MANIFEST.MF b/eclipsePlugin/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Bundle-ClassPath: findbugs-plugin.jar,
  lib/jaxen-1.1.6.jar,
  lib/jFormatString.jar,
  lib/commons-lang-2.6.jar,
- lib/asm-debug-all-5.0.2.jar
+ lib/asm-debug-all-6.0-SNAPSHOT.jar
 Bundle-Activator: de.tobject.findbugs.FindbugsPlugin
 Bundle-Vendor: FindBugs Project
 Bundle-Localization: plugin

diff --git a/eclipsePlugin/build.properties b/eclipsePlugin/build.properties
@@ -22,7 +22,7 @@ bin.includes = FindBugs.png,\
                lib/jFormatString.jar,\
                lib/jaxen-1.1.6.jar,\
                lib/jsr305.jar,\
-               lib/asm-debug-all-5.0.2.jar
+               lib/asm-debug-all-6.0-SNAPSHOT.jar
 src.includes = FindBugs.png,\
                RELEASENOTES,\
                about.html,\

diff --git a/eclipsePlugin/build.xml b/eclipsePlugin/build.xml
@@ -68,7 +68,7 @@
         annotations.jar,
         jFormatString.jar,
         commons-lang-2.6.jar,
-        asm-debug-all-5.0.2.jar,
+        asm-debug-all-6.0-SNAPSHOT.jar,
         dom4j-1.6.1.jar,
         jaxen-1.1.6.jar" />
 

diff --git a/findbugs/.classpath b/findbugs/.classpath
@@ -31,7 +31,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/jFormatString.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jdepend-2.9.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ant.jar" sourcepath="lib/apache-ant-1.8.3-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm-debug-all-5.0.2.jar" sourcepath="/asm3"/>
+	<classpathentry exported="true" kind="lib" path="lib/asm-debug-all-6.0-SNAPSHOT.jar" sourcepath="/asm3"/>
 	<classpathentry exported="true" kind="lib" path="lib/bcel-6.0-SNAPSHOT.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-bcel/apidocs/"/>

diff --git a/findbugs/META-INF/MANIFEST.MF b/findbugs/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-ClassPath: findbugs.jar,
  lib/bcel-6.0-SNAPSHOT.jar,
  lib/dom4j-1.6.1.jar,
  lib/junit.jar,
- lib/asm-debug-all-5.0.2.jar,
+ lib/asm-debug-all-6.0-SNAPSHOT.jar,
  lib/jaxen-1.1.6.jar,
  lib/jFormatString.jar,
  lib/commons-lang-2.6.jar,

diff --git a/findbugs/build.xml b/findbugs/build.xml
@@ -1180,7 +1180,7 @@
         </delete>
     </target>
 
-    <target name="init" depends="properties">
+    <target name="init" depends="properties,getasm6">
         <mkdir dir="${scripts.dir}"/>
         <mkdir dir="${build.dir}"/>
         <mkdir dir="${doc.dir}"/>
@@ -1207,6 +1207,9 @@
       <condition property="apidoc.uptodate">
           <isset property="docs.uptodate"/>
        </condition>
+      <condition property="asm6.exists">
+          <available file="${jar.dir}/asm-debug-all-6.0-SNAPSHOT.jar" />
+      </condition>
     </target>
 
     <target name="apiJavadoc" depends="version" unless="apidoc.uptodate">
@@ -1234,6 +1237,14 @@
         sourcepath="src/java:src/gui:src/antTask" splitindex="true" use="true" version="true"/>
         </target>
 
+    <!-- Download snapshot of asm 6.0 with Java 9 support, built from SVN version 1818 from ASM_6_FUTURE branch,
+        install resulting jar in lib. -->
+    <target name="getasm6" unless="asm6.exists">
+        <get src="https://github.com/findbugsproject/findbugs/releases/download/3.1.0_preview1/asm-debug-all-6.0-SNAPSHOT.jar"
+             dest="${jar.dir}/asm-debug-all-6.0-SNAPSHOT.jar"
+         verbose="on"/>
+    </target>
+
     <!-- Download, patch, and build a modified BCEL 5.2.  Install resulting bcel.jar in lib. -->
     <target name="patchbcel">
         <delete dir="${build.dir}/bcel-5.2-src"/>

diff --git a/findbugs/etc/MANIFEST-findbugs.MF b/findbugs/etc/MANIFEST-findbugs.MF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
 Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
-Class-Path: bcel-6.0-SNAPSHOT.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-5.0.2.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar
+Class-Path: bcel-6.0-SNAPSHOT.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-6.0-SNAPSHOT.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar
diff --git a/findbugs/etc/MANIFEST-findbugsGUI.MF b/findbugs/etc/MANIFEST-findbugsGUI.MF
@@ -1,3 +1,3 @@
-Manifest-Version: 1.0
-Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
-Class-Path: bcel-6.0-SNAPSHOT.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-5.0.2.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar plastic.jar
+Manifest-Version: 1.0
+Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
+Class-Path: bcel-6.0-SNAPSHOT.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-6.0-SNAPSHOT.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar plastic.jar
diff --git a/findbugs/lib/asm-debug-all-5.0.2.jar b/findbugs/lib/asm-debug-all-5.0.2.jar
diff --git a/findbugs/runMaven b/findbugs/runMaven
@@ -1,5 +1,5 @@
 #! /bin/sh
 mvn install:install-file -Dfile=lib/bcel-6.0-SNAPSHOT.jar -DgroupId=com.google.code.findbugs -DartifactId=bcel -Dversion=6.0-SNAPSHOT -Dpackaging=jar
-mvn install:install-file -Dfile=lib/asm-debug-all-5.0.2.jar -DgroupId=org.ow2.asm -DartifactId=asm-debug-all -Dversion=5.0.2 -Dpackaging=jar
+mvn install:install-file -Dfile=lib/asm-debug-all-6.0-SNAPSHOT.jar -DgroupId=org.ow2.asm -DartifactId=asm-debug-all -Dversion=6.0-SNAPSHOT -Dpackaging=jar
 mvn clean
 mvn package
diff --git a/findbugs/src/java/edu/umd/cs/findbugs/classfile/engine/asm/FindBugsASM.java b/findbugs/src/java/edu/umd/cs/findbugs/classfile/engine/asm/FindBugsASM.java
@@ -26,6 +26,6 @@
  */
 public class FindBugsASM {
 
-    public static final int ASM_VERSION = Opcodes.ASM5;
+    public static final int ASM_VERSION = Opcodes.ASM6;
 
 }