Skip to content

Commit 742d6cc

Browse files
mebigfatguymebigfatguy
committed
chore: switch sb-contrib to fb-contrib
1 parent 155bc01 commit 742d6cc

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

‎build.xml

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<!-- sb-contrib Ant build script. Dave Brosius -->
1+
<!-- fb-contrib Ant build script. Dave Brosius -->
22

3-
<project name="sb-contrib" default="default">
3+
<project name="fb-contrib" default="default">
44

55
<presetdef name="javac">
66
<javac encoding="UTF-8" />
@@ -34,14 +34,14 @@
3434
<property name="fb-contrib.version" value="7.6.5" />
3535
<property name="sb-contrib.version" value="7.6.5" />
3636

37-
<property name="sonatype.dir" value="${user.home}/.sb-contrib-${sb-contrib.version}-sonatype" />
37+
<property name="sonatype.dir" value="${user.home}/.fb-contrib-${fb-contrib.version}-sonatype" />
3838

3939
<target name="clean" description="removes all generated collateral">
4040
<delete dir="${target.dir}" />
4141
<delete file="${htdocs.dir}/bugdescriptions.html" />
4242
</target>
4343

44-
<target name="infra_jars" description="pull jars needed to build sb-contrib to ${user.dir}/.ant/lib">
44+
<target name="infra_jars" description="pull jars needed to build fb-contrib to ${user.dir}/.ant/lib">
4545
<mkdir dir="${user.home}/.ant/lib" />
4646
<get src="https://repo1.maven.org/maven2/com/mebigfatguy/yank/yank/2.0.1/yank-2.0.1.jar" dest="${user.home}/.ant/lib"/>
4747
<get src="https://bitbucket.org/kjlubick/bugrankcheckstyle/downloads/bug-rank-check-style-1.0.0.jar" dest="${user.home}/.ant/lib"/>
@@ -59,9 +59,9 @@
5959
</target>
6060

6161
<target name="info">
62-
<echo message="sb-contrib - a findbugs plugin"/>
62+
<echo message="fb-contrib - a findbugs plugin"/>
6363
<echo message=""/>
64-
<echo message=" This project requires three jars to build sb-contrib: yank, bug-rank-check-style, vcsversion and" />
64+
<echo message=" This project requires three jars to build fb-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"/>
6666
<echo message=" a report of all string literals used in the code"/>
6767
<echo message=""/>
@@ -99,7 +99,7 @@
9999
<mkdir dir="${test.classes.dir}" />
100100
<mkdir dir="${samples.classes.dir}" />
101101
<mkdir dir="${javadoc.dir}" />
102-
<path id="sb-contrib.classpath">
102+
<path id="fb-contrib.classpath">
103103
<pathelement location="${lib.dir}/findbugs-${findbugs.version}.jar" />
104104
<pathelement location="${lib.dir}/bcel-${bcel.version}.jar" />
105105
<pathelement location="${lib.dir}/findbugs-annotations-${findbugs-annotations.version}.jar" />
@@ -108,7 +108,7 @@
108108
<pathelement location="${lib.dir}/jsr305-${jsr305.version}.jar" />
109109
<pathelement location="${main.classes.dir}" />
110110
</path>
111-
<path id="sb-contrib.test.classpath">
111+
<path id="fb-contrib.test.classpath">
112112
<pathelement location="${lib.dir}/testng-${testng.version}.jar" />
113113
<pathelement location="${lib.dir}/jcommander-${jcommander.version}.jar" />
114114
<pathelement location="${lib.dir}/mockito-core-${mockito-core.version}.jar" />
@@ -119,7 +119,7 @@
119119
<pathelement location="${findbugs.dir}/lib/jaxen-1.1.6.jar" />
120120

121121
</path>
122-
<path id="sb-contrib.samples.classpath">
122+
<path id="fb-contrib.samples.classpath">
123123
<pathelement location="${lib.dir}/akka-actor_2.12-${akka-actor_2.12.version}.jar" />
124124
<pathelement location="${lib.dir}/akka-http_2.12-${akka-http_2.12.version}.jar" />
125125
<pathelement location="${lib.dir}/akka-http-core_2.12-${akka-http-core_2.12.version}.jar" />
@@ -172,28 +172,28 @@
172172

