Skip to content

Commit 155bc01

Browse files
mebigfatguymebigfatguy
committed
merge from spotbugs
1 parent 4083805 commit 155bc01

File tree

5 files changed

+42
-42
lines changed

5 files changed

+42
-42
lines changed

‎.classpath

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<classpathentry kind="lib" path="lib/asm-9.6.jar"/>
4040
<classpathentry kind="lib" path="lib/asm-tree-9.6.jar"/>
4141
<classpathentry kind="lib" path="lib/bcel-6.8.0.jar"/>
42-
<classpathentry kind="lib" path="lib/spotbugs-4.8.3.jar"/>
43-
<classpathentry kind="lib" path="lib/spotbugs-annotations-4.8.3.jar"/>
42+
<classpathentry kind="lib" path="lib/findbugs-3.0.1.jar"/>
43+
<classpathentry kind="lib" path="lib/findbugs-annotations-3.0.1.jar"/>
4444
<classpathentry kind="lib" path="lib/commons-codec-1.16.0.jar"/>
4545
<classpathentry kind="output" path="target/classes/main"/>
4646
</classpath>

‎build.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
</target>
6060

6161
<target name="info">
62-
<echo message="sb-contrib - a spotbugs plugin"/>
62+
<echo message="sb-contrib - a findbugs plugin"/>
6363
<echo message=""/>
6464
<echo message=" This project requires three jars to build sb-contrib: yank, bug-rank-check-style, vcsversion and" />
6565
<echo message=" and optionally fb-delta, to generate delta's of bug reports, as well as stringliterals to dump"/>
@@ -100,9 +100,9 @@
100100
<mkdir dir="${samples.classes.dir}" />
101101
<mkdir dir="${javadoc.dir}" />
102102
<path id="sb-contrib.classpath">
103-
<pathelement location="${lib.dir}/spotbugs-${spotbugs.version}.jar" />
103+
<pathelement location="${lib.dir}/findbugs-${findbugs.version}.jar" />
104104
<pathelement location="${lib.dir}/bcel-${bcel.version}.jar" />
105-
<pathelement location="${lib.dir}/spotbugs-annotations-${spotbugs-annotations.version}.jar" />
105+
<pathelement location="${lib.dir}/findbugs-annotations-${findbugs-annotations.version}.jar" />
106106
<pathelement location="${lib.dir}/asm-${asm.version}.jar" />
107107
<pathelement location="${lib.dir}/asm-tree-${asm-tree.version}.jar" />
108108
<pathelement location="${lib.dir}/jsr305-${jsr305.version}.jar" />
@@ -115,8 +115,8 @@
115115
<pathelement location="${lib.dir}/byte-buddy-${byte-buddy.version}.jar" />
116116
<pathelement location="${lib.dir}/objenesis-${objenesis.version}.jar" />
117117
<pathelement location="${lib.dir}/hamcrest-core-${hamcrest-core.version}.jar" />
118-
<pathelement location="${spotbugs.dir}/lib/dom4j-1.6.1.jar" />
119-
<pathelement location="${spotbugs.dir}/lib/jaxen-1.1.6.jar" />
118+
<pathelement location="${findbugs.dir}/lib/dom4j-1.6.1.jar" />
119+
<pathelement location="${findbugs.dir}/lib/jaxen-1.1.6.jar" />
120120

121121
</path>
122122
<path id="sb-contrib.samples.classpath">
@@ -277,9 +277,9 @@
277277
<target name="build" depends="-init, validate_xml, compile, compile_test, compile_samples, test, jar" description="builds the plugin jar">
278278
</target>
279279

280-
<target name="install" depends="build" description="installs the plugin into spotbugs">
281-
<echo message="Spotbugs: ${spotbugs.dir}/plugin"/>
282-
<copy todir="${spotbugs.dir}/plugin">
280+
<target name="install" depends="build" description="installs the plugin into findbugs">
281+
<echo message="findbugs: ${findbugs.dir}/plugin"/>
282+
<copy todir="${findbugs.dir}/plugin">
283283
<fileset dir="${target.dir}">
284284
<include name="sb-contrib-${sb-contrib.version}.jar" />
285285
</fileset>
@@ -288,7 +288,7 @@
288288

289289
<target name="sample_delta" depends="install" xmlns:fbdelta="antlib:com.mebigfatguy.fbdelta" description="compares this runs reported bugs on the sample classes set, against the stored report">
290290
<taskdef resource="edu/umd/cs/findbugs/anttask/tasks.properties" classpath="${lib.dir}/findbugs-ant-${findbugs-ant.version}.jar"/>
291-
<findbugs reportlevel="low" home="${spotbugs.dir}" auxClassPathRef="sb-contrib.samples.classpath" output="xml:withMessages" jvmargs="-ea -Xmx800m" projectName="Samples" outputFile="${target.dir}/samples.xml">
291+
<findbugs reportlevel="low" home="${findbugs.dir}" auxClassPathRef="sb-contrib.samples.classpath" output="xml:withMessages" jvmargs="-ea -Xmx800m" projectName="Samples" outputFile="${target.dir}/samples.xml">
292292
<class location="${samples.classes.dir}" />
293293
</findbugs>
294294

‎pom.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
143143
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
144144
<maven.build.timestamp.format>E MMM d hh:mm:ss yyyy XX</maven.build.timestamp.format>
145-
<spotbugs.version>4.8.3</spotbugs.version>
145+
<findbugs.version>3.0.1</findbugs.version>
146146
</properties>
147147

148148
<dependencyManagement>
@@ -167,9 +167,9 @@
167167

168168
<dependencies>
169169
<dependency>
170-
<groupId>com.github.spotbugs</groupId>
171-
<artifactId>spotbugs</artifactId>
172-
<version>${spotbugs.version}</version>
170+
<groupId>com.google.code.findbugs</groupId>
171+
<artifactId>findbugs</artifactId>
172+
<version>${findbugs.version}</version>
173173
<scope>provided</scope>
174174
<exclusions>
175175
<exclusion>
@@ -384,8 +384,8 @@
384384
<version>3.0.0</version>
385385
</plugin>
386386
<plugin>
387-
<groupId>com.github.spotbugs</groupId>
388-
<artifactId>spotbugs-maven-plugin</artifactId>
387+
<groupId>com.google.code.findbugs</groupId>
388+
<artifactId>findbugs-maven-plugin</artifactId>
389389
<version>3.1.12.2</version>
390390
</plugin>
391391
<plugin>
@@ -565,13 +565,13 @@
565565
<configuration>
566566
<artifactItems>
567567
<artifactItem>
568-
<groupId>com.github.spotbugs</groupId>
569-
<artifactId>spotbugs</artifactId>
570-
<version>${spotbugs.version}</version>
568+
<groupId>com.github.findbugs</groupId>
569+
<artifactId>findbugs</artifactId>
570+
<version>${findbugs.version}</version>
571571
<type>jar</type>
572572
<overWrite>true</overWrite>
573573
<outputDirectory>
574-
${project.build.directory}/spotbugs-${spotbugs.version}.jar/plugin
574+
${project.build.directory}/findbugs-${findbugs.version}.jar/plugin
575575
</outputDirectory>
576576
</artifactItem>
577577
</artifactItems>
@@ -583,13 +583,13 @@
583583
</plugin>
584584

585585
<plugin>
586-
<groupId>com.github.spotbugs</groupId>
587-
<artifactId>spotbugs-maven-plugin</artifactId>
586+
<groupId>com.google.code.findbugs</groupId>
587+
<artifactId>findbugs-maven-plugin</artifactId>
588588
<dependencies>
589589
<dependency>
590-
<groupId>com.github.spotbugs</groupId>
591-
<artifactId>spotbugs</artifactId>
592-
<version>${spotbugs.version}</version>
590+
<groupId>com.google.code.findbugs</groupId>
591+
<artifactId>findbugs</artifactId>
592+
<version>${findbugs.version}</version>
593593
</dependency>
594594
</dependencies>
595595
<configuration>

‎src/test/java/com/mebigfatguy/fbcontrib/utils/RegisterUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public class RegisterUtilsTest {
9696

9797
@BeforeSuite
9898
public void setUpClass() {
99-
FindBugs.setHome("target/spotbugs-3.1.0.RC3.jar");
99+
FindBugs.setHome("target/findbugs-3.1.0.RC3.jar");
100100
}
101101

102102
@BeforeMethod

‎yank.csv

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
groupid,artifactid,version,digest,,,,
22
,,,,,,,
3-
com.github.spotbugs,spotbugs,4.8.3,2c69bdcdbf555750155b3ad46a774ba8a23236e9,,,,
4-
,spotbugs-annotations,,05d2dc4ca5b632976371155252499819aea372ed,,,,
5-
,spotbugs-ant,,49d813bdbc63c969616f58deb5999048867f1274,,,,
3+
com.google.code.findbugs,findbugs,3.0.1,7ae69957c437fd71628d3904572170cf80c01551,,,,
4+
,findbugs-annotations,,0bf2342edabc0fc37fc0b1de0b03f071bef935c3,,,,
5+
,findbugs-ant,3.0.0,56f704b2769296de1b86102caefb6e8bd8b979af,,,,
66
,,,,,,,
77
org.ow2.asm,asm,9.6,aa205cf0a06dbd8e04ece91c0b37c3f5d567546a,,,,
88
,asm-tree,,c0cdda9d211e965d2a4448aa3fd86110f2f8c2de,,,,
@@ -27,18 +27,18 @@ com.google.inject,guice,4.1.0,eeb69005da379a10071aa4948c48d89250febb07,,,,
2727
,,,,,,,
2828
--- Jars for Samples,,,,,,,----
2929
,,,,,,,
30-
org.apache.commons,commons-lang3,3.14.0,1ed471194b02f2c6cb734a0cd6f6f107c673afae,
31-
,,,,
32-
javax.servlet.jsp,javax.servlet.jsp-api,2.3.3,81191ab80e342912dc9cea735c30ff4eddc64de3,
33-
,,,,
34-
junit,junit,4.13.2,8ac9e16d933b6fb43bc7f576336b8f4d7eb5ba12,
35-
,,,,
30+
org.apache.commons,commons-lang3,3.14.0,1ed471194b02f2c6cb734a0cd6f6f107c673afae,,,,
31+
,,,,,,,
32+
javax.servlet.jsp,javax.servlet.jsp-api,2.3.3,81191ab80e342912dc9cea735c30ff4eddc64de3,,,,
33+
,,,,,,,
34+
junit,junit,4.13.2,8ac9e16d933b6fb43bc7f576336b8f4d7eb5ba12,,,,
35+
,,,,,,,
3636
log4j,log4j,1.2.17,5af35056b4d257e4b64b9e8069c0746e8b08629f,,,,
3737
,,,,,,,
3838
org.apache.logging.log4j,log4j-api,2.9.1,7a2999229464e7a324aa503c0a52ec0f05efe7bd,,,,
3939
,,,,,,,
40-
javax.servlet,javax.servlet-api,4.0.1,a27082684a2ff0bf397666c3943496c44541d1ca,
41-
,,,,
40+
javax.servlet,javax.servlet-api,4.0.1,a27082684a2ff0bf397666c3943496c44541d1ca,,,,
41+
,,,,,,,
4242
backport-util-concurrent,backport-util-concurrent,3.1,682f7ac17fed79e92f8e87d8455192b63376347b,,,,
4343
,,,,,,,
4444
org.threeten,threetenbp,1.3.2,6ef0f1feae9c5b5cce4b3478e8f1541d1c86ec2a,,,,
@@ -47,8 +47,8 @@ commons-collections,commons-collections,3.2.2,8ad72fe39fa8c91eaaf12aadb21e0c3661
4747
,,,,,,,
4848
org.slf4j,slf4j-api,1.7.21,139535a69a4239db087de9bab0bee568bf8e0b70,,,,
4949
,,,,,,,
50-
com.google.guava,guava,33.0.0-jre,161ba27964a62f241533807a46b8711b13c1d94b,
51-
,,,,
50+
com.google.guava,guava,33.0.0-jre,161ba27964a62f241533807a46b8711b13c1d94b,,,,
51+
,,,,,,,
5252
org.apache.httpcomponents,httpclient,4.5.2,733db77aa8d9b2d68015189df76ab06304406e50,,,,
5353
,httpcore,4.4.5,e7501a1b34325abb00d17dde96150604a0658b54,,,,
5454
,httpclient-cache,4.5.2,bd50ea83908dbf2f387a333216e66d2f0c5079bd,,,,
@@ -67,8 +67,8 @@ org.springframework,spring-tx,4.3.3.RELEASE,15fe147d2725b9b85bfe79817dc10b4246d0
6767
,,,,,,,
6868
org.eclipse.persistence,javax.persistence,2.1.1,4954fdf995d5083a1bdbf171ea3b240b88c85bac,,,,
6969
,,,,,,,
70-
commons-io,commons-io,2.15.1,f11560da189ab563a5c8e351941415430e9304ea,
71-
,,,,
70+
commons-io,commons-io,2.15.1,f11560da189ab563a5c8e351941415430e9304ea,,,,
71+
,,,,,,,
7272
org.mockito,mockito-core,2.23.4,a35b6f8ffcfa786771eac7d7d903429e790fdf3f,,,,
7373
,,,,,,,
7474
net.bytebuddy,byte-buddy,1.6.14,871c3e49dc6183d0d361601c2f1d11abb1a6b48c,,,,

0 commit comments

Comments
 (0)