Package list findbugs / 196a310
Refreshed the patches Emmanuel Bourg 5 years ago
8 changed file(s) with 46 addition(s) and 26 deletion(s). Raw diff Collapse all Expand all
0 findbugs (3.0.1-3) UNRELEASED; urgency=medium
0 findbugs (3.1.0~preview2-1) UNRELEASED; urgency=medium
11
22 * Team upload.
3 * New upstream release
4 - Refreshed the patches
35 * debian/watch: Track the release tags on GitHub
46 * Standards-Version updated to 3.9.8
57 * Use secure Vcs-* URLs
2525 # is installed. (Note: this is disabled for now.)
2626 --- a/build.xml
2727 +++ b/build.xml
28 @@ -60,12 +60,24 @@
28 @@ -61,12 +61,24 @@
2929
3030 <path id="findbugs.classpath">
3131 <fileset dir="${jar.dir}" includes="*.jar"/>
5151 <path refid="findbugs.classpath"/>
5252 </path>
5353
54 @@ -298,8 +310,8 @@
54 @@ -302,8 +314,8 @@
5555 <fileset dir="${src.dir}">
5656 <include name="**/annotations/*.java"/>
5757 </fileset>
6060 + <zipfileset src="${sys.jar.dir}/jcip.jar" excludes="META-INF/**,**/*.html"/>
6161 + <zipfileset src="${sys.jar.dir}/jsr305.jar" excludes="META-INF/**,**/*.html"/>
6262 </jar>
63 </target>
64
65 @@ -645,14 +657,12 @@
63
64 <!-- FindBugs only annotations jar file. -->
65 @@ -659,14 +671,12 @@
6666 </target>
6767
6868
7878 </java>
7979
8080 <loadproperties srcfile="${version.props.file}"/>
81 @@ -943,16 +953,15 @@
81 @@ -957,16 +967,15 @@
8282 <!-- Generate jnlp jars -->
8383 <target name="jnlp" depends="jars">
8484 <copy todir="${jnlp.dir}" file="${engine.jar}"/>
104104 <copy todir="${jnlp.dir}" file="${docsrc.dir}/buggy-sm.png"/>
105105 <copy todir="${jnlp.dir}">
106106 <fileset refid="plugin.jars"/>
107 @@ -1212,7 +1221,7 @@
107 @@ -1226,7 +1235,7 @@
108108
109109 <target name="annotationJavadoc">
110110 <javadoc access="public"
00 --- a/etc/MANIFEST-findbugsGUI.MF
11 +++ b/etc/MANIFEST-findbugsGUI.MF
22 @@ -1,3 +1,3 @@
3 Manifest-Version: 1.0
4 Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
5 -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
6 +Class-Path: bcel.jar dom4j.jar jaxen.jar asm4.jar asm4-tree.jar asm4-commons.jar jsr305.jar jFormatString.jar commons-lang.jar plastic.jar
3 Manifest-Version: 1.0
4 Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
5 -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
6 +Class-Path: bcel.jar dom4j.jar jaxen.jar asm4.jar asm4-tree.jar asm4-commons.jar jsr305.jar jFormatString.jar commons-lang.jar plastic.jar
77 --- a/etc/MANIFEST-findbugs.MF
88 +++ b/etc/MANIFEST-findbugs.MF
99 @@ -1,3 +1,3 @@
1010 Manifest-Version: 1.0
1111 Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
12 -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
12 -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
1313 +Class-Path: bcel.jar dom4j.jar jaxen.jar asm4.jar asm4-tree.jar asm4-commons.jar jsr305.jar jFormatString.jar commons-lang.jar
0 --- a/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
1 +++ b/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
2 @@ -50,7 +50,7 @@
3 * @see Frame
4 * @see DataflowAnalysis
5 */
6 -public abstract class AbstractFrameModelingVisitor<Value, FrameType extends Frame<Value>> implements VisitorSupportsInvokeDynamic {
7 +public abstract class AbstractFrameModelingVisitor<Value, FrameType extends Frame<Value>> implements Visitor {
8 private FrameType frame;
9
10 private Location location;
110 --- a/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
121 +++ b/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
132 @@ -50,6 +50,7 @@
00 --- a/build.xml
11 +++ b/build.xml
2 @@ -78,6 +78,7 @@
2 @@ -79,6 +79,7 @@
33 <pathelement location="${classes.dir}"/>
44 <pathelement location="${jar.dir}/findbugs.jar"/>
55 <pathelement location="${sys.jar.dir}/jdepend.jar"/>
77 <path refid="findbugs.classpath"/>
88 </path>
99
10 @@ -597,7 +598,7 @@
10 @@ -611,7 +612,7 @@
1111 <echo>Running JUnit test cases for FindBugs, results will be in: ${junit.dir}</echo>
1212 <delete dir="${junit.dir}"/>
1313 <mkdir dir="${junit.dir}"/>
0 Description: Do not download ASM 6 and BCEL 6
1 Author: Emmanuel Bourg <ebourg@apache.org>
2 Forwarded: not-needed
3 --- a/build.xml
4 +++ b/build.xml
5 @@ -1190,7 +1190,7 @@
6 </delete>
7 </target>
8
9 - <target name="init" depends="properties,getasm6,getbcel6">
10 + <target name="init" depends="properties">
11 <mkdir dir="${scripts.dir}"/>
12 <mkdir dir="${build.dir}"/>
13 <mkdir dir="${doc.dir}"/>
0 Description: Fixes the compatibility with the version of ASM in Debian
1 Author: Emmanuel Bourg <ebourg@apache.org>
2 Forwarded: not-needed
3 --- a/src/java/edu/umd/cs/findbugs/classfile/engine/asm/FindBugsASM.java
4 +++ b/src/java/edu/umd/cs/findbugs/classfile/engine/asm/FindBugsASM.java
5 @@ -26,6 +26,6 @@
6 */
7 public class FindBugsASM {
8
9 - public static final int ASM_VERSION = Opcodes.ASM6;
10 + public static final int ASM_VERSION = Opcodes.ASM5;
11
12 }
99 0010-bcel-for-version3.patch
1010 0011-typecast.patch
1111 0012-verbose-tests.patch
12 0013-dont-fetch-external-libraries.patch
13 0014-asm-compatibility.patch