Codebase list findbugs / 1018c13
fix findbugs lib dependency yesx 10 years ago
3 changed file(s) with 220 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all
0 Index: findbugs-2.0.2/findbugs.iml
1 ===================================================================
2 --- findbugs-2.0.2.orig/findbugs.iml 2013-08-24 16:56:25.615080410 +0800
3 +++ findbugs-2.0.2/findbugs.iml 2013-08-24 16:56:34.419080340 +0800
4 @@ -42,9 +42,9 @@
5 </library>
6 </orderEntry>
7 <orderEntry type="module-library" exported="">
8 - <library name="dom4j-1.6.1.jar">
9 + <library name="dom4j.jar">
10 <CLASSES>
11 - <root url="jar://$MODULE_DIR$/lib/dom4j-1.6.1.jar!/" />
12 + <root url="jar://$MODULE_DIR$/lib/dom4j.jar!/" />
13 </CLASSES>
14 <JAVADOC>
15 <root url="http://dom4j.sourceforge.net/dom4j-1.6.1/apidocs/" />
16 @@ -53,18 +53,18 @@
17 </library>
18 </orderEntry>
19 <orderEntry type="module-library" exported="">
20 - <library name="junit.jar">
21 + <library name="junit4.jar">
22 <CLASSES>
23 - <root url="jar://$MODULE_DIR$/lib/junit.jar!/" />
24 + <root url="jar://$MODULE_DIR$/lib/junit4.jar!/" />
25 </CLASSES>
26 <JAVADOC />
27 <SOURCES />
28 </library>
29 </orderEntry>
30 <orderEntry type="module-library" exported="">
31 - <library name="commons-lang-2.4.jar">
32 + <library name="commons-lang.jar">
33 <CLASSES>
34 - <root url="jar://$MODULE_DIR$/lib/commons-lang-2.4.jar!/" />
35 + <root url="jar://$MODULE_DIR$/lib/commons-lang.jar!/" />
36 </CLASSES>
37 <JAVADOC />
38 <SOURCES />
39 @@ -80,9 +80,9 @@
40 </library>
41 </orderEntry>
42 <orderEntry type="module-library" exported="">
43 - <library name="jaxen-1.1.1.jar">
44 + <library name="jaxen.jar">
45 <CLASSES>
46 - <root url="jar://$MODULE_DIR$/lib/jaxen-1.1.1.jar!/" />
47 + <root url="jar://$MODULE_DIR$/lib/jaxen.jar!/" />
48 </CLASSES>
49 <JAVADOC />
50 <SOURCES />
51 @@ -98,36 +98,36 @@
52 </library>
53 </orderEntry>
54 <orderEntry type="module-library" exported="">
55 - <library name="jdepend-2.9.jar">
56 + <library name="jdepend.jar">
57 <CLASSES>
58 - <root url="jar://$MODULE_DIR$/lib/jdepend-2.9.jar!/" />
59 + <root url="jar://$MODULE_DIR$/lib/jdepend.jar!/" />
60 </CLASSES>
61 <JAVADOC />
62 <SOURCES />
63 </library>
64 </orderEntry>
65 <orderEntry type="module-library" exported="">
66 - <library name="asm-3.3.jar">
67 + <library name="asm3.jar">
68 <CLASSES>
69 - <root url="jar://$MODULE_DIR$/lib/asm-3.3.jar!/" />
70 + <root url="jar://$MODULE_DIR$/lib/asm3.jar!/" />
71 </CLASSES>
72 <JAVADOC />
73 <SOURCES />
74 </library>
75 </orderEntry>
76 <orderEntry type="module-library" exported="">
77 - <library name="asm-commons-3.3.jar">
78 + <library name="asm3-commons.jar">
79 <CLASSES>
80 - <root url="jar://$MODULE_DIR$/lib/asm-commons-3.3.jar!/" />
81 + <root url="jar://$MODULE_DIR$/lib/asm3-commons.jar!/" />
82 </CLASSES>
83 <JAVADOC />
84 <SOURCES />
85 </library>
86 </orderEntry>
87 <orderEntry type="module-library" exported="">
88 - <library name="asm-tree-3.3.jar">
89 + <library name="asm3-tree.jar">
90 <CLASSES>
91 - <root url="jar://$MODULE_DIR$/lib/asm-tree-3.3.jar!/" />
92 + <root url="jar://$MODULE_DIR$/lib/asm3-tree.jar!/" />
93 </CLASSES>
94 <JAVADOC />
95 <SOURCES />
96 @@ -146,7 +146,7 @@
97 <orderEntry type="module-library">
98 <library>
99 <CLASSES>
100 - <root url="jar://$MODULE_DIR$/lib/jcip-annotations.jar!/" />
101 + <root url="jar://$MODULE_DIR$/lib/jcip.jar!/" />
102 </CLASSES>
103 <JAVADOC />
104 <SOURCES />
105 Index: findbugs-2.0.2/etc/MANIFEST-findbugsGUI.MF
106 ===================================================================
107 --- findbugs-2.0.2.orig/etc/MANIFEST-findbugsGUI.MF 2013-08-21 02:12:56.000000000 +0800
108 +++ findbugs-2.0.2/etc/MANIFEST-findbugsGUI.MF 2013-08-24 16:58:17.219079539 +0800
109 @@ -1,3 +1,3 @@
110 Manifest-Version: 1.0
111 Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
112 -Class-Path: findbugs.jar bcel.jar dom4j-1.6.1.jar jaxen-1.1.1.jar plastic.jar
113 +Class-Path: findbugs.jar bcel.jar dom4j.jar jaxen.jar plastic.jar
114 Index: findbugs-2.0.2/etc/MANIFEST-findbugs.MF
115 ===================================================================
116 --- findbugs-2.0.2.orig/etc/MANIFEST-findbugs.MF 2013-08-21 02:12:56.000000000 +0800
117 +++ findbugs-2.0.2/etc/MANIFEST-findbugs.MF 2013-08-24 16:57:37.435079847 +0800
118 @@ -1,3 +1,3 @@
119 Manifest-Version: 1.0
120 Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
121 -Class-Path: bcel.jar dom4j-1.6.1.jar jaxen-1.1.1.jar asm-3.3.jar asm-tree-3.3.jar asm-commons-3.3.jar jsr305.jar jFormatString.jar commons-lang-2.4.jar
122 +Class-Path: bcel.jar dom4j.jar jaxen.jar asm3.jar asm3-tree.jar asm3-commons.jar jsr305.jar jFormatString.jar commons-lang.jar
123 Index: findbugs-2.0.2/build.xml
124 ===================================================================
125 --- findbugs-2.0.2.orig/build.xml 2013-08-24 16:56:34.407080340 +0800
126 +++ findbugs-2.0.2/build.xml 2013-08-24 16:59:08.071079139 +0800
127 @@ -1272,7 +1272,7 @@
128
129 <target name="annotationJavadoc">
130 <javadoc access="public"
131 - classpath="lib/bcel.jar:lib/junit.jar:lib/dom4j-1.6.1.jar:lib/jsr305.jar:lib/AppleJavaExtensions.jar"
132 + classpath="lib/bcel.jar:lib/junit.jar:lib/dom4j.jar:lib/jsr305.jar:lib/AppleJavaExtensions.jar"
133 destdir="${annotationDoc.dir}"
134 packagenames="edu.umd.cs.findbugs.annotations"
135 doctitle="FindBugs Annotation Documentation"
136 Index: findbugs-2.0.2/jnlp/core.jnlp
137 ===================================================================
138 --- findbugs-2.0.2.orig/jnlp/core.jnlp 2013-08-24 17:00:07.375078675 +0800
139 +++ findbugs-2.0.2/jnlp/core.jnlp 2013-08-24 17:01:44.555077915 +0800
140 @@ -15,13 +15,13 @@
141 <resources>
142 <jar href="AppleJavaExtensions.jar"/>
143 <jar href="bcel.jar"/>
144 - <jar href="dom4j-1.6.1.jar"/>
145 - <jar href="asm-3.3.jar"/>
146 - <jar href="asm-tree-3.3.jar"/>
147 - <jar href="asm-commons-3.3.jar"/>
148 - <jar href="jaxen-1.1.1.jar"/>
149 + <jar href="dom4j.jar"/>
150 + <jar href="asm3.jar"/>
151 + <jar href="asm3-tree.jar"/>
152 + <jar href="asm3-commons.jar"/>
153 + <jar href="jaxen.jar"/>
154 <jar href="jFormatString.jar"/>
155 - <jar href="commons-lang-2.4.jar"/>
156 + <jar href="commons-lang.jar"/>
157 <jar href="jsr305.jar"/>
158 </resources>
159 <component-desc />
160 Index: findbugs-2.0.2/jnlp/findbugs.jnlp
161 ===================================================================
162 --- findbugs-2.0.2.orig/jnlp/findbugs.jnlp 2013-08-21 02:12:56.000000000 +0800
163 +++ findbugs-2.0.2/jnlp/findbugs.jnlp 2013-08-24 17:02:18.547077649 +0800
164 @@ -20,13 +20,13 @@
165 <jar href="findbugs.jar"/>
166 <jar href="AppleJavaExtensions.jar"/>
167 <jar href="bcel.jar"/>
168 - <jar href="dom4j-1.6.1.jar"/>
169 - <jar href="asm-3.3.jar"/>
170 - <jar href="asm-tree-3.3.jar"/>
171 - <jar href="asm-commons-3.3.jar"/>
172 - <jar href="jaxen-1.1.1.jar"/>
173 + <jar href="dom4j.jar"/>
174 + <jar href="asm3.jar"/>
175 + <jar href="asm3-tree.jar"/>
176 + <jar href="asm3-commons.jar"/>
177 + <jar href="jaxen.jar"/>
178 <jar href="jFormatString.jar"/>
179 - <jar href="commons-lang-2.4.jar"/>
180 + <jar href="commons-lang.jar"/>
181 <jar href="jsr305.jar"/>
182 <property name="findbugs.jaws" value="true"/>
183 <property name="findbugs.noSummary" value="true"/>
184 Index: findbugs-2.0.2/META-INF/MANIFEST.MF
185 ===================================================================
186 --- findbugs-2.0.2.orig/META-INF/MANIFEST.MF 2013-08-21 02:12:56.000000000 +0800
187 +++ findbugs-2.0.2/META-INF/MANIFEST.MF 2013-08-24 17:03:05.103077287 +0800
188 @@ -7,14 +7,14 @@
189 Bundle-ClassPath: findbugs.jar,
190 lib/AppleJavaExtensions.jar,
191 lib/bcel.jar,
192 - lib/dom4j-1.6.1.jar,
193 + lib/dom4j.jar,
194 lib/junit.jar,
195 - lib/asm-3.3.jar,
196 - lib/asm-tree-3.3.jar,
197 - lib/asm-commons-3.3.jar,
198 - lib/jaxen-1.1.1.jar,
199 + lib/asm3.jar,
200 + lib/asm3-tree.jar,
201 + lib/asm3-commons.jar,
202 + lib/jaxen.jar,
203 lib/jFormatString.jar,
204 - lib/commons-lang-2.4.jar,
205 + lib/commons-lang.jar,
206 lib/jsr305.jar
207 Bundle-Localization: plugin
208 Export-Package: edu.umd.cs.findbugs,
00 0001-fix-ant-docs.patch
11 0002-change-lib-denpendency-to-usr-dir.patch
2 0003-fix-findbugs-lib-denpendency.patch
5757 done; \
5858 ) >>$(INSTALL)
5959
60 # link /usr/share/findbugs/bin/findbugs to /usr/bin/findbugs
60 # install /usr/share/findbugs/bin/findbugs to /usr/bin/findbugs
6161 ( \
6262 echo debian/script/findbugs usr/bin; \
6363 ) >>$(INSTALL)
64
65 # link system library to /usr/share/findbugs/lib
66 mkdir -p $(SHAREPACDIR)/lib
67 for i in dom4j junit4 commons-lang jaxen jdepend asm3 asm3-commons asm3-tree ant jcip; do \
68 cd $(SHAREPACDIR)/lib && ln -s /usr/share/java/$$i.jar $$i.jar;\
69 done
70
71 dh_install --sourcedir=$(CURDIR)
6472
6573 # install docs here
6674 mkdir -p $(DESDIR)/usr/share/doc/findbugs/html
6775 cp -rf $(CURDIR)/doc/manual/* $(DESDIR)/usr/share/doc/findbugs/html
6876
69 dh_install --sourcedir=$(CURDIR)
70
71 # install doc
77 # install man doc
7278 ( \
7379 echo "$(CURDIR)/debian/doc/findbugs.1" \
7480 ) >$(CURDIR)/debian/findbugs.manpages