Apply upstream changes on the license
+ fix a typo
Sylvestre Ledru
9 years ago
0 | Description: change lib denpendency from $CURDIR/lib to /usr/share/java | |
1 | --- a/build.properties | |
2 | +++ b/build.properties | |
3 | @@ -10,6 +10,8 @@ | |
4 | local.software.home =/fs/pugh/pugh | |
5 | #local.software.home =/user/daveho/local | |
6 | ||
7 | +sys.jar.dir =/usr/share/java | |
8 | + | |
9 | # Set this to the directory containing the DocBook Modular XSL Stylesheets | |
10 | # from http://docbook.sourceforge.net/projects/xsl/ | |
11 | ||
12 | @@ -27,7 +29,7 @@ | |
13 | # is installed. | |
14 | ||
15 | #saxon.home =${local.software.home}/saxon-6.5.5 | |
16 | -saxon.home =/usr/share/java | |
17 | +saxon.home =${sys.jar.dir} | |
18 | ||
19 | # Set this to the directory where FOP (http://xml.apache.org/fop/) | |
20 | # is installed. (Note: this is disabled for now.) | |
21 | --- a/build.xml | |
22 | +++ b/build.xml | |
23 | @@ -60,23 +60,23 @@ | |
24 | ||
25 | <path id="findbugs.classpath"> | |
26 | <pathelement location="${jar.dir}/bcel.jar"/> | |
27 | - <pathelement location="${jar.dir}/dom4j-1.6.1.jar"/> | |
28 | + <pathelement location="${sys.jar.dir}/dom4j.jar"/> | |
29 | <pathelement location="${jar.dir}/AppleJavaExtensions.jar"/> | |
30 | - <pathelement location="${jar.dir}/junit.jar"/> | |
31 | - <pathelement location="${jar.dir}/asm-3.3.jar"/> | |
32 | - <pathelement location="${jar.dir}/asm-commons-3.3.jar"/> | |
33 | - <pathelement location="${jar.dir}/asm-tree-3.3.jar"/> | |
34 | - <pathelement location="${jar.dir}/jaxen-1.1.1.jar"/> | |
35 | + <pathelement location="${sys.jar.dir}/junit4.jar"/> | |
36 | + <pathelement location="${sys.jar.dir}/asm3.jar"/> | |
37 | + <pathelement location="${sys.jar.dir}/asm3-commons.jar"/> | |
38 | + <pathelement location="${sys.jar.dir}/asm3-tree.jar"/> | |
39 | + <pathelement location="${sys.jar.dir}/jaxen.jar"/> | |
40 | <pathelement location="${jar.dir}/jsr305.jar"/> | |
41 | <pathelement location="${jar.dir}/jFormatString.jar"/> | |
42 | - <pathelement location="${jar.dir}/commons-lang-2.4.jar"/> | |
43 | - <pathelement location="${jar.dir}/jcip-annotations.jar"/> | |
44 | + <pathelement location="${sys.jar.dir}/commons-lang.jar"/> | |
45 | + <pathelement location="${sys.jar.dir}/jcip.jar"/> | |
46 | </path> | |
47 | ||
48 | <path id="tools.classpath"> | |
49 | <pathelement location="${classes.dir}"/> | |
50 | <pathelement location="${jar.dir}/findbugs.jar"/> | |
51 | - <pathelement location="${jar.dir}/jdepend-2.9.jar"/> | |
52 | + <pathelement location="${sys.jar.dir}/jdepend.jar"/> | |
53 | <path refid="findbugs.classpath"/> | |
54 | </path> | |
55 | ||
56 | @@ -126,16 +126,16 @@ | |
57 | <jar destfile="build/mondo.jar" | |
58 | manifest="etc/MANIFEST-findbugs-mondo.MF"> | |
59 | <zipfileset src="${jar.dir}/bcel.jar"/> | |
60 | - <zipfileset src="${jar.dir}/dom4j-1.6.1.jar"/> | |
61 | + <zipfileset src="${sys.jar.dir}/dom4j.jar"/> | |
62 | <zipfileset src="${jar.dir}/AppleJavaExtensions.jar"/> | |
63 | - <zipfileset src="${jar.dir}/junit.jar"/> | |
64 | - <zipfileset src="${jar.dir}/asm-3.3.jar"/> | |
65 | - <zipfileset src="${jar.dir}/asm-commons-3.3.jar"/> | |
66 | - <zipfileset src="${jar.dir}/asm-tree-3.3.jar"/> | |
67 | - <zipfileset src="${jar.dir}/jaxen-1.1.1.jar"/> | |
68 | + <zipfileset src="${sys.jar.dir}/junit4.jar"/> | |
69 | + <zipfileset src="${sys.jar.dir}/asm3.jar"/> | |
70 | + <zipfileset src="${sys.jar.dir}/asm3-commons.jar"/> | |
71 | + <zipfileset src="${sys.jar.dir}/asm3-tree.jar"/> | |
72 | + <zipfileset src="${sys.jar.dir}/jaxen.jar"/> | |
73 | <zipfileset src="${jar.dir}/jsr305.jar"/> | |
74 | <zipfileset src="${jar.dir}/jFormatString.jar"/> | |
75 | - <zipfileset src="${jar.dir}/commons-lang-2.4.jar"/> | |
76 | + <zipfileset src="${sys.jar.dir}/commons-lang.jar"/> | |
77 | <zipfileset src="${jar.dir}/findbugs.jar"/> | |
78 | </jar> | |
79 | </target> | |
80 | @@ -313,7 +313,7 @@ | |
81 | <fileset dir="${src.dir}"> | |
82 | <include name="**/annotations/*.java"/> | |
83 | </fileset> | |
84 | - <zipfileset src="${jar.dir}/jcip-annotations.jar" excludes="META-INF/**,**/*.html"/> | |
85 | + <zipfileset src="${sys.jar.dir}/jcip.jar" excludes="META-INF/**,**/*.html"/> | |
86 | <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**,**/*.html"/> | |
87 | </jar> | |
88 | </target> | |
89 | @@ -348,18 +348,18 @@ | |
90 | ||
91 | <zipfileset src="${jar.dir}/bcel.jar" excludes="META-INF/**"/> | |
92 | ||
93 | - <zipfileset src="${jar.dir}/asm-3.3.jar" excludes="META-INF/**"/> | |
94 | - <zipfileset src="${jar.dir}/asm-analysis-3.3.jar" excludes="META-INF/**"/> | |
95 | - <zipfileset src="${jar.dir}/asm-commons-3.3.jar" excludes="META-INF/**"/> | |
96 | - <zipfileset src="${jar.dir}/asm-tree-3.3.jar" excludes="META-INF/**"/> | |
97 | - <zipfileset src="${jar.dir}/asm-util-3.3.jar" excludes="META-INF/**"/> | |
98 | - <zipfileset src="${jar.dir}/asm-xml-3.3.jar" excludes="META-INF/**"/> | |
99 | + <zipfileset src="${sys.jar.dir}/asm3.jar" excludes="META-INF/**"/> | |
100 | + <zipfileset src="${sys.jar.dir}/asm3-analysis.jar" excludes="META-INF/**"/> | |
101 | + <zipfileset src="${sys.jar.dir}/asm3-commons.jar" excludes="META-INF/**"/> | |
102 | + <zipfileset src="${sys.jar.dir}/asm3-tree.jar" excludes="META-INF/**"/> | |
103 | + <zipfileset src="${sys.jar.dir}/asm3-util.jar" excludes="META-INF/**"/> | |
104 | + <zipfileset src="${sys.jar.dir}/asm3-xml.jar" excludes="META-INF/**"/> | |
105 | ||
106 | - <zipfileset src="${jar.dir}/dom4j-1.6.1.jar" excludes="META-INF/**"/> | |
107 | - <zipfileset src="${jar.dir}/jaxen-1.1.1.jar" excludes="META-INF/**"/> | |
108 | + <zipfileset src="${sys.jar.dir}/dom4j.jar" excludes="META-INF/**"/> | |
109 | + <zipfileset src="${sys.jar.dir}/jaxen.jar" excludes="META-INF/**"/> | |
110 | <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**"/> | |
111 | <zipfileset src="${jar.dir}/jFormatString.jar" excludes="META-INF/**"/> | |
112 | - <zipfileset src="${jar.dir}/commons-lang-2.4.jar" excludes="META-INF/**"/> | |
113 | + <zipfileset src="${sys.jar.dir}/commons-lang.jar" excludes="META-INF/**"/> | |
114 | </jar> | |
115 | </target> | |
116 | ||
117 | @@ -512,7 +512,7 @@ | |
118 | jvmargs="-ea -Xmx1200m" | |
119 | projectName="Byte code Engineering Library (BCEL)" | |
120 | outputFile="${sampleoutput.dir}/bcel-cloud.xml" > | |
121 | - <class location="${jar.dir}/bcel.jar" /> | |
122 | + <class location="${sys.jar.dir}/bcel.jar" /> | |
123 | </findbugs> | |
124 | --> | |
125 | ||
126 | @@ -994,13 +994,13 @@ | |
127 | <copy todir="${jnlp.dir}" file="${engine.jar}"/> | |
128 | <copy todir="${jnlp.dir}" file="${jar.dir}/bcel.jar"/> | |
129 | <copy todir="${jnlp.dir}" file="${jar.dir}/jsr305.jar"/> | |
130 | - <copy todir="${jnlp.dir}" file="${jar.dir}/asm-3.3.jar"/> | |
131 | - <copy todir="${jnlp.dir}" file="${jar.dir}/asm-commons-3.3.jar"/> | |
132 | - <copy todir="${jnlp.dir}" file="${jar.dir}/asm-tree-3.3.jar"/> | |
133 | - <copy todir="${jnlp.dir}" file="${jar.dir}/dom4j-1.6.1.jar"/> | |
134 | - <copy todir="${jnlp.dir}" file="${jar.dir}/jaxen-1.1.1.jar"/> | |
135 | + <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3.jar"/> | |
136 | + <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-commons.jar"/> | |
137 | + <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-tree.jar"/> | |
138 | + <copy todir="${jnlp.dir}" file="${sys.jar.dir}/dom4j.jar"/> | |
139 | + <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jaxen.jar"/> | |
140 | <copy todir="${jnlp.dir}" file="${jar.dir}/jFormatString.jar"/> | |
141 | - <copy todir="${jnlp.dir}" file="${jar.dir}/commons-lang-2.4.jar"/> | |
142 | + <copy todir="${jnlp.dir}" file="${sys.jar.dir}/commons-lang.jar"/> | |
143 | <copy todir="${jnlp.dir}" file="${jar.dir}/AppleJavaExtensions.jar"/> | |
144 | <copy todir="${jnlp.dir}" file="${docsrc.dir}/buggy-sm.png"/> | |
145 | <copy todir="${jnlp.dir}"> |
0 | Description: change lib dependency from $CURDIR/lib to /usr/share/java | |
1 | --- a/build.properties | |
2 | +++ b/build.properties | |
3 | @@ -10,6 +10,8 @@ | |
4 | local.software.home =/fs/pugh/pugh | |
5 | #local.software.home =/user/daveho/local | |
6 | ||
7 | +sys.jar.dir =/usr/share/java | |
8 | + | |
9 | # Set this to the directory containing the DocBook Modular XSL Stylesheets | |
10 | # from http://docbook.sourceforge.net/projects/xsl/ | |
11 | ||
12 | @@ -27,7 +29,7 @@ | |
13 | # is installed. | |
14 | ||
15 | #saxon.home =${local.software.home}/saxon-6.5.5 | |
16 | -saxon.home =/usr/share/java | |
17 | +saxon.home =${sys.jar.dir} | |
18 | ||
19 | # Set this to the directory where FOP (http://xml.apache.org/fop/) | |
20 | # is installed. (Note: this is disabled for now.) | |
21 | --- a/build.xml | |
22 | +++ b/build.xml | |
23 | @@ -60,23 +60,23 @@ | |
24 | ||
25 | <path id="findbugs.classpath"> | |
26 | <pathelement location="${jar.dir}/bcel.jar"/> | |
27 | - <pathelement location="${jar.dir}/dom4j-1.6.1.jar"/> | |
28 | + <pathelement location="${sys.jar.dir}/dom4j.jar"/> | |
29 | <pathelement location="${jar.dir}/AppleJavaExtensions.jar"/> | |
30 | - <pathelement location="${jar.dir}/junit.jar"/> | |
31 | - <pathelement location="${jar.dir}/asm-3.3.jar"/> | |
32 | - <pathelement location="${jar.dir}/asm-commons-3.3.jar"/> | |
33 | - <pathelement location="${jar.dir}/asm-tree-3.3.jar"/> | |
34 | - <pathelement location="${jar.dir}/jaxen-1.1.1.jar"/> | |
35 | + <pathelement location="${sys.jar.dir}/junit4.jar"/> | |
36 | + <pathelement location="${sys.jar.dir}/asm3.jar"/> | |
37 | + <pathelement location="${sys.jar.dir}/asm3-commons.jar"/> | |
38 | + <pathelement location="${sys.jar.dir}/asm3-tree.jar"/> | |
39 | + <pathelement location="${sys.jar.dir}/jaxen.jar"/> | |
40 | <pathelement location="${jar.dir}/jsr305.jar"/> | |
41 | <pathelement location="${jar.dir}/jFormatString.jar"/> | |
42 | - <pathelement location="${jar.dir}/commons-lang-2.4.jar"/> | |
43 | - <pathelement location="${jar.dir}/jcip-annotations.jar"/> | |
44 | + <pathelement location="${sys.jar.dir}/commons-lang.jar"/> | |
45 | + <pathelement location="${sys.jar.dir}/jcip.jar"/> | |
46 | </path> | |
47 | ||
48 | <path id="tools.classpath"> | |
49 | <pathelement location="${classes.dir}"/> | |
50 | <pathelement location="${jar.dir}/findbugs.jar"/> | |
51 | - <pathelement location="${jar.dir}/jdepend-2.9.jar"/> | |
52 | + <pathelement location="${sys.jar.dir}/jdepend.jar"/> | |
53 | <path refid="findbugs.classpath"/> | |
54 | </path> | |
55 | ||
56 | @@ -126,16 +126,16 @@ | |
57 | <jar destfile="build/mondo.jar" | |
58 | manifest="etc/MANIFEST-findbugs-mondo.MF"> | |
59 | <zipfileset src="${jar.dir}/bcel.jar"/> | |
60 | - <zipfileset src="${jar.dir}/dom4j-1.6.1.jar"/> | |
61 | + <zipfileset src="${sys.jar.dir}/dom4j.jar"/> | |
62 | <zipfileset src="${jar.dir}/AppleJavaExtensions.jar"/> | |
63 | - <zipfileset src="${jar.dir}/junit.jar"/> | |
64 | - <zipfileset src="${jar.dir}/asm-3.3.jar"/> | |
65 | - <zipfileset src="${jar.dir}/asm-commons-3.3.jar"/> | |
66 | - <zipfileset src="${jar.dir}/asm-tree-3.3.jar"/> | |
67 | - <zipfileset src="${jar.dir}/jaxen-1.1.1.jar"/> | |
68 | + <zipfileset src="${sys.jar.dir}/junit4.jar"/> | |
69 | + <zipfileset src="${sys.jar.dir}/asm3.jar"/> | |
70 | + <zipfileset src="${sys.jar.dir}/asm3-commons.jar"/> | |
71 | + <zipfileset src="${sys.jar.dir}/asm3-tree.jar"/> | |
72 | + <zipfileset src="${sys.jar.dir}/jaxen.jar"/> | |
73 | <zipfileset src="${jar.dir}/jsr305.jar"/> | |
74 | <zipfileset src="${jar.dir}/jFormatString.jar"/> | |
75 | - <zipfileset src="${jar.dir}/commons-lang-2.4.jar"/> | |
76 | + <zipfileset src="${sys.jar.dir}/commons-lang.jar"/> | |
77 | <zipfileset src="${jar.dir}/findbugs.jar"/> | |
78 | </jar> | |
79 | </target> | |
80 | @@ -313,7 +313,7 @@ | |
81 | <fileset dir="${src.dir}"> | |
82 | <include name="**/annotations/*.java"/> | |
83 | </fileset> | |
84 | - <zipfileset src="${jar.dir}/jcip-annotations.jar" excludes="META-INF/**,**/*.html"/> | |
85 | + <zipfileset src="${sys.jar.dir}/jcip.jar" excludes="META-INF/**,**/*.html"/> | |
86 | <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**,**/*.html"/> | |
87 | </jar> | |
88 | </target> | |
89 | @@ -348,18 +348,18 @@ | |
90 | ||
91 | <zipfileset src="${jar.dir}/bcel.jar" excludes="META-INF/**"/> | |
92 | ||
93 | - <zipfileset src="${jar.dir}/asm-3.3.jar" excludes="META-INF/**"/> | |
94 | - <zipfileset src="${jar.dir}/asm-analysis-3.3.jar" excludes="META-INF/**"/> | |
95 | - <zipfileset src="${jar.dir}/asm-commons-3.3.jar" excludes="META-INF/**"/> | |
96 | - <zipfileset src="${jar.dir}/asm-tree-3.3.jar" excludes="META-INF/**"/> | |
97 | - <zipfileset src="${jar.dir}/asm-util-3.3.jar" excludes="META-INF/**"/> | |
98 | - <zipfileset src="${jar.dir}/asm-xml-3.3.jar" excludes="META-INF/**"/> | |
99 | + <zipfileset src="${sys.jar.dir}/asm3.jar" excludes="META-INF/**"/> | |
100 | + <zipfileset src="${sys.jar.dir}/asm3-analysis.jar" excludes="META-INF/**"/> | |
101 | + <zipfileset src="${sys.jar.dir}/asm3-commons.jar" excludes="META-INF/**"/> | |
102 | + <zipfileset src="${sys.jar.dir}/asm3-tree.jar" excludes="META-INF/**"/> | |
103 | + <zipfileset src="${sys.jar.dir}/asm3-util.jar" excludes="META-INF/**"/> | |
104 | + <zipfileset src="${sys.jar.dir}/asm3-xml.jar" excludes="META-INF/**"/> | |
105 | ||
106 | - <zipfileset src="${jar.dir}/dom4j-1.6.1.jar" excludes="META-INF/**"/> | |
107 | - <zipfileset src="${jar.dir}/jaxen-1.1.1.jar" excludes="META-INF/**"/> | |
108 | + <zipfileset src="${sys.jar.dir}/dom4j.jar" excludes="META-INF/**"/> | |
109 | + <zipfileset src="${sys.jar.dir}/jaxen.jar" excludes="META-INF/**"/> | |
110 | <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**"/> | |
111 | <zipfileset src="${jar.dir}/jFormatString.jar" excludes="META-INF/**"/> | |
112 | - <zipfileset src="${jar.dir}/commons-lang-2.4.jar" excludes="META-INF/**"/> | |
113 | + <zipfileset src="${sys.jar.dir}/commons-lang.jar" excludes="META-INF/**"/> | |
114 | </jar> | |
115 | </target> | |
116 | ||
117 | @@ -512,7 +512,7 @@ | |
118 | jvmargs="-ea -Xmx1200m" | |
119 | projectName="Byte code Engineering Library (BCEL)" | |
120 | outputFile="${sampleoutput.dir}/bcel-cloud.xml" > | |
121 | - <class location="${jar.dir}/bcel.jar" /> | |
122 | + <class location="${sys.jar.dir}/bcel.jar" /> | |
123 | </findbugs> | |
124 | --> | |
125 | ||
126 | @@ -994,13 +994,13 @@ | |
127 | <copy todir="${jnlp.dir}" file="${engine.jar}"/> | |
128 | <copy todir="${jnlp.dir}" file="${jar.dir}/bcel.jar"/> | |
129 | <copy todir="${jnlp.dir}" file="${jar.dir}/jsr305.jar"/> | |
130 | - <copy todir="${jnlp.dir}" file="${jar.dir}/asm-3.3.jar"/> | |
131 | - <copy todir="${jnlp.dir}" file="${jar.dir}/asm-commons-3.3.jar"/> | |
132 | - <copy todir="${jnlp.dir}" file="${jar.dir}/asm-tree-3.3.jar"/> | |
133 | - <copy todir="${jnlp.dir}" file="${jar.dir}/dom4j-1.6.1.jar"/> | |
134 | - <copy todir="${jnlp.dir}" file="${jar.dir}/jaxen-1.1.1.jar"/> | |
135 | + <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3.jar"/> | |
136 | + <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-commons.jar"/> | |
137 | + <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-tree.jar"/> | |
138 | + <copy todir="${jnlp.dir}" file="${sys.jar.dir}/dom4j.jar"/> | |
139 | + <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jaxen.jar"/> | |
140 | <copy todir="${jnlp.dir}" file="${jar.dir}/jFormatString.jar"/> | |
141 | - <copy todir="${jnlp.dir}" file="${jar.dir}/commons-lang-2.4.jar"/> | |
142 | + <copy todir="${jnlp.dir}" file="${sys.jar.dir}/commons-lang.jar"/> | |
143 | <copy todir="${jnlp.dir}" file="${jar.dir}/AppleJavaExtensions.jar"/> | |
144 | <copy todir="${jnlp.dir}" file="${docsrc.dir}/buggy-sm.png"/> | |
145 | <copy todir="${jnlp.dir}"> |
0 | commit 2df3880705ea963a5a8504043468e08b5255ada3 | |
1 | Author: yesx <yeshuxiong@gmail.com> | |
2 | Date: Tue Oct 8 15:17:10 2013 +0800 | |
3 | ||
4 | apply upstream changes of r14800, update copyright of src/gui/edu/umd/cs/findbugs/gui2/CloudCommentsPane.java | |
5 | ||
6 | diff --git a/src/gui/edu/umd/cs/findbugs/gui2/CloudCommentsPane.java b/src/gui/edu/umd/cs/findbugs/gui2/CloudCommentsPane.java | |
7 | index 4b2b9a1..1d9869f 100644 | |
8 | --- a/src/gui/edu/umd/cs/findbugs/gui2/CloudCommentsPane.java | |
9 | +++ b/src/gui/edu/umd/cs/findbugs/gui2/CloudCommentsPane.java | |
10 | @@ -1,20 +1,20 @@ | |
11 | /* | |
12 | - * Copyright 2010 Keith Lea | |
13 | + * FindBugs - Find bugs in Java programs | |
14 | + * Copyright (C) 2010-2013 University of Maryland | |
15 | * | |
16 | - * This file is part of FindBugs-IDEA. | |
17 | + * This library is free software; you can redistribute it and/or | |
18 | + * modify it under the terms of the GNU Lesser General Public | |
19 | + * License as published by the Free Software Foundation; either | |
20 | + * version 2.1 of the License, or (at your option) any later version. | |
21 | * | |
22 | - * FindBugs-IDEA is free software: you can redistribute it and/or modify | |
23 | - * it under the terms of the GNU General Public License as published by | |
24 | - * the Free Software Foundation, either version 3 of the License, or | |
25 | - * (at your option) any later version. | |
26 | - * | |
27 | - * FindBugs-IDEA is distributed in the hope that it will be useful, | |
28 | + * This library is distributed in the hope that it will be useful, | |
29 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
30 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
31 | - * GNU General Public License for more details. | |
32 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
33 | + * Lesser General Public License for more details. | |
34 | * | |
35 | - * You should have received a copy of the GNU General Public License | |
36 | - * along with FindBugs-IDEA. If not, see <http://www.gnu.org/licenses/>. | |
37 | + * You should have received a copy of the GNU Lesser General Public | |
38 | + * License along with this library; if not, write to the Free Software | |
39 | + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
40 | */ | |
41 | ||
42 | package edu.umd.cs.findbugs.gui2; |
0 | commit e6452ea9d3895df1113999d1aa32c98486dd2de7 | |
1 | Author: yesx <yeshuxiong@gmail.com> | |
2 | Date: Fri Sep 20 16:35:15 2013 +0800 | |
3 | ||
4 | apply upstream changes of r14773, update copyright of src/antTask/edu/umd/cs/findbugs/anttask/FindBugsTask.java | |
5 | update debian/copyright | |
6 | ||
7 | diff --git a/src/antTask/edu/umd/cs/findbugs/anttask/FindBugsTask.java b/src/antTask/edu/umd/cs/findbugs/anttask/FindBugsTask.java | |
8 | index 8d91534..ce76e49 100644 | |
9 | --- a/src/antTask/edu/umd/cs/findbugs/anttask/FindBugsTask.java | |
10 | +++ b/src/antTask/edu/umd/cs/findbugs/anttask/FindBugsTask.java | |
11 | @@ -1,55 +1,20 @@ | |
12 | /* | |
13 | - * The Apache Software License, Version 1.1 | |
14 | + * FindBugs - Find Bugs in Java programs | |
15 | + * Copyright (C) 2003-2013 University of Maryland | |
16 | * | |
17 | - * Copyright (c) 2000-2002 The Apache Software Foundation. All rights | |
18 | - * reserved. | |
19 | + * This library is free software; you can redistribute it and/or | |
20 | + * modify it under the terms of the GNU Lesser General Public | |
21 | + * License as published by the Free Software Foundation; either | |
22 | + * version 2.1 of the License, or (at your option) any later version. | |
23 | * | |
24 | - * Redistribution and use in source and binary forms, with or without | |
25 | - * modification, are permitted provided that the following conditions | |
26 | - * are met: | |
27 | + * This library is distributed in the hope that it will be useful, | |
28 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
29 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
30 | + * Lesser General Public License for more details. | |
31 | * | |
32 | - * 1. Redistributions of source code must retain the above copyright | |
33 | - * notice, this list of conditions and the following disclaimer. | |
34 | - * | |
35 | - * 2. Redistributions in binary form must reproduce the above copyright | |
36 | - * notice, this list of conditions and the following disclaimer in | |
37 | - * the documentation and/or other materials provided with the | |
38 | - * distribution. | |
39 | - * | |
40 | - * 3. The end-user documentation included with the redistribution, if | |
41 | - * any, must include the following acknowlegement: | |
42 | - * "This product includes software developed by the | |
43 | - * Apache Software Foundation (http://www.apache.org/)." | |
44 | - * Alternately, this acknowlegement may appear in the software itself, | |
45 | - * if and wherever such third-party acknowlegements normally appear. | |
46 | - * | |
47 | - * 4. The names "Ant" and "Apache Software | |
48 | - * Foundation" must not be used to endorse or promote products derived | |
49 | - * from this software without prior written permission. For written | |
50 | - * permission, please contact apache@apache.org. | |
51 | - * | |
52 | - * 5. Products derived from this software may not be called "Apache" | |
53 | - * nor may "Apache" appear in their names without prior written | |
54 | - * permission of the Apache Group. | |
55 | - * | |
56 | - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED | |
57 | - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
58 | - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | |
59 | - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR | |
60 | - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |
61 | - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | |
62 | - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | |
63 | - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | |
64 | - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | |
65 | - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT | |
66 | - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
67 | - * SUCH DAMAGE. | |
68 | - * ==================================================================== | |
69 | - * | |
70 | - * This software consists of voluntary contributions made by many | |
71 | - * individuals on behalf of the Apache Software Foundation. For more | |
72 | - * information on the Apache Software Foundation, please see | |
73 | - * <http://www.apache.org/>. | |
74 | + * You should have received a copy of the GNU Lesser General Public | |
75 | + * License along with this library; if not, write to the Free Software | |
76 | + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
77 | */ | |
78 | ||
79 | package edu.umd.cs.findbugs.anttask; |
0 | 0 | 0001-fix-ant-docs.patch |
1 | 0002-change-lib-denpendency-to-usr-dir.patch | |
1 | 0002-change-lib-dependency-to-usr-dir.patch | |
2 | 2 | 0003-fix-findbugs-lib-denpendency.patch |
3 | 3 | 0004-remove-manual_ja_xml.patch |
4 | 4 | 0005-remove-lib-AppleJavaExtensions.patch |
7 | 7 | use-system-jar.patch |
8 | 8 | 0009-fix-buildxml-lib-denpendency-for-bcel-jformatstring.patch |
9 | 9 | 0010-improve-fb-help-information.patch |
10 | 0011-upstream-change-license.patch | |
11 | 0012-upstream-change-license.patch |