Build FB on top of BCEL 6 head, see #106

This also fixes the StackMapTable misery, see BCEL-92 and BCEL-248 and discussion on http://mail-archives.apache.org/mod_mbox/commons-dev/201606.mbox/ajax/%3C4595124.Qpp5S77DT7%40pinguin%3E. Added StackMapTable/StackMapTableEntry to the FB repository, basically 1:1 copy of StackMap/StackMapEntry. The classes are only there to don't break the clients used them via PreorderVisitor API. Fixed removed constants from Constants (they match those from Const). The tests are still failing due https://issues.apache.org/jira/browse/BCEL-273.
findbugsproject · Jun 8, 2016 · 2e1807e · 2e1807e
1 parent b67bdf9
commit 2e1807e
Show file tree

Hide file tree

Showing 19 changed files with 899 additions and 233 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ 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/lib/bcel-6.0-SNAPSHOT_452b5e6.jar
 findbugs/local.properties
 findbugs/optionalPlugin/
 findbugs/design/architecture/architecture.aux

diff --git a/eclipsePlugin/.classpath b/eclipsePlugin/.classpath
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="lib" path="lib/annotations.jar"/>
-	<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-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"/>
-	<classpathentry kind="lib" path="/findbugs/classesEclipse" sourcepath="/findbugs/src"/>
-	<classpathentry kind="output" path="bin_eclipse"/>
+    <classpathentry kind="src" path="src"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+    <classpathentry kind="lib" path="lib/annotations.jar"/>
+    <classpathentry kind="lib" path="lib/jFormatString.jar"/>
+    <classpathentry kind="lib" path="lib/bcel-6.0-SNAPSHOT_452b5e6.jar"/>
+    <classpathentry kind="lib" path="lib/dom4j-1.6.1.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"/>
+    <classpathentry kind="lib" path="/findbugs/classesEclipse" sourcepath="/findbugs/src"/>
+    <classpathentry kind="output" path="bin_eclipse"/>
 </classpath>