173173
<target name="compile" depends="-init" description="compiles java files">
174174
<javac srcdir="${src.dir}" destdir="${main.classes.dir}" source="${javac.source}" target="${javac.target}" deprecation="${javac.deprecation}" debug="${javac.debug}" includeantruntime="false">
175-
<classpath refid="sb-contrib.classpath" />
175+
<classpath refid="fb-contrib.classpath" />
176176
</javac>
177177
</target>
178178

179179
<target name="compile_test" depends="compile" description="compiles java test files">
180180
<javac srcdir="${test.dir}" destdir="${test.classes.dir}" source="${javac.source}" target="${javac.target}" deprecation="${javac.deprecation}" debug="${javac.debug}" includeantruntime="false">
181-
<classpath refid="sb-contrib.classpath" />
182-
<classpath refid="sb-contrib.test.classpath" />
181+
<classpath refid="fb-contrib.classpath" />
182+
<classpath refid="fb-contrib.test.classpath" />
183183
</javac>
184184
</target>
185185

186186
<target name="compile_samples" depends="-init" description="compiles sample problem files">
187187
<javac srcdir="${samples.dir}" destdir="${samples.classes.dir}" source="1.8" target="1.8" deprecation="${javac.deprecation}" debug="${javac.debug}" includeantruntime="false">
188188
<compilerarg value="-XDignore.symbol.file"/>
189-
<classpath refid="sb-contrib.classpath" />
190-
<classpath refid="sb-contrib.samples.classpath" />
189+
<classpath refid="fb-contrib.classpath" />
190+
<classpath refid="fb-contrib.samples.classpath" />
191191
</javac>
192192
<delete file="${samples.dir}/SJVU_Sample.class" />
193193
<javac srcdir="${samples.dir}" destdir="${samples.classes.dir}" source="1.4" target="1.4" deprecation="${javac.deprecation}" debug="${javac.debug}" includeantruntime="false">
194194
<include name="SJVU_Sample.java" />
195-
<classpath refid="sb-contrib.classpath" />
196-
<classpath refid="sb-contrib.samples.classpath" />
195+
<classpath refid="fb-contrib.classpath" />
196+
<classpath refid="fb-contrib.samples.classpath" />
197197
</javac>
198198
</target>
199199

@@ -203,15 +203,15 @@
203203

204204
<testng outputDir="${test_reports.dir}">
205205
<classfileset dir="${test.classes.dir}" includes="**/*.class"/>
206-
<classpath refid="sb-contrib.classpath"/>
207-
<classpath refid="sb-contrib.test.classpath"/>
206+
<classpath refid="fb-contrib.classpath"/>
207+
<classpath refid="fb-contrib.test.classpath"/>
208208
<classpath location="${test.classes.dir}"/>
209209
</testng>
210210
</target>
211211

212-
<target name="jar" depends="compile" xmlns:vcs="antlib:com.mebigfatguy.vcsversion" description="produces the sb-contrib jar file">
212+
<target name="jar" depends="compile" xmlns:vcs="antlib:com.mebigfatguy.vcsversion" description="produces the fb-contrib jar file">
213213
<vcs:vcsversion vcs="git" revisionProperty="_rev_" dateProperty="_date_" branchProperty="_branch_" urlProperty="_url_"/>
214-
<jar destfile="${target.dir}/sb-contrib-${sb-contrib.version}.jar">
214+
<jar destfile="${target.dir}/fb-contrib-${fb-contrib.version}.jar">
215215
<fileset dir="etc">
216216
<include name="findbugs.xml" />
217217
<include name="messages*.xml" />
@@ -226,19 +226,19 @@
226226
<include name="license.txt" />
227227
</fileset>
228228
<manifest>
229-
<attribute name="sb-contrib-version" value="${sb-contrib.version}" />
229+
<attribute name="fb-contrib-version" value="${fb-contrib.version}" />
230230
<attribute name="Main-Class" value="com.mebigfatguy.fbcontrib.FBContrib" />
231231
<attribute name="git-url" value="${_url_}" />
232232
<attribute name="git-branch" value="${_branch_}" />
233233
<attribute name="git-revision" value="${_rev_}" />
234234
<attribute name="git-date" value="${_date_}" />
235235
<attribute name="Eclipse-RegisterBuddy" value="edu.umd.cs.findbugs.plugin.eclipse" />
236236
<attribute name="Bundle-ManifestVersion" value="2" />
237-
<attribute name="Bundle-Name" value="sb-contrib plugin" />
238-
<attribute name="Bundle-SymbolicName" value="sb-contrib; singleton:=true" />
239-
<attribute name="Bundle-Version" value="${sb-contrib.version}" />
237+
<attribute name="Bundle-Name" value="fb-contrib plugin" />
238+
<attribute name="Bundle-SymbolicName" value="fb-contrib; singleton:=true" />
239+
<attribute name="Bundle-Version" value="${fb-contrib.version}" />
240240
<attribute name="Bundle-ClassPath" value="." />
241-
<attribute name="Bundle-Vendor" value="SB-Contrib Project" />
241+
<attribute name="Bundle-Vendor" value="fb-contrib Project" />
242242
<attribute name="Require-Bundle" value="edu.umd.cs.findbugs.plugin.eclipse" />
243243
<attribute name="Bundle-ActivationPolicy" value="lazy" />
244244
<attribute name="Export-Package" value="com.mebigfatguy.fbcontrib, com.mebigfatguy.fbcontrib.collect, com.mebigfatguy.fbcontrib.detect, com.mebigfatguy.fbcontrib.debug, com.mebigfatguy.fbcontrib.utils" />
@@ -252,7 +252,7 @@
252252
</target>
253253

254254
<target name="srczip" description="builds the source distribution zip file">
255-
<zip destfile="${target.dir}/sb-contrib-src-${sb-contrib.version}.zip">
255+
<zip destfile="${target.dir}/fb-contrib-src-${fb-contrib.version}.zip">
256256
<fileset dir="${basedir}">
257257
<include name="**/*.java" />
258258
<include name="**/*.xml" />
@@ -268,8 +268,8 @@
268268
</target>
269269

270270
<target name="javadoc" depends="-init" description="build the javadoc for the project">
271-
<javadoc packagenames="com.mebigfatguy.*" sourcepath="${src.dir}" classpathref="sb-contrib.classpath" destdir="${javadoc.dir}" windowtitle="fb-contrib api" access="private" failonerror="true">
272-
<doctitle><![CDATA[<h1>sb-contrib javadoc</h1>]]></doctitle>
271+
<javadoc packagenames="com.mebigfatguy.*" sourcepath="${src.dir}" classpathref="fb-contrib.classpath" destdir="${javadoc.dir}" windowtitle="fb-contrib api" access="private" failonerror="true">
272+
<doctitle><![CDATA[<h1>fb-contrib javadoc</h1>]]></doctitle>
273273
<bottom><![CDATA[<i>Copyright &#169; 2005-2019 MeBigFatGuy.com. All Rights Reserved.</i>]]></bottom>
274274
</javadoc>
275275
</target>
@@ -281,14 +281,14 @@
281281
<echo message="findbugs: ${findbugs.dir}/plugin"/>
282282
<copy todir="${findbugs.dir}/plugin">
283283
<fileset dir="${target.dir}">
284-
<include name="sb-contrib-${sb-contrib.version}.jar" />
284+
<include name="fb-contrib-${fb-contrib.version}.jar" />
285285
</fileset>
286286
</copy>
287287
</target>
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="${findbugs.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="fb-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

@@ -315,28 +315,28 @@
315315

316316
<target name="sonatype" depends="release" description="prepare an artifact bundle for sonatype">
317317
<mkdir dir="${sonatype.dir}"/>
318-
<copy todir="${sonatype.dir}" file="${target.dir}/sb-contrib-${sb-contrib.version}.jar"/>
319-
<copy tofile="${sonatype.dir}/sb-contrib-${sb-contrib.version}-sources.jar" file="${target.dir}/sb-contrib-src-${sb-contrib.version}.zip"/>
320-
<jar destfile="${sonatype.dir}/sb-contrib-${sb-contrib.version}-javadoc.jar" basedir="${target.dir}" includes="javadoc/**"/>
321-
<copy tofile="${sonatype.dir}/sb-contrib-${sb-contrib.version}.pom" file="${basedir}/pom.xml"/>
318+
<copy todir="${sonatype.dir}" file="${target.dir}/fb-contrib-${fb-contrib.version}.jar"/>
319+
<copy tofile="${sonatype.dir}/fb-contrib-${fb-contrib.version}-sources.jar" file="${target.dir}/fb-contrib-src-${fb-contrib.version}.zip"/>
320+
<jar destfile="${sonatype.dir}/fb-contrib-${fb-contrib.version}-javadoc.jar" basedir="${target.dir}" includes="javadoc/**"/>
321+
<copy tofile="${sonatype.dir}/fb-contrib-${fb-contrib.version}.pom" file="${basedir}/pom.xml"/>
322322

323323
<exec executable="gpg">
324324
<arg value="-abi" />
325-
<arg value="${sonatype.dir}/sb-contrib-${sb-contrib.version}.jar" />
325+
<arg value="${sonatype.dir}/fb-contrib-${fb-contrib.version}.jar" />
326326
</exec>
327327
<exec executable="gpg">
328328
<arg value="-abi" />
329-
<arg value="${sonatype.dir}/sb-contrib-${sb-contrib.version}.pom" />
329+
<arg value="${sonatype.dir}/fb-contrib-${fb-contrib.version}.pom" />
330330
</exec>
331331
<exec executable="gpg">
332332
<arg value="-abi" />
333-
<arg value="${sonatype.dir}/sb-contrib-${sb-contrib.version}-sources.jar" />
333+
<arg value="${sonatype.dir}/fb-contrib-${fb-contrib.version}-sources.jar" />
334334
</exec>
335335
<exec executable="gpg">
336336
<arg value="-abi" />
337-
<arg value="${sonatype.dir}/sb-contrib-${sb-contrib.version}-javadoc.jar" />
337+
<arg value="${sonatype.dir}/fb-contrib-${fb-contrib.version}-javadoc.jar" />
338338
</exec>
339-
<jar destfile="${sonatype.dir}/bundle.jar" basedir="${sonatype.dir}" includes="sb-contrib*">
339+
<jar destfile="${sonatype.dir}/bundle.jar" basedir="${sonatype.dir}" includes="fb-contrib*">
340340
</jar>
341341
<echo message="" />
342342
<echo message="" />

‎pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55

66
<modelVersion>4.0.0</modelVersion>
7-
<groupId>com.mebigfatguy.sb-contrib</groupId>
8-
<artifactId>sb-contrib</artifactId>
7+
<groupId>com.mebigfatguy.fb-contrib</groupId>
8+
<artifactId>fb-contrib</artifactId>
99
<version>7.6.5</version>
1010

1111
<!-- TODO: Oss parent is obsolete, define items directly for releasing -->
@@ -410,16 +410,16 @@
410410
<configuration>
411411
<archive>
412412
<manifestEntries>
413-
<sb-contrib-version>${project.version}</sb-contrib-version>
413+
<fb-contrib-version>${project.version}</fb-contrib-version>
414414
<Main-Class>com.mebigfatguy.fbcontrib.FBContrib</Main-Class>
415415
<git-revision>${scmBranch} ${buildNumber} ${maven.build.timestamp}</git-revision>
416416
<Eclipse-RegisterBuddy>edu.umd.cs.findbugs.plugin.eclipse</Eclipse-RegisterBuddy>
417417
<Bundle-ManifestVersion>2</Bundle-ManifestVersion>
418-
<Bundle-Name>sb-contrib plugin</Bundle-Name>
419-
<Bundle-SymbolicName>sb-contrib; singleton:=true</Bundle-SymbolicName>
418+
<Bundle-Name>fb-contrib plugin</Bundle-Name>
419+
<Bundle-SymbolicName>fb-contrib; singleton:=true</Bundle-SymbolicName>
420420
<Bundle-Version>${project.version}</Bundle-Version>
421421
<Bundle-ClassPath>.</Bundle-ClassPath>
422-
<Bundle-Vendor>SB-Contrib Project</Bundle-Vendor>
422+
<Bundle-Vendor>FB-Contrib Project</Bundle-Vendor>
423423
<Require-Bundle>edu.umd.cs.findbugs.plugin.eclipse</Require-Bundle>
424424
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
425425
<Export-Package>com.mebigfatguy.fbcontrib.collect, com.mebigfatguy.fbcontrib.detect,
@@ -597,8 +597,8 @@
597597
<effort>Max</effort>
598598
<plugins>
599599
<plugin>
600-
<groupId>com.mebigfatguy.sb-contrib</groupId>
601-
<artifactId>sb-contrib</artifactId>
600+
<groupId>com.mebigfatguy.fb-contrib</groupId>
601+
<artifactId>fb-contrib</artifactId>
602602
<version>${project.version}</version>
603603
</plugin>
604604
</plugins>

0 commit comments

Comments
 (0)