Skip to content

Commit fbb95c2

Browse files
committed
Merge branch 'findbugs' into spotbugs
Conflicts: build.xml pom.xml
2 parents 21619da + 950f368 commit fbb95c2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<property name="javac.debug" value="on" />
3232
<property name="test_reports.dir" value="${target.dir}/reports/test"/>
3333

34-
<property name="fb-contrib.version" value="7.6.0" />
35-
<property name="sb-contrib.version" value="7.6.0" />
34+
<property name="fb-contrib.version" value="7.6.1-SNAPSHOT" />
35+
<property name="sb-contrib.version" value="7.6.1-SNAPSHOT" />
3636

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

etc/findbugs.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323

2424
<!-- Detectors -->
2525

26-
<!-- COMMENT OUT FOR RELEASE
26+
<!-- COMMENT OUT FOR RELEASE -->
2727

2828
<Detector class="com.mebigfatguy.fbcontrib.debug.OCSDebugger" speed="fast"/>
2929

3030
<Detector class="com.mebigfatguy.fbcontrib.detect.BloatedSynchronizedBlock" speed="fast" reports="BSB_BLOATED_SYNCHRONIZED_BLOCK" hidden="true" />
3131

3232
<Detector class="com.mebigfatguy.fbcontrib.detect.BloatedAssignmentScope" speed="fast" reports="BAS_BLOATED_ASSIGNMENT_SCOPE" hidden="true" />
3333

34-
COMMENT OUT FOR RELEASE -->
34+
<!-- COMMENT OUT FOR RELEASE -->
3535

3636
<Detector class="com.mebigfatguy.fbcontrib.collect.CollectStatistics" speed="fast" reports="" hidden="true" />
3737

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>com.mebigfatguy.sb-contrib</groupId>
88
<artifactId>sb-contrib</artifactId>
9-
<version>7.6.0</version>
9+
<version>7.6.1-SNAPSHOT</version>
1010

1111
<!-- TODO: Oss parent is obsolete, define items directly for releasing -->
1212
<parent>

0 commit comments

Comments
 (0)