diff --git a/eclipsePlugin/META-INF/MANIFEST.MF b/eclipsePlugin/META-INF/MANIFEST.MF
@@ -1,135 +1,135 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: FindBugs Plug-in
-Bundle-SymbolicName: edu.umd.cs.findbugs.plugin.eclipse; singleton:=true
-Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: findbugs-plugin.jar,
- lib/jsr305.jar,
- lib/annotations.jar,
- lib/bcel-6.0-SNAPSHOT.jar,
- lib/dom4j-1.6.1.jar,
- lib/jaxen-1.1.6.jar,
- lib/jFormatString.jar,
- lib/commons-lang-2.6.jar,
- lib/asm-debug-all-6.0-SNAPSHOT.jar
-Bundle-Activator: de.tobject.findbugs.FindbugsPlugin
-Bundle-Vendor: FindBugs Project
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui;bundle-version="3.6.0",
- org.eclipse.ant.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui.ide,
- org.eclipse.ui.editors,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.jface.text,
- org.eclipse.jdt.launching,
- org.eclipse.jdt,
- org.eclipse.team.core,
- org.eclipse.compare,
- org.eclipse.team.ui,
- org.eclipse.ui.navigator,
- org.eclipse.ui.navigator.resources,
- org.eclipse.pde.core;resolution:=optional,
- org.eclipse.pde.build;resolution:=optional,
- org.eclipse.core.expressions,
- org.eclipse.ui.views.properties.tabbed,
- org.eclipse.ui.console,
- org.eclipse.core.filesystem,
- findbugs;resolution:=optional;visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Eclipse-BuddyPolicy: registered
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: de.tobject.findbugs,
- de.tobject.findbugs.actions,
- de.tobject.findbugs.adapters,
- de.tobject.findbugs.builder,
- de.tobject.findbugs.decorators,
- de.tobject.findbugs.io,
- de.tobject.findbugs.marker,
- de.tobject.findbugs.nature,
- de.tobject.findbugs.preferences,
- de.tobject.findbugs.properties,
- de.tobject.findbugs.reporter,
- de.tobject.findbugs.util,
- de.tobject.findbugs.view,
- de.tobject.findbugs.view.explorer,
- edu.umd.cs.findbugs,
- edu.umd.cs.findbugs.annotations,
- edu.umd.cs.findbugs.anttask,
- edu.umd.cs.findbugs.architecture,
- edu.umd.cs.findbugs.asm,
- edu.umd.cs.findbugs.ba,
- edu.umd.cs.findbugs.ba.bcp,
- edu.umd.cs.findbugs.ba.ca,
- edu.umd.cs.findbugs.ba.ch,
- edu.umd.cs.findbugs.ba.constant,
- edu.umd.cs.findbugs.ba.deref,
- edu.umd.cs.findbugs.ba.generic,
- edu.umd.cs.findbugs.ba.heap,
- edu.umd.cs.findbugs.ba.interproc,
- edu.umd.cs.findbugs.ba.jsr305,
- edu.umd.cs.findbugs.ba.npe,
- edu.umd.cs.findbugs.ba.obl,
- edu.umd.cs.findbugs.ba.type,
- edu.umd.cs.findbugs.ba.vna,
- edu.umd.cs.findbugs.bcel,
- edu.umd.cs.findbugs.bcel.generic,
- edu.umd.cs.findbugs.bugReporter,
- edu.umd.cs.findbugs.charsets,
- edu.umd.cs.findbugs.classfile,
- edu.umd.cs.findbugs.classfile.analysis,
- edu.umd.cs.findbugs.classfile.engine,
- edu.umd.cs.findbugs.classfile.engine.asm,
- edu.umd.cs.findbugs.classfile.engine.bcel,
- edu.umd.cs.findbugs.classfile.impl,
- edu.umd.cs.findbugs.cloud,
- edu.umd.cs.findbugs.cloud.username,
- edu.umd.cs.findbugs.config,
- edu.umd.cs.findbugs.detect,
- edu.umd.cs.findbugs.filter,
- edu.umd.cs.findbugs.formatStringChecker,
- edu.umd.cs.findbugs.graph,
- edu.umd.cs.findbugs.internalAnnotations,
- edu.umd.cs.findbugs.io,
- edu.umd.cs.findbugs.jaif,
- edu.umd.cs.findbugs.launchGUI,
- edu.umd.cs.findbugs.log,
- edu.umd.cs.findbugs.ml,
- edu.umd.cs.findbugs.model,
- edu.umd.cs.findbugs.plan,
- edu.umd.cs.findbugs.plugin.eclipse.quickfix,
- edu.umd.cs.findbugs.plugin.eclipse.quickfix.exception,
- edu.umd.cs.findbugs.plugin.eclipse.quickfix.util,
- edu.umd.cs.findbugs.plugin.eclipse.util,
- edu.umd.cs.findbugs.plugins,
- edu.umd.cs.findbugs.props,
- edu.umd.cs.findbugs.sourceViewer,
- edu.umd.cs.findbugs.tools,
- edu.umd.cs.findbugs.tools.html,
- edu.umd.cs.findbugs.tools.junit,
- edu.umd.cs.findbugs.tools.xml,
- edu.umd.cs.findbugs.util,
- edu.umd.cs.findbugs.visitclass,
- edu.umd.cs.findbugs.workflow,
- edu.umd.cs.findbugs.xml,
- javax.annotation,
- javax.annotation.concurrent,
- javax.annotation.meta,
- org.apache.bcel,
- org.apache.bcel.classfile,
- org.apache.bcel.generic,
- org.apache.bcel.util,
- org.apache.bcel.verifier,
- org.apache.bcel.verifier.exc,
- org.apache.bcel.verifier.statics,
- org.apache.bcel.verifier.structurals,
- org.dom4j,
- org.objectweb.asm,
- org.objectweb.asm.commons,
- org.objectweb.asm.signature,
- org.objectweb.asm.tree,
- org.objectweb.asm.tree.analysis,
- org.objectweb.asm.util
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: FindBugs Plug-in
+Bundle-SymbolicName: edu.umd.cs.findbugs.plugin.eclipse; singleton:=true
+Bundle-Version: 3.1.0.qualifier
+Bundle-ClassPath: findbugs-plugin.jar,
+ lib/jsr305.jar,
+ lib/annotations.jar,
+ lib/bcel-6.0-SNAPSHOT_452b5e6.jar,
+ lib/dom4j-1.6.1.jar,
+ lib/jaxen-1.1.6.jar,
+ lib/jFormatString.jar,
+ lib/commons-lang-2.6.jar,
+ lib/asm-debug-all-6.0-SNAPSHOT.jar
+Bundle-Activator: de.tobject.findbugs.FindbugsPlugin
+Bundle-Vendor: FindBugs Project
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui;bundle-version="3.6.0",
+ org.eclipse.ant.core,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.editors,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.ui,
+ org.eclipse.jface.text,
+ org.eclipse.jdt.launching,
+ org.eclipse.jdt,
+ org.eclipse.team.core,
+ org.eclipse.compare,
+ org.eclipse.team.ui,
+ org.eclipse.ui.navigator,
+ org.eclipse.ui.navigator.resources,
+ org.eclipse.pde.core;resolution:=optional,
+ org.eclipse.pde.build;resolution:=optional,
+ org.eclipse.core.expressions,
+ org.eclipse.ui.views.properties.tabbed,
+ org.eclipse.ui.console,
+ org.eclipse.core.filesystem,
+ findbugs;resolution:=optional;visibility:=reexport
+Bundle-ActivationPolicy: lazy
+Eclipse-BuddyPolicy: registered
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: de.tobject.findbugs,
+ de.tobject.findbugs.actions,
+ de.tobject.findbugs.adapters,
+ de.tobject.findbugs.builder,
+ de.tobject.findbugs.decorators,
+ de.tobject.findbugs.io,
+ de.tobject.findbugs.marker,
+ de.tobject.findbugs.nature,
+ de.tobject.findbugs.preferences,
+ de.tobject.findbugs.properties,
+ de.tobject.findbugs.reporter,
+ de.tobject.findbugs.util,
+ de.tobject.findbugs.view,
+ de.tobject.findbugs.view.explorer,
+ edu.umd.cs.findbugs,
+ edu.umd.cs.findbugs.annotations,
+ edu.umd.cs.findbugs.anttask,
+ edu.umd.cs.findbugs.architecture,
+ edu.umd.cs.findbugs.asm,
+ edu.umd.cs.findbugs.ba,
+ edu.umd.cs.findbugs.ba.bcp,
+ edu.umd.cs.findbugs.ba.ca,
+ edu.umd.cs.findbugs.ba.ch,
+ edu.umd.cs.findbugs.ba.constant,
+ edu.umd.cs.findbugs.ba.deref,
+ edu.umd.cs.findbugs.ba.generic,
+ edu.umd.cs.findbugs.ba.heap,
+ edu.umd.cs.findbugs.ba.interproc,
+ edu.umd.cs.findbugs.ba.jsr305,
+ edu.umd.cs.findbugs.ba.npe,
+ edu.umd.cs.findbugs.ba.obl,
+ edu.umd.cs.findbugs.ba.type,
+ edu.umd.cs.findbugs.ba.vna,
+ edu.umd.cs.findbugs.bcel,
+ edu.umd.cs.findbugs.bcel.generic,
+ edu.umd.cs.findbugs.bugReporter,
+ edu.umd.cs.findbugs.charsets,
+ edu.umd.cs.findbugs.classfile,
+ edu.umd.cs.findbugs.classfile.analysis,
+ edu.umd.cs.findbugs.classfile.engine,
+ edu.umd.cs.findbugs.classfile.engine.asm,
+ edu.umd.cs.findbugs.classfile.engine.bcel,
+ edu.umd.cs.findbugs.classfile.impl,
+ edu.umd.cs.findbugs.cloud,
+ edu.umd.cs.findbugs.cloud.username,
+ edu.umd.cs.findbugs.config,
+ edu.umd.cs.findbugs.detect,
+ edu.umd.cs.findbugs.filter,
+ edu.umd.cs.findbugs.formatStringChecker,
+ edu.umd.cs.findbugs.graph,
+ edu.umd.cs.findbugs.internalAnnotations,
+ edu.umd.cs.findbugs.io,
+ edu.umd.cs.findbugs.jaif,
+ edu.umd.cs.findbugs.launchGUI,
+ edu.umd.cs.findbugs.log,
+ edu.umd.cs.findbugs.ml,
+ edu.umd.cs.findbugs.model,
+ edu.umd.cs.findbugs.plan,
+ edu.umd.cs.findbugs.plugin.eclipse.quickfix,
+ edu.umd.cs.findbugs.plugin.eclipse.quickfix.exception,
+ edu.umd.cs.findbugs.plugin.eclipse.quickfix.util,
+ edu.umd.cs.findbugs.plugin.eclipse.util,
+ edu.umd.cs.findbugs.plugins,
+ edu.umd.cs.findbugs.props,
+ edu.umd.cs.findbugs.sourceViewer,
+ edu.umd.cs.findbugs.tools,
+ edu.umd.cs.findbugs.tools.html,
+ edu.umd.cs.findbugs.tools.junit,
+ edu.umd.cs.findbugs.tools.xml,
+ edu.umd.cs.findbugs.util,
+ edu.umd.cs.findbugs.visitclass,
+ edu.umd.cs.findbugs.workflow,
+ edu.umd.cs.findbugs.xml,
+ javax.annotation,
+ javax.annotation.concurrent,
+ javax.annotation.meta,
+ org.apache.bcel,
+ org.apache.bcel.classfile,
+ org.apache.bcel.generic,
+ org.apache.bcel.util,
+ org.apache.bcel.verifier,
+ org.apache.bcel.verifier.exc,
+ org.apache.bcel.verifier.statics,
+ org.apache.bcel.verifier.structurals,
+ org.dom4j,
+ org.objectweb.asm,
+ org.objectweb.asm.commons,
+ org.objectweb.asm.signature,
+ org.objectweb.asm.tree,
+ org.objectweb.asm.tree.analysis,
+ org.objectweb.asm.util
diff --git a/eclipsePlugin/build.properties b/eclipsePlugin/build.properties
@@ -16,7 +16,7 @@ bin.includes = FindBugs.png,\
                META-INF/,\
                umdFindbugs.png,\
                lib/annotations.jar,\
-               lib/bcel-6.0-SNAPSHOT.jar,\
+               lib/bcel-6.0-SNAPSHOT_452b5e6.jar,\
                lib/commons-lang-2.6.jar,\
                lib/dom4j-1.6.1.jar,\
                lib/jFormatString.jar,\

diff --git a/eclipsePlugin/build.xml b/eclipsePlugin/build.xml
@@ -64,7 +64,7 @@
 
     <!-- list of required libraries, copied from FB core project -->
     <property name="jars.required" value="jsr305.jar,
-        bcel-6.0-SNAPSHOT.jar,
+        bcel-6.0-SNAPSHOT_452b5e6.jar,
         annotations.jar,
         jFormatString.jar,
         commons-lang-2.6.jar,

diff --git a/findbugs/.classpath b/findbugs/.classpath
@@ -32,7 +32,7 @@
 	<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-6.0-SNAPSHOT.jar" sourcepath="/asm3"/>
-	<classpathentry exported="true" kind="lib" path="lib/bcel-6.0-SNAPSHOT.jar">
+	<classpathentry exported="true" kind="lib" path="lib/bcel-6.0-SNAPSHOT_452b5e6.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-bcel/apidocs/"/>
 		</attributes>

diff --git a/findbugs/META-INF/MANIFEST.MF b/findbugs/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-SymbolicName: findbugs
 Bundle-Version: 1.0.0
 Bundle-ClassPath: findbugs.jar,
  lib/AppleJavaExtensions.jar,
- lib/bcel-6.0-SNAPSHOT.jar,
+ lib/bcel-6.0-SNAPSHOT_452b5e6.jar,
  lib/dom4j-1.6.1.jar,
  lib/junit.jar,
  lib/asm-debug-all-6.0-SNAPSHOT.jar,

diff --git a/findbugs/build.xml b/findbugs/build.xml
@@ -447,15 +447,15 @@
               projectName="Byte code Engineering Library (BCEL)"
               outputFile="${sampleoutput.dir}/bcel.xml"
             >
-      <class location="${jar.dir}/bcel-6.0-SNAPSHOT.jar" />
+      <class location="${jar.dir}/bcel-6.0-SNAPSHOT_452b5e6.jar" />
     </findbugs>
     <findbugs home="${basedir}"
               output="xml:withMessages"
               cloud="edu.umd.cs.findbugs.cloud.appengine.findbugs-cloud"
               jvmargs="-ea -Xmx1200m"
               projectName="Byte code Engineering Library (BCEL)"
               outputFile="${sampleoutput.dir}/bcel-cloud-appengine.xml" >
-      <class location="${jar.dir}/bcel-6.0-SNAPSHOT.jar" />
+      <class location="${jar.dir}/bcel-6.0-SNAPSHOT_452b5e6.jar" />
     </findbugs>
 
 
@@ -1180,7 +1180,7 @@
         </delete>
     </target>
 
-    <target name="init" depends="properties,getasm6">
+    <target name="init" depends="properties,getasm6,getbcel6">
         <mkdir dir="${scripts.dir}"/>
         <mkdir dir="${build.dir}"/>
         <mkdir dir="${doc.dir}"/>
@@ -1210,6 +1210,9 @@
       <condition property="asm6.exists">
           <available file="${jar.dir}/asm-debug-all-6.0-SNAPSHOT.jar" />
       </condition>
+      <condition property="bcel6.exists">
+          <available file="${jar.dir}/bcel-6.0-SNAPSHOT_452b5e6.jar" />
+      </condition>
     </target>
 
     <target name="apiJavadoc" depends="version" unless="apidoc.uptodate">
@@ -1245,6 +1248,12 @@
          verbose="on"/>
     </target>
 
+    <target name="getbcel6" unless="bcel6.exists">
+        <get src="https://github.com/findbugsproject/findbugs/files/304635/bcel-6.0-SNAPSHOT.zip"
+             dest="${jar.dir}/bcel-6.0-SNAPSHOT_452b5e6.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-6.0-SNAPSHOT.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar
+Class-Path: bcel-6.0-SNAPSHOT_452b5e6.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