Skip to content
Permalink
Browse files

Merge branch 'findbugs' into spotbugs

 Conflicts:
	README.md
	build.xml
	pom.xml
  • Loading branch information...
mebigfatguy committed Oct 20, 2019
2 parents 3927811 + 02ddd59 commit da03b0d3b25b450bb3b3a992c94f3ba6b547a28f
Showing with 12 additions and 12 deletions.
  1. +4 −4 README.md
  2. +1 −1 build.xml
  3. +4 −4 etc/findbugs.xml
  4. +1 −1 htdocs/index.shtml
  5. +1 −1 htdocs/repository.html
  6. +1 −1 pom.xml
@@ -15,7 +15,7 @@ for FindBugs:

GroupId: com.mebigfatguy.fb-contrib
ArtifactId: fb-contrib
Version: 7.4.6
Version: 7.4.7

For SpotBugs

@@ -85,7 +85,7 @@ The group ID for fb-contrib is com.mebigfatguy.fb-contrib, and the artifact ID i
<plugin>
<groupId>com.mebigfatguy.fb-contrib</groupId>
<artifactId>fb-contrib</artifactId>
<version>7.4.6</version>
<version>7.4.7</version>
</plugin>
</plugins>
</configuration>
@@ -112,7 +112,7 @@ The group ID for sb-contrib is com.mebigfatguy.sb-contrib, and the artifact ID i
<plugin>
<groupId>com.mebigfatguy.sb-contrib</groupId>
<artifactId>sb-contrib</artifactId>
<version>7.4.6</version>
<version>7.4.7</version>
</plugin>
</plugins>
</configuration>
@@ -138,7 +138,7 @@ dependencies {
findbugs configurations.findbugsPlugins.dependencies
// To keep everything tidy, we set these apart
findbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.5'
findbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.7'
}
task findbugs(type: FindBugs) {
@@ -31,7 +31,7 @@
<property name="javac.debug" value="on" />
<property name="test_reports.dir" value="${target.dir}/reports/test"/>

<property name="sb-contrib.version" value="7.4.7-SNAPSHOT" />
<property name="sb-contrib.version" value="7.4.7" />

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

@@ -23,15 +23,15 @@

<!-- Detectors -->

<!-- COMMENT OUT FOR RELEASE -->
<!-- COMMENT OUT FOR RELEASE
<Detector class="com.mebigfatguy.fbcontrib.debug.OCSDebugger" speed="fast"/>
<Detector class="com.mebigfatguy.fbcontrib.detect.BloatedSynchronizedBlock" speed="fast" reports="BSB_BLOATED_SYNCHRONIZED_BLOCK" hidden="true" />
<Detector class="com.mebigfatguy.fbcontrib.detect.BloatedAssignmentScope" speed="fast" reports="BAS_BLOATED_ASSIGNMENT_SCOPE" hidden="true" />
<!-- COMMENT OUT FOR RELEASE -->
COMMENT OUT FOR RELEASE -->

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

@@ -332,11 +332,11 @@

<Detector class="com.mebigfatguy.fbcontrib.detect.ClassEnvy" speed="slow" reports="CE_CLASS_ENVY" />

<!-- COMMENT OUT FOR POINT RELEASE -->
<!-- COMMENT OUT FOR POINT RELEASE
<Detector class="com.mebigfatguy.fbcontrib.detect.SuspiciousArgumentTypes" speed="fast" reports="SAT_SUSPICIOUS_ARGUMENT_TYPES" />
<!-- COMMENT OUT FOR POINT RELEASE -->
COMMENT OUT FOR POINT RELEASE -->

<!-- BugPattern -->

@@ -68,7 +68,7 @@ function toggleBlock(divId, imgId)
</li>
</ul>
</p>
<p style="font-weight: bold;">The latest version of fb-contrib is 7.4.6 available for download
<p style="font-weight: bold;">The latest version of fb-contrib is 7.4.7 available for download
<a href="http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22fb-contrib%22">here</a>.</p>
<p style="font-weight: bold;">This version requires SpotBugs 3.1.0 or better</p>
<p style="font-weight: bold;">Please note that active development for this project is now done on
@@ -22,7 +22,7 @@ <h1>fb-contrib: Maven Repository</h1>
<table style="margin-left: 40px; background-color: #A0A0FF; padding: 20px; border-width: 1px; border-style: outset; border-color: #000000;">
<tr><td><b>GroupId:</b></td><td>com.mebigfatguy.fb-contrib</td></tr>
<tr><td><b>ArtifactId:</b></td><td>fb-contrib or sb-contrib</td></tr>
<tr><td><b>Version:</b></td><td>7.4.6</td></tr>
<tr><td><b>Version:</b></td><td>7.4.7</td></tr>
</table>
</div>

@@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.mebigfatguy.sb-contrib</groupId>
<artifactId>sb-contrib</artifactId>
<version>7.4.7-SNAPSHOT</version>
<version>7.4.7</version>

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

0 comments on commit da03b0d

Please sign in to comment.
You can’t perform that action at this time.