Refreshed the patches
Emmanuel Bourg
7 years ago
0 | |
findbugs (3.0.1-3) UNRELEASED; urgency=medium
|
|
0 |
findbugs (3.1.0~preview2-1) UNRELEASED; urgency=medium
|
1 | 1 |
|
2 | 2 |
* Team upload.
|
|
3 |
* New upstream release
|
|
4 |
- Refreshed the patches
|
3 | 5 |
* debian/watch: Track the release tags on GitHub
|
4 | 6 |
* Standards-Version updated to 3.9.8
|
5 | 7 |
* Use secure Vcs-* URLs
|
25 | 25 |
# is installed. (Note: this is disabled for now.)
|
26 | 26 |
--- a/build.xml
|
27 | 27 |
+++ b/build.xml
|
28 | |
@@ -60,12 +60,24 @@
|
|
28 |
@@ -61,12 +61,24 @@
|
29 | 29 |
|
30 | 30 |
<path id="findbugs.classpath">
|
31 | 31 |
<fileset dir="${jar.dir}" includes="*.jar"/>
|
|
51 | 51 |
<path refid="findbugs.classpath"/>
|
52 | 52 |
</path>
|
53 | 53 |
|
54 | |
@@ -298,8 +310,8 @@
|
|
54 |
@@ -302,8 +314,8 @@
|
55 | 55 |
<fileset dir="${src.dir}">
|
56 | 56 |
<include name="**/annotations/*.java"/>
|
57 | 57 |
</fileset>
|
|
60 | 60 |
+ <zipfileset src="${sys.jar.dir}/jcip.jar" excludes="META-INF/**,**/*.html"/>
|
61 | 61 |
+ <zipfileset src="${sys.jar.dir}/jsr305.jar" excludes="META-INF/**,**/*.html"/>
|
62 | 62 |
</jar>
|
63 | |
</target>
|
64 | |
|
65 | |
@@ -645,14 +657,12 @@
|
|
63 |
|
|
64 |
<!-- FindBugs only annotations jar file. -->
|
|
65 |
@@ -659,14 +671,12 @@
|
66 | 66 |
</target>
|
67 | 67 |
|
68 | 68 |
|
|
78 | 78 |
</java>
|
79 | 79 |
|
80 | 80 |
<loadproperties srcfile="${version.props.file}"/>
|
81 | |
@@ -943,16 +953,15 @@
|
|
81 |
@@ -957,16 +967,15 @@
|
82 | 82 |
<!-- Generate jnlp jars -->
|
83 | 83 |
<target name="jnlp" depends="jars">
|
84 | 84 |
<copy todir="${jnlp.dir}" file="${engine.jar}"/>
|
|
104 | 104 |
<copy todir="${jnlp.dir}" file="${docsrc.dir}/buggy-sm.png"/>
|
105 | 105 |
<copy todir="${jnlp.dir}">
|
106 | 106 |
<fileset refid="plugin.jars"/>
|
107 | |
@@ -1212,7 +1221,7 @@
|
|
107 |
@@ -1226,7 +1235,7 @@
|
108 | 108 |
|
109 | 109 |
<target name="annotationJavadoc">
|
110 | 110 |
<javadoc access="public"
|
0 | 0 |
--- a/etc/MANIFEST-findbugsGUI.MF
|
1 | 1 |
+++ b/etc/MANIFEST-findbugsGUI.MF
|
2 | 2 |
@@ -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
|
7 | 7 |
--- a/etc/MANIFEST-findbugs.MF
|
8 | 8 |
+++ b/etc/MANIFEST-findbugs.MF
|
9 | 9 |
@@ -1,3 +1,3 @@
|
10 | 10 |
Manifest-Version: 1.0
|
11 | 11 |
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
|
13 | 13 |
+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;
|
11 | 0 |
--- a/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
|
12 | 1 |
+++ b/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
|
13 | 2 |
@@ -50,6 +50,7 @@
|
0 | 0 |
--- a/build.xml
|
1 | 1 |
+++ b/build.xml
|
2 | |
@@ -78,6 +78,7 @@
|
|
2 |
@@ -79,6 +79,7 @@
|
3 | 3 |
<pathelement location="${classes.dir}"/>
|
4 | 4 |
<pathelement location="${jar.dir}/findbugs.jar"/>
|
5 | 5 |
<pathelement location="${sys.jar.dir}/jdepend.jar"/>
|
|
7 | 7 |
<path refid="findbugs.classpath"/>
|
8 | 8 |
</path>
|
9 | 9 |
|
10 | |
@@ -597,7 +598,7 @@
|
|
10 |
@@ -611,7 +612,7 @@
|
11 | 11 |
<echo>Running JUnit test cases for FindBugs, results will be in: ${junit.dir}</echo>
|
12 | 12 |
<delete dir="${junit.dir}"/>
|
13 | 13 |
<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 |
}
|
9 | 9 |
0010-bcel-for-version3.patch
|
10 | 10 |
0011-typecast.patch
|
11 | 11 |
0012-verbose-tests.patch
|
|
12 |
0013-dont-fetch-external-libraries.patch
|
|
13 |
0014-asm-compatibility.patch
|