Permalink
Browse files

Merge branch 'findbugs' into spotbugs

 Conflicts:
	README.md
	build.xml
	htdocs/index.shtml
	pom.xml
  • Loading branch information...
mebigfatguy committed Jul 21, 2018
2 parents 29bef0d + 0d300ae commit e2d0efba2eaa3dd7503024857d2a742f48644f11
Showing with 11 additions and 11 deletions.
  1. +5 −5 README.md
  2. +1 −1 build.xml
  3. +2 −2 etc/findbugs.xml
  4. +1 −1 htdocs/index.shtml
  5. +1 −1 htdocs/repository.html
  6. +1 −1 pom.xml
View
@@ -14,13 +14,13 @@ for FindBugs:
GroupId: com.mebigfatguy.fb-contrib
ArtifactId: fb-contrib
Version: 7.4.2 or 7.4.2.sb
Version: 7.4.3
For SpotBugs
GroupId: com.mebigfatguy.fb-contrib
ArtifactId: fb-contrib
Version: 7.4.1.sb
Version: 7.4.3.sb
Developer
@@ -84,7 +84,7 @@ com.mebigfatguy.fb-contrib, and the artifact ID is fb-contrib. Eg:
<plugin>
<groupId>com.mebigfatguy.fb-contrib</groupId>
<artifactId>fb-contrib</artifactId>
<version>7.4.2.sb</version>
<version>7.4.3.sb</version>
</plugin>
</plugins>
</configuration>
@@ -108,7 +108,7 @@ com.mebigfatguy.fb-contrib, and the artifact ID is fb-contrib. Eg:
<plugin>
<groupId>com.mebigfatguy.fb-contrib</groupId>
<artifactId>fb-contrib</artifactId>
<version>7.4.2.sb</version>
<version>7.4.3.sb</version>
</plugin>
</plugins>
</configuration>
@@ -134,7 +134,7 @@ dependencies {
findbugs configurations.findbugsPlugins.dependencies
// To keep everything tidy, we set these apart
findbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.2.sb'
findbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.3.sb'
}
task findbugs(type: FindBugs) {
View
@@ -31,7 +31,7 @@
<property name="javac.debug" value="on" />
<property name="test_reports.dir" value="${target.dir}/reports/test"/>
<property name="fb-contrib.version" value="7.4.3.sb-SNAPSHOT" />
<property name="fb-contrib.version" value="7.4.3.sb" />
<property name="sonatype.dir" value="${user.home}/.fb-contrib-${fb-contrib.version}-sonatype" />
View
@@ -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" />
View
@@ -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.2.sb available for download
<p style="font-weight: bold;">The latest version of fb-contrib is 7.4.3.sb 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
View
@@ -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</td></tr>
<tr><td><b>Version:</b></td><td>7.4.2 or 7.4.2.sb</td></tr>
<tr><td><b>Version:</b></td><td>7.4.3 or 7.4.3.sb</td></tr>
</table>
</div>
View
@@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.mebigfatguy.fb-contrib</groupId>
<artifactId>fb-contrib</artifactId>
<version>7.4.3.sb-SNAPSHOT</version>
<version>7.4.3.sb</version>
<!-- TODO: Oss parent is obsolete, define items directly for releasing -->
<parent>

0 comments on commit e2d0efb

Please sign in to comment.