Merge branch 'master' into issue-1950-truncate-reports

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -5,10 +5,12 @@ This is the changelog for SpotBugs. This follows [Keep a Changelog v1.0.0](http:
 Currently the versioning policy of this project follows [Semantic Versioning v2.0.0](http://semver.org/spec/v2.0.0.html).
 
 ## Unreleased - 2022-??-??
+- Fixed reports to truncate existing files before writing new content ([#1950](https://github.com/spotbugs/spotbugs/issues/1950))
+
+## 4.6.0 - 2022-03-08
 ### Fixed
 - Fixed spotbugs build with ecj compiler ([#1903](https://github.com/spotbugs/spotbugs/issues/1903))
 - Moved tests from spotbugs project to spotbugs-tests project ([#1914](https://github.com/spotbugs/spotbugs/issues/1914))
-- Fixed reports to truncate existing files before writing new content ([#1950](https://github.com/spotbugs/spotbugs/issues/1950))
 
 ### Added
 * New detector `FindInstanceLockOnSharedStaticData` for new bug type `SSD_DO_NOT_USE_INSTANCE_LOCK_ON_SHARED_STATIC_DATA`. This detector reports a bug if an instance level lock is used to modify a shared static data. (See [SEI CERT rule LCK06-J](https://wiki.sei.cmu.edu/confluence/display/java/LCK06-J.+Do+not+use+an+instance+lock+to+protect+shared+static+data))

build.gradle

@@ -1,13 +1,13 @@
 plugins {
   id "org.sonarqube" version "3.3"
-  id "com.diffplug.spotless" version "6.2.0"
+  id "com.diffplug.spotless" version "6.3.0"
   id "org.gradle.crypto.checksum" version "1.2.0"
-  id "com.github.spotbugs" version "5.0.5"
+  id "com.github.spotbugs" version "5.0.6"
   id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
 }
 
 group = 'com.github.spotbugs'
-version = '4.5.4-SNAPSHOT'
+version = '4.6.1-SNAPSHOT'
 
 apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/jacoco.gradle"

buildSrc/build.gradle.kts

@@ -6,5 +6,5 @@ repositories {
     gradlePluginPortal()
 }
 dependencies {
-    implementation("com.diffplug.gradle:goomph:3.34.1")
+    implementation("com.diffplug.gradle:goomph:3.35.0")
 }

docs/conf.py

@@ -16,10 +16,10 @@
 import os
 
 html_context = {
-  'version' : '4.5',
-  'full_version' : '4.5.3',
-  'maven_plugin_version' : '4.5.2.0',
-  'gradle_plugin_version' : '5.0.3',
+  'version' : '4.6',
+  'full_version' : '4.6.0',
+  'maven_plugin_version' : '4.5.3.0',
+  'gradle_plugin_version' : '5.0.6',
   'archetype_version' : '0.2.4'
 }
 

eclipsePlugin-junit/build.gradle

@@ -12,7 +12,7 @@ tasks.named('compileJava', JavaCompile).configure {
 dependencies {
   implementation project(':eclipsePlugin')
   testImplementation 'junit:junit:4.13.2'
-  testImplementation 'org.mockito:mockito-core:4.2.0'
+  testImplementation 'org.mockito:mockito-core:4.3.1'
 }
 
 tasks.named('jacocoTestReport', JacocoReport).configure {

eclipsePlugin/build.gradle

@@ -3,7 +3,7 @@ import static groovy.io.FileType.FILES
 // TODO: deploy not only jar but also sources and javadoc, to pass validation by Sonatype nexus
 // apply from: "$rootDir/gradle/maven.gradle"
 plugins {
-  id 'org.ajoberstar.grgit' version '4.1.1'
+  id 'org.ajoberstar.grgit' version '5.0.0'
   id "eclipse-convention"
 }
 

eclipsePlugin/src/de/tobject/findbugs/builder/WorkItem.java

@@ -381,6 +381,13 @@ public boolean isFromArchive() {
         return Archive.isArchiveFileName(file.getName());
     }
 
+    /**
+     * @return true if this work item corresponds to a project
+     */
+    public boolean isProject() {
+        return resource instanceof IProject || javaElt instanceof IJavaProject;
+    }
+
     @Override
     public String toString() {
         return getName();