diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130c..fb7f4a8a 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1b8e4066..1ace7cf4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,11 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="true" />
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="8" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/build.gradle b/build.gradle
index bdc39f19..81fca6fc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@
  */
 
 plugins {
-    id "org.jetbrains.intellij" version "0.4.21"
+    id "org.jetbrains.intellij" version "1.16.1"
     id 'jacoco'
 }
 
@@ -28,8 +28,8 @@ apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'maven-publish'
 apply plugin: 'java'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 11
+targetCompatibility = 11
 
 repositories {
     mavenLocal()
@@ -37,14 +37,13 @@ repositories {
 }
 
 intellij {
-    version ijVersion
+    version = ijVersion
 
-    pluginName 'spotbugs-idea'
-    updateSinceUntilBuild false
-    type 'IC'
+    pluginName = 'spotbugs-idea'
+    updateSinceUntilBuild = false
+    type = 'IC'
 
-    plugins 'git4idea'
-    plugins 'java'
+    plugins = ['git4idea', 'java']
 }
 
 jacoco {
@@ -61,42 +60,42 @@ configurations {
 }
 
 dependencies {
-    implementation ('com.github.spotbugs:spotbugs:4.4.2') {
+    implementation ('com.github.spotbugs:spotbugs:4.7.3') {
         exclude group: 'xml-apis', module: 'xml-apis'
     }
-    implementation 'net.sf.saxon:Saxon-HE:9.9.1-2'
-    implementation 'org.jsoup:jsoup:1.8.3'
+    implementation 'net.sf.saxon:Saxon-HE:12.3'
+    implementation 'org.jsoup:jsoup:1.16.1'
     implementation 'info.clearthought:table-layout:4.3.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation 'org.mockito:mockito-core:4.0.0'
-    thirdPartyPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.7'
-    thirdPartyPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0'
+    thirdPartyPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.6.0'
+    thirdPartyPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0'
     fbContribJava6 'com.mebigfatguy.fb-contrib:fb-contrib:6.2.1'
 }
 
-task copyGradleProperties(type: Copy) {
+tasks.register('copyGradleProperties', Copy) {
     description 'Copy gradle.properties to project resources.'
     from 'gradle.properties'
     into 'build/resources/main/org/jetbrains/plugins/spotbugs/common'
     rename { _ -> 'version.properties' }
 }
 
-task downloadThirdPartyPlugins(type: Copy) {
+tasks.register('downloadThirdPartyPlugins', Copy) {
     description 'Downloads third-party plugins Find Security Bugs and FB-Contrib.'
     from configurations.thirdPartyPlugins
     from configurations.fbContribJava6
     into 'build/resources/main/org/jetbrains/plugins/spotbugs/plugins'
 }
 
-task copyThirdPartyPlugins(type: Copy) {
+tasks.register('copyThirdPartyPlugins', Copy) {
     dependsOn(downloadThirdPartyPlugins, prepareSandbox)
     description 'Copy plugins into sandbox.'
     from 'build/resources/main/org/jetbrains/plugins/spotbugs/plugins'
     into 'build/idea-sandbox/plugins/spotbugs-idea/customPlugins'
 }
 
-task deleteThirdPartyPlugins(type: Delete) {
+tasks.register('deleteThirdPartyPlugins', Delete) {
     delete 'build/resources/main/org/jetbrains/plugins/spotbugs/plugins'
 }
 
diff --git a/gradle.properties b/gradle.properties
index fe5e8342..391192e7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,8 +19,8 @@
 # If not, see <http://www.gnu.org/licenses/>.
 #
 
-version=1.2.4
-ijVersion=2019.3
+version=1.2.6
+ijVersion=2022.2
 
 #---------------------------------------------------------------------
 # The absolute path to the intellij-community source on your local machine.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index cc4fdc29..7454180f 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 83718ae1..070cb702 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,25 +1,5 @@
-#
-# Copyright 2020 SpotBugs plugin contributors
-#
-# This file is part of IntelliJ SpotBugs plugin.
-#
-# IntelliJ SpotBugs plugin is free software: you can redistribute it 
-# and/or modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation, either version 3 of 
-# the License, or (at your option) any later version.
-#
-# IntelliJ SpotBugs plugin is distributed in the hope that it will
-# be useful, but WITHOUT ANY WARRANTY; without even the implied 
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with IntelliJ SpotBugs plugin.
-# If not, see <http://www.gnu.org/licenses/>.
-#
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7d..c53aefaa 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,78 +17,113 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -105,79 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 9618d8d9..107acd32 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/actions/AnalyzeScopeFiles.java b/src/main/java/org/jetbrains/plugins/spotbugs/actions/AnalyzeScopeFiles.java
index 76041b8c..f6e0cfab 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/actions/AnalyzeScopeFiles.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/actions/AnalyzeScopeFiles.java
@@ -272,10 +272,6 @@ public boolean visitFile(@NotNull final VirtualFile file) {
 	}
 
 	private static String getModuleNameInReadAction(@NotNull final Module module) {
-		return new ReadAction<String>() {
-			protected void run(@NotNull final Result<String> result) throws Throwable {
-				result.setResult(module.getName());
-			}
-		}.execute().getResultObject();
+		return ReadAction.compute(module::getName);
 	}
 }
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/core/ErrorReportSubmitterImpl.java b/src/main/java/org/jetbrains/plugins/spotbugs/core/ErrorReportSubmitterImpl.java
deleted file mode 100644
index cba427ed..00000000
--- a/src/main/java/org/jetbrains/plugins/spotbugs/core/ErrorReportSubmitterImpl.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright 2020 SpotBugs plugin contributors
- *
- * This file is part of IntelliJ SpotBugs plugin.
- *
- * IntelliJ SpotBugs plugin is free software: you can redistribute it 
- * and/or modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of 
- * the License, or (at your option) any later version.
- *
- * IntelliJ SpotBugs plugin is distributed in the hope that it will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied 
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with IntelliJ SpotBugs plugin.
- * If not, see <http://www.gnu.org/licenses/>.
- */
-package org.jetbrains.plugins.spotbugs.core;
-
-import com.intellij.diagnostic.AbstractMessage;
-import com.intellij.diagnostic.IdeaReportingEvent;
-import com.intellij.ide.BrowserUtil;
-import com.intellij.openapi.diagnostic.*;
-import com.intellij.openapi.ide.CopyPasteManager;
-import com.intellij.openapi.progress.*;
-import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.util.SystemInfo;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.util.Consumer;
-import org.jetbrains.annotations.*;
-import org.jetbrains.plugins.spotbugs.actions.HelpAction;
-import org.jetbrains.plugins.spotbugs.common.VersionManager;
-import org.jetbrains.plugins.spotbugs.common.util.*;
-import org.jetbrains.plugins.spotbugs.resources.ResourcesLoader;
-
-import java.awt.*;
-import java.awt.datatransfer.StringSelection;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.List;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
-
-public final class ErrorReportSubmitterImpl extends ErrorReportSubmitter {
-
-	private static final Logger LOGGER = Logger.getInstance(ErrorReportSubmitterImpl.class);
-
-	@Override
-	public String getReportActionText() {
-		return StringUtil.capitalizeWords(ResourcesLoader.getString("error.submitReport.title"), true);
-	}
-
-	@Override
-	public boolean submit(@NotNull IdeaLoggingEvent[] events, @Nullable String additionalInfo, @NotNull Component parentComponent, @NotNull Consumer<SubmittedReportInfo> consumer) {
-
-		final AtomicReference<String> latestVersionRef = new AtomicReference<>(null);
-		new Task.Modal(null, ResourcesLoader.getString("error.submitReport.checkVersion"), false) {
-			@Override
-			public void run(@NotNull final ProgressIndicator indicator) {
-				try {
-					latestVersionRef.set(PluginVersionChecker.getLatestVersion(indicator));
-				} catch (final Exception e) {
-					LOGGER.warn(e);
-				}
-			}
-		}.queue();
-
-		String latestVersion = latestVersionRef.get();
-		if (!StringUtil.isEmptyOrSpaces(latestVersion)) {
-			if (latestVersion.startsWith("v")) {
-				latestVersion = latestVersion.substring(1);
-				final String current = VersionManager.getVersion();
-				if (!latestVersion.equals(current)) {
-					final int answer = Messages.showYesNoDialog(
-							ResourcesLoader.getString("error.submitReport.old.text", current, latestVersion),
-							StringUtil.capitalizeWords(ResourcesLoader.getString("error.submitReport.old.title"), true),
-							Messages.getQuestionIcon()
-					);
-					if (answer == Messages.NO) {
-						return false;
-					}
-				}
-			}
-		}
-
-		final SubmittedReportInfo reportInfo = submitImpl(events, additionalInfo, parentComponent);
-		consumer.consume(reportInfo);
-		return true;
-	}
-
-	@NotNull
-	private SubmittedReportInfo submitImpl(
-			@NotNull final IdeaLoggingEvent[] events,
-			@Nullable final String additionalInfo,
-			@NotNull final Component parentComponent
-	) {
-
-		final StringBuilder body = HelpAction.createProductInfo();
-		if (!StringUtil.isEmptyOrSpaces(additionalInfo)) {
-			body.append("\n\nAdditional Infos\n");
-			body.append(additionalInfo);
-		}
-
-		boolean isFindBugsError = false;
-    final Set<Error> errors = new HashSet<>();
-		for (final IdeaLoggingEvent event : events) {
-			final Error error = createError(event);
-			if (error != null) {
-				errors.add(error);
-				if (!isFindBugsError && error.throwable != null) {
-					isFindBugsError = FindBugsUtil.isFindBugsError(error.throwable);
-				}
-			}
-		}
-		if (errors.isEmpty()) {
-			throw new IllegalStateException("No error to report");
-		}
-		final List<Error> sorted = new ArrayList<>(errors);
-		Collections.sort(sorted);
-
-		for (final Error error : sorted) {
-			body.append("\n\n").append(error.fullError);
-		}
-
-		final String title = makeTitle(sorted.get(0));
-
-		return openBrowser(
-				isFindBugsError,
-				title,
-				body.toString(),
-				parentComponent
-		);
-	}
-
-	@NotNull
-	private SubmittedReportInfo openBrowser(
-			final boolean isFindBugsError,
-			@NotNull final String title,
-			@NotNull final String errorText,
-			@SuppressWarnings("UnusedParameters") @NotNull final Component parentComponent
-	) {
-
-		final String baseUrl;
-		if (isFindBugsError) {
-			baseUrl = "https://github.com/spotbugs/spotbugs/issues/";
-		} else {
-			baseUrl = "https://github.com/JetBrains/spotbugs-intellij-plugin/issues";
-		}
-
-		/*
-		 * Note: set errorText as body does not work:
-		 *   - can cause HTTP 414 Request URI too long
-		 *   - if user is not yet logged in github login page will show an error
-		 *     502 - "This page is taking way too long to load." (this will also occur with HTTP POST).
-		 */
-		final String body = "The error was copied to the clipboard. Press " + (SystemInfo.isMac ? "Command+V" : "Ctrl+V");
-		final String newIssueUrl = baseUrl + "/new?title=" + encode(title) + "&body=" + encode(body);
-
-		CopyPasteManager.getInstance().setContents(new StringSelection(errorText));
-		BrowserUtil.browse(newIssueUrl);
-		return new SubmittedReportInfo(baseUrl, "issue", SubmittedReportInfo.SubmissionStatus.NEW_ISSUE);
-	}
-
-	@NotNull
-	private static String encode(@NotNull final String value) {
-		try {
-			return URLEncoder.encode(value, "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			throw new InternalError("UTF-8 is not available");
-		}
-	}
-
-	@NotNull
-	private static String makeTitle(@NotNull final Error error) {
-		String ret = error.message;
-		if (ret == null && error.throwable != null) {
-			@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
-			final Throwable cause = ErrorUtil.getCause(error.throwable);
-			ret = cause.toString();
-			if ("java.lang.IllegalStateException".equals(ret)) {
-				ret = "ISE";
-			} else if ("java.lang.NullPointerException".equals(ret)) {
-				ret = "NPE";
-			}
-			final StackTraceElement[] stack = cause.getStackTrace();
-			if (stack.length > 0) {
-				String location = stack[0].toString();
-				if (location.startsWith("org.jetbrains.plugins.spotbugs.")) {
-					location = location.substring("org.jetbrains.plugins.spotbugs.".length());
-				}
-				ret += " at " + location;
-			}
-		}
-		if (StringUtil.isEmptyOrSpaces(ret)) {
-			ret = "Analysis Error";
-		}
-		return ret;
-	}
-
-	@Nullable
-	private static Error createError(@NotNull final IdeaLoggingEvent event) {
-		String message = event.getMessage();
-		if (StringUtil.isEmptyOrSpaces(message) || "null".equals(message)) {
-			message = null;
-		}
-		final Throwable throwable;
-		// event is a com.intellij.diagnostic.IdeaReportingEvent.TextBasedThrowable
-		// This is a wrapper and is only providing the original stack trace via 'printStackTrace(...)',
-		// but not via 'getStackTrace()'.
-		//
-		// So, we workaround this by retrieving the original exception from the data property
-		if (event instanceof IdeaReportingEvent && event.getData() instanceof AbstractMessage) {
-			throwable = ((AbstractMessage) event.getData()).getThrowable();
-		} else {
-			return null;
-		}
-		final String fullError;
-		if (!StringUtil.equals(message, throwable.getMessage())) {
-			fullError = message + "\n" + StringUtil.getThrowableText(throwable);
-		} else {
-			fullError = StringUtil.getThrowableText(throwable);
-		}
-		return new Error(message, throwable, fullError);
-	}
-
-	private static class Error implements Comparable<Error> {
-		@Nullable
-		private final String message;
-
-		@Nullable
-		private final Throwable throwable;
-
-		@NotNull
-		private final String fullError;
-
-		public Error(
-				@Nullable final String message,
-				@Nullable final Throwable throwable,
-				@NotNull final String fullError
-		) {
-			this.message = message;
-			this.throwable = throwable;
-			this.fullError = fullError;
-		}
-
-		@Override
-		public int compareTo(@NotNull final Error o) {
-			return fullError.compareTo(o.fullError);
-		}
-
-		@Override
-		public boolean equals(@Nullable final Object o) {
-			if (this == o) return true;
-			if (o == null || getClass() != o.getClass()) return false;
-			Error error = (Error) o;
-			return fullError.equals(error.fullError);
-
-		}
-
-		@Override
-		public int hashCode() {
-			return fullError.hashCode();
-		}
-	}
-}
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/core/FindBugsStarter.java b/src/main/java/org/jetbrains/plugins/spotbugs/core/FindBugsStarter.java
index 480c7569..6b12d070 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/core/FindBugsStarter.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/core/FindBugsStarter.java
@@ -26,6 +26,7 @@
 import com.intellij.openapi.compiler.*;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.*;
+import com.intellij.openapi.module.Module;
 import com.intellij.openapi.progress.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.*;
@@ -34,7 +35,6 @@
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.wm.ToolWindow;
-import com.intellij.openapi.wm.impl.ToolWindowImpl;
 import com.intellij.util.Consumer;
 import edu.umd.cs.findbugs.*;
 import edu.umd.cs.findbugs.config.*;
@@ -151,10 +151,9 @@ private void startImpl(final boolean justCompiled) {
 			}
 			/*
 			 * Important: Make sure the tool window is initialized.
-			 * This call is to important to make it just in case of false = toolWindowToFront
+			 * This call is important to make it just in case of false = toolWindowToFront
 			 * because we have no guarantee that activateToolWindow works.
 			 */
-			((ToolWindowImpl) toolWindow).ensureContentInitialized();
 			if (workspaceSettings.toolWindowToFront) {
 				ToolWindowPanel.showWindow(toolWindow);
 			}
@@ -225,6 +224,9 @@ private void asyncStartImpl(@NotNull final ProgressIndicator indicator, final bo
 			} catch (final ProcessCanceledException e) {
 				throw e;
 			} catch (final Throwable e) {
+				if (ApplicationManager.getApplication().isUnitTestMode()) {
+					throw new RuntimeException(e);
+				}
 				error = e;
 			}
 		}
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/core/ProjectSettings.java b/src/main/java/org/jetbrains/plugins/spotbugs/core/ProjectSettings.java
index 51af576e..82d0b7af 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/core/ProjectSettings.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/core/ProjectSettings.java
@@ -19,15 +19,13 @@
  */
 package org.jetbrains.plugins.spotbugs.core;
 
-import com.intellij.openapi.components.PersistentStateComponent;
-import com.intellij.openapi.components.ServiceManager;
-import com.intellij.openapi.components.State;
-import com.intellij.openapi.components.Storage;
+import com.intellij.openapi.components.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@Service(Service.Level.PROJECT)
 @State(
 		name = "FindBugs-IDEA",
 		storages = {
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/core/ToolWindowFactoryImpl.java b/src/main/java/org/jetbrains/plugins/spotbugs/core/ToolWindowFactoryImpl.java
index 5b3c2276..bf8462d8 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/core/ToolWindowFactoryImpl.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/core/ToolWindowFactoryImpl.java
@@ -19,6 +19,7 @@
  */
 package org.jetbrains.plugins.spotbugs.core;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowFactory;
@@ -30,6 +31,7 @@ public final class ToolWindowFactoryImpl implements ToolWindowFactory {
 	@Override
 	public void createToolWindowContent(@NotNull final Project project, @NotNull final ToolWindow toolWindow) {
 		final ToolWindowPanel win = new ToolWindowPanel(project);
-		toolWindow.getContentManager().addContent(ContentFactory.SERVICE.getInstance().createContent(win, "", false));
+		toolWindow.getContentManager().addContent(ApplicationManager.getApplication().getService(ContentFactory.class)
+						.createContent(win, "", false));
 	}
 }
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/core/WorkspaceSettings.java b/src/main/java/org/jetbrains/plugins/spotbugs/core/WorkspaceSettings.java
index 3fee51d0..6f9284c6 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/core/WorkspaceSettings.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/core/WorkspaceSettings.java
@@ -19,11 +19,7 @@
  */
 package org.jetbrains.plugins.spotbugs.core;
 
-import com.intellij.openapi.components.PersistentStateComponent;
-import com.intellij.openapi.components.ServiceManager;
-import com.intellij.openapi.components.State;
-import com.intellij.openapi.components.Storage;
-import com.intellij.openapi.components.StoragePathMacros;
+import com.intellij.openapi.components.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import com.intellij.util.xmlb.annotations.MapAnnotation;
@@ -34,9 +30,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+@Service(Service.Level.PROJECT)
 @State(
 		name = "FindBugs-IDEA-Workspace",
-		storages = {@Storage(file /*IDEA 2016: switch to value()*/ = StoragePathMacros.WORKSPACE_FILE)}
+		storages = {@Storage(StoragePathMacros.WORKSPACE_FILE)}
 )
 public final class WorkspaceSettings implements PersistentStateComponent<WorkspaceSettings> {
 
@@ -131,6 +128,6 @@ public void loadState(final WorkspaceSettings state) {
 	}
 
 	public static WorkspaceSettings getInstance(@NotNull final Project project) {
-		return ServiceManager.getService(project, WorkspaceSettings.class);
+		return project.getService(WorkspaceSettings.class);
 	}
 }
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/gui/editor/BugAnnotator.java b/src/main/java/org/jetbrains/plugins/spotbugs/gui/editor/BugAnnotator.java
index 15849cb8..b1c47fee 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/gui/editor/BugAnnotator.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/gui/editor/BugAnnotator.java
@@ -19,9 +19,7 @@
  */
 package org.jetbrains.plugins.spotbugs.gui.editor;
 
-import com.intellij.lang.annotation.Annotation;
-import com.intellij.lang.annotation.AnnotationHolder;
-import com.intellij.lang.annotation.Annotator;
+import com.intellij.lang.annotation.*;
 import com.intellij.openapi.editor.markup.EffectType;
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.project.Project;
@@ -93,7 +91,7 @@ private static void addAnnotation(@NotNull final PsiElement psiElement, final It
 	private static void addAnnotation(final ExtendedProblemDescriptor problemDescriptor, final List<ExtendedProblemDescriptor> matchingDescriptors, final PsiElement psiElement, @NotNull final AnnotationHolder annotationHolder) {
 		final BugInstance bugInstance = problemDescriptor.getBug().getInstance();
 		final int priority = bugInstance.getPriority();
-		final Annotation annotation;
+		final AnnotationBuilder annotation;
 		final PsiElement problemElement = problemDescriptor.getPsiElement();
 		final TextRange textRange = problemElement.getTextRange();
 
@@ -109,19 +107,22 @@ private static void addAnnotation(final ExtendedProblemDescriptor problemDescrip
 						elementToAnnotation = ((PsiClass) psiElement).getNameIdentifier();
 					}
 
-					annotation = annotationHolder.createWarningAnnotation(elementToAnnotation == null ? psiElement : elementToAnnotation, getAnnotationText(matchingDescriptors));
-					// FIXME: use color from annotation configuration
-					annotation.setEnforcedTextAttributes(new TextAttributes(null, null, JBColor.RED.brighter(), EffectType.BOXED, Font.PLAIN));
+					annotation = annotationHolder.newAnnotation(HighlightSeverity.WARNING, getAnnotationText(matchingDescriptors))
+									.range(elementToAnnotation == null ? psiElement : elementToAnnotation)
+									// FIXME: use color from annotation configuration
+									.enforcedTextAttributes(new TextAttributes(null, null, JBColor.RED.brighter(), EffectType.BOXED, Font.PLAIN));
 				} else {
-					annotation = annotationHolder.createWarningAnnotation(textRange, getAnnotationText(matchingDescriptors));
-					// FIXME: use color from annotation configuration
-					annotation.setEnforcedTextAttributes(new TextAttributes(null, null, JBColor.RED, EffectType.WAVE_UNDERSCORE, Font.PLAIN));
+					annotation = annotationHolder.newAnnotation(HighlightSeverity.WARNING, getAnnotationText(matchingDescriptors))
+									.range(textRange)
+									// FIXME: use color from annotation configuration
+									.enforcedTextAttributes(new TextAttributes(null, null, JBColor.RED, EffectType.WAVE_UNDERSCORE, Font.PLAIN));
 				}
 
-				annotation.registerFix(new SuppressReportBugIntentionAction(problemDescriptor), textRange);
-				annotation.registerFix(new SuppressReportBugForClassIntentionAction(problemDescriptor), textRange);
-				annotation.registerFix(new ClearBugIntentionAction(problemDescriptor), textRange);
-				annotation.registerFix(new ClearAndSuppressBugIntentionAction(problemDescriptor), textRange);
+				annotation.newFix(new SuppressReportBugIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.newFix(new SuppressReportBugForClassIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.newFix(new ClearBugIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.newFix(new ClearAndSuppressBugIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.create();
 
 				break;
 
@@ -134,18 +135,23 @@ private static void addAnnotation(final ExtendedProblemDescriptor problemDescrip
 					} else {
 						elementToAnnotation = ((PsiClass) psiElement).getNameIdentifier();
 					}
-					annotation = annotationHolder.createWarningAnnotation(elementToAnnotation == null ? psiElement : elementToAnnotation, getAnnotationText(matchingDescriptors));
+					annotation = annotationHolder.newAnnotation(HighlightSeverity.WARNING, getAnnotationText(matchingDescriptors))
+									.range(elementToAnnotation == null ? psiElement : elementToAnnotation);
 				} else {
-					annotation = annotationHolder.createWarningAnnotation(textRange, getAnnotationText(matchingDescriptors));
+					annotation = annotationHolder.newAnnotation(HighlightSeverity.WARNING, getAnnotationText(matchingDescriptors))
+									.range(textRange);
 				}
 
 				// FIXME: use color from annotation configuration
-				annotation.setEnforcedTextAttributes(new TextAttributes(null, null, JBColor.YELLOW.darker(), EffectType.WAVE_UNDERSCORE, Font.PLAIN));
+				annotation
+								.enforcedTextAttributes(
+												new TextAttributes(null, null, JBColor.YELLOW.darker(), EffectType.WAVE_UNDERSCORE, Font.PLAIN))
 
-				annotation.registerFix(new SuppressReportBugIntentionAction(problemDescriptor), textRange);
-				annotation.registerFix(new SuppressReportBugForClassIntentionAction(problemDescriptor), textRange);
-				annotation.registerFix(new ClearBugIntentionAction(problemDescriptor), textRange);
-				annotation.registerFix(new ClearAndSuppressBugIntentionAction(problemDescriptor), textRange);
+								.newFix(new SuppressReportBugIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.newFix(new SuppressReportBugForClassIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.newFix(new ClearBugIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.newFix(new ClearAndSuppressBugIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.create();
 
 				break;
 
@@ -158,18 +164,20 @@ private static void addAnnotation(final ExtendedProblemDescriptor problemDescrip
 					} else {
 						elementToAnnotation = ((PsiClass) problemElement).getNameIdentifier();
 					}
-					annotation = annotationHolder.createWarningAnnotation(elementToAnnotation == null ? psiElement : elementToAnnotation, getAnnotationText(matchingDescriptors));
+					annotation = annotationHolder.newAnnotation(HighlightSeverity.WARNING, getAnnotationText(matchingDescriptors))
+									.range(elementToAnnotation == null ? psiElement : elementToAnnotation);
 				} else {
-					annotation = annotationHolder.createWarningAnnotation(textRange, getAnnotationText(matchingDescriptors));
+					annotation = annotationHolder.newAnnotation(HighlightSeverity.WARNING, getAnnotationText(matchingDescriptors))
+									.range(textRange);
 				}
 
 				// FIXME: use color from annotation configuration
-				annotation.setEnforcedTextAttributes(new TextAttributes(null, null, JBColor.GRAY, EffectType.WAVE_UNDERSCORE, Font.PLAIN));
-
-				annotation.registerFix(new SuppressReportBugIntentionAction(problemDescriptor), textRange);
-				annotation.registerFix(new SuppressReportBugForClassIntentionAction(problemDescriptor), textRange);
-				annotation.registerFix(new ClearBugIntentionAction(problemDescriptor), textRange);
-				annotation.registerFix(new ClearAndSuppressBugIntentionAction(problemDescriptor), textRange);
+				annotation.enforcedTextAttributes(new TextAttributes(null, null, JBColor.GRAY, EffectType.WAVE_UNDERSCORE, Font.PLAIN))
+								.newFix(new SuppressReportBugIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.newFix(new SuppressReportBugForClassIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.newFix(new ClearBugIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.newFix(new ClearAndSuppressBugIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.create();
 
 				break;
 			case Detector.LOW_PRIORITY:
@@ -181,18 +189,20 @@ private static void addAnnotation(final ExtendedProblemDescriptor problemDescrip
 					} else {
 						elementToAnnotation = ((PsiClass) psiElement).getNameIdentifier();
 					}
-					annotation = annotationHolder.createInfoAnnotation(elementToAnnotation == null ? psiElement : elementToAnnotation, getAnnotationText(matchingDescriptors));
+					annotation = annotationHolder.newAnnotation(HighlightSeverity.INFORMATION, getAnnotationText(matchingDescriptors))
+									.range(elementToAnnotation == null ? psiElement : elementToAnnotation);
 				} else {
-					annotation = annotationHolder.createInfoAnnotation(textRange, getAnnotationText(matchingDescriptors));
+					annotation = annotationHolder.newAnnotation(HighlightSeverity.INFORMATION, getAnnotationText(matchingDescriptors))
+									.range(textRange);
 				}
 
 				// FIXME: use color from annotation configuration
-				annotation.setEnforcedTextAttributes(new TextAttributes(null, null, JBColor.GREEN, EffectType.WAVE_UNDERSCORE, Font.PLAIN));
-
-				annotation.registerFix(new SuppressReportBugIntentionAction(problemDescriptor), textRange);
-				annotation.registerFix(new SuppressReportBugForClassIntentionAction(problemDescriptor), textRange);
-				annotation.registerFix(new ClearBugIntentionAction(problemDescriptor), textRange);
-				annotation.registerFix(new ClearAndSuppressBugIntentionAction(problemDescriptor), textRange);
+				annotation.enforcedTextAttributes(new TextAttributes(null, null, JBColor.GREEN, EffectType.WAVE_UNDERSCORE, Font.PLAIN))
+								.newFix(new SuppressReportBugIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.newFix(new SuppressReportBugForClassIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.newFix(new ClearBugIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.newFix(new ClearAndSuppressBugIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.create();
 
 				break;
 			case Detector.IGNORE_PRIORITY:
@@ -203,19 +213,21 @@ private static void addAnnotation(final ExtendedProblemDescriptor problemDescrip
 					} else {
 						elementToAnnotation = ((PsiClass) problemElement).getNameIdentifier();
 					}
-					annotation = annotationHolder.createWarningAnnotation(elementToAnnotation == null ? psiElement : elementToAnnotation, getAnnotationText(matchingDescriptors));
-					annotation.setEnforcedTextAttributes(new TextAttributes(null, null, JBColor.MAGENTA.brighter(), EffectType.WAVE_UNDERSCORE, Font.PLAIN));
+					annotation = annotationHolder.newAnnotation(HighlightSeverity.WARNING, getAnnotationText(matchingDescriptors))
+									.range(elementToAnnotation == null ? psiElement : elementToAnnotation)
+									.enforcedTextAttributes(new TextAttributes(null, null, JBColor.MAGENTA.brighter(), EffectType.WAVE_UNDERSCORE, Font.PLAIN));
 				} else {
-					annotation = annotationHolder.createWarningAnnotation(textRange, getAnnotationText(matchingDescriptors));
+					annotation = annotationHolder.newAnnotation(HighlightSeverity.WARNING, getAnnotationText(matchingDescriptors))
+									.range(textRange);
 				}
 
 				// FIXME: use color from annotation configuration
-				annotation.setEnforcedTextAttributes(new TextAttributes(null, null, JBColor.MAGENTA, EffectType.WAVE_UNDERSCORE, Font.PLAIN));
-
-				annotation.registerFix(new SuppressReportBugIntentionAction(problemDescriptor), textRange);
-				annotation.registerFix(new SuppressReportBugForClassIntentionAction(problemDescriptor), textRange);
-				annotation.registerFix(new ClearBugIntentionAction(problemDescriptor), textRange);
-				annotation.registerFix(new ClearAndSuppressBugIntentionAction(problemDescriptor), textRange);
+				annotation.enforcedTextAttributes(new TextAttributes(null, null, JBColor.MAGENTA, EffectType.WAVE_UNDERSCORE, Font.PLAIN))
+								.newFix(new SuppressReportBugIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.newFix(new SuppressReportBugForClassIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.newFix(new ClearBugIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.newFix(new ClearAndSuppressBugIntentionAction(problemDescriptor)).range(textRange).registerFix()
+								.create();
 
 				break;
 			default:
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/gui/editor/BugsLineMarkerProvider.java b/src/main/java/org/jetbrains/plugins/spotbugs/gui/editor/BugsLineMarkerProvider.java
index 89487819..dd73e6ad 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/gui/editor/BugsLineMarkerProvider.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/gui/editor/BugsLineMarkerProvider.java
@@ -119,7 +119,7 @@ private static PsiElement firstLeafOrNull(@NotNull PsiElement element) {
 		return firstLeaf != null ? firstLeaf.getPsi() : null;
 	}
 
-	public void collectSlowLineMarkers(@NotNull final List<PsiElement> elements, @NotNull final Collection<LineMarkerInfo> result) {
+	public void collectSlowLineMarkers(final @NotNull List<? extends PsiElement> elements, final @NotNull Collection<? super LineMarkerInfo<?>> result) {
 	}
 
 	private static class BugGutterIconNavigationHandler implements GutterIconNavigationHandler<PsiElement> {
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/gui/preferences/LegacyProjectSettings.java b/src/main/java/org/jetbrains/plugins/spotbugs/gui/preferences/LegacyProjectSettings.java
index ea603279..2ab45ebe 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/gui/preferences/LegacyProjectSettings.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/gui/preferences/LegacyProjectSettings.java
@@ -19,10 +19,7 @@
  */
 package org.jetbrains.plugins.spotbugs.gui.preferences;
 
-import com.intellij.openapi.components.PersistentStateComponent;
-import com.intellij.openapi.components.ServiceManager;
-import com.intellij.openapi.components.State;
-import com.intellij.openapi.components.Storage;
+import com.intellij.openapi.components.*;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
@@ -36,11 +33,12 @@
  * Legacy settings are converted (by {@link LegacyProjectSettingsConverter}) to {@link ProjectSettings}.
  * The settings are removed when the .ipr or config xml is stored next time.
  */
+@Service(Service.Level.PROJECT)
 @State(
 		name = FindBugsPluginConstants.PLUGIN_ID,
 		storages = {
-				@Storage(file = "$PROJECT_FILE$", deprecated = true),
-				@Storage(file = "$PROJECT_CONFIG_DIR$/findbugs-idea.xml", deprecated = true)})
+				@Storage(value = "$PROJECT_FILE$", deprecated = true),
+				@Storage(value = "$PROJECT_CONFIG_DIR$/findbugs-idea.xml", deprecated = true)})
 public final class LegacyProjectSettings implements PersistentStateComponent<PersistencePreferencesBean> {
 
 	private static final Logger LOGGER = Logger.getInstance(LegacyProjectSettings.class);
@@ -59,7 +57,7 @@ public void loadState(final PersistencePreferencesBean state) {
 	}
 
 	public static LegacyProjectSettings getInstance(@NotNull final Project project) {
-		return ServiceManager.getService(project, LegacyProjectSettings.class);
+		return project.getService(LegacyProjectSettings.class);
 	}
 
 	void applyTo(@NotNull final ProjectSettings settings, @NotNull final WorkspaceSettings workspaceSettings) {
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/AdvancedSettingsAction.java b/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/AdvancedSettingsAction.java
index 287a249a..46437049 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/AdvancedSettingsAction.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/AdvancedSettingsAction.java
@@ -172,7 +172,7 @@ public void actionPerformed(@NotNull final AnActionEvent e) {
 							ResourcesLoader.getString("settings.export.title"),
 							ResourcesLoader.getString("settings.export.description"),
 							XmlFileType.DEFAULT_EXTENSION
-					), settingsPane).save(null, "SpotBugs");
+					), settingsPane).save("SpotBugs");
 			if (wrapper == null) {
 				return;
 			}
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/DetectorTableHeaderPane.java b/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/DetectorTableHeaderPane.java
index c8fee3f7..51236112 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/DetectorTableHeaderPane.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/DetectorTableHeaderPane.java
@@ -94,7 +94,7 @@ public boolean canExpand() {
 		actions.add(actionManager.createCollapseAllAction(treeExpander, tablePane.getTable()));
 		actions.add(new GroupByAction());
 
-		final ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, actions, true);
+		final ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar("SpotBugs", actions, true);
 		actionToolbar.setTargetComponent(this);
 		return actionToolbar;
 	}
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/DetectorTablePane.java b/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/DetectorTablePane.java
index 95108c62..6640207f 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/DetectorTablePane.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/DetectorTablePane.java
@@ -107,8 +107,7 @@ void reload(final boolean expandAll) {
 			TreeUtil.expandAll(table.getTree());
 			final TreePath lastSelected = table.getTree().getSelectionPath();
 			if (lastSelected == null || !(lastSelected.getLastPathComponent() instanceof DetectorNode)) {
-				final TreePath path = TreeUtil.getFirstLeafNodePath(table.getTree());
-				TreeUtil.selectPath(table.getTree(), path);
+				TreeUtil.promiseSelectFirstLeaf(table.getTree());
 			}
 		}
 	}
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/FilterTab.java b/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/FilterTab.java
index f8718340..e7a55acf 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/FilterTab.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/FilterTab.java
@@ -38,9 +38,9 @@
 import java.io.File;
 
 final class FilterTab extends JPanel implements SettingsOwner<AbstractSettings> {
-	private FilterPane include;
-	private FilterPane exclude;
-	private FilterPane bugs;
+	private final FilterPane include;
+	private final FilterPane exclude;
+	private final FilterPane bugs;
 
 	FilterTab() {
 		super(new BorderLayout());
@@ -94,7 +94,7 @@ void addRFilerFilter() {
 						StringUtil.capitalizeWords(ResourcesLoader.getString("filter.rFile.save.title"), true),
 						ResourcesLoader.getString("filter.rFile.save.text"),
 						XmlFileType.DEFAULT_EXTENSION
-				), this).save(null, "findbugs-android-exclude");
+				), this).save("findbugs-android-exclude");
 		if (wrapper == null) {
 			return;
 		}
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/SettingsPane.java b/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/SettingsPane.java
index d590c9c6..fd234309 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/SettingsPane.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/gui/settings/SettingsPane.java
@@ -118,7 +118,7 @@ void initHeaderPane(@NotNull final JPanel topPanel) {
 	@NotNull
 	private ActionToolbar createToolbar(@NotNull final Project project, @Nullable final Module module) {
 		advancedSettingsAction = new AdvancedSettingsAction(this, project, module);
-		final ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, advancedSettingsAction, true);
+		final ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar("SpotBugs", advancedSettingsAction, true);
 		actionToolbar.setTargetComponent(this);
 		return actionToolbar;
 	}
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/gui/toolwindow/view/ToolWindowPanel.java b/src/main/java/org/jetbrains/plugins/spotbugs/gui/toolwindow/view/ToolWindowPanel.java
index a2981b93..fa048bed 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/gui/toolwindow/view/ToolWindowPanel.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/gui/toolwindow/view/ToolWindowPanel.java
@@ -269,8 +269,9 @@ public void analysisFinished(@NotNull final FindBugsResult result, @Nullable fin
 			}
 			String errorText = "An " + impl + " error occurred.";
 
-			final StatusBar statusBar = WindowManager.getInstance().getIdeFrame(_project).getStatusBar();
-			final StatusBarWidget widget = statusBar.getWidget(IdeMessagePanel.FATAL_ERROR);
+			IdeFrame ideFrame = WindowManager.getInstance().getIdeFrame(_project);
+			final StatusBar statusBar = ideFrame == null ? null : ideFrame.getStatusBar();
+			final StatusBarWidget widget = statusBar == null ? null : statusBar.getWidget(IdeMessagePanel.FATAL_ERROR);
 			IdeMessagePanel ideMessagePanel = null; // openFatals like ErrorNotifier
 			if (widget instanceof IdeMessagePanel) {
 				ideMessagePanel = (IdeMessagePanel) widget;
@@ -284,11 +285,10 @@ public void analysisFinished(@NotNull final FindBugsResult result, @Nullable fin
 		} else {
 			message.append("<a href='").append(A_HREF_DISABLE_ANCHOR).append("'>Disable notification").append("</a>");
 			NOTIFICATION_GROUP_ANALYSIS_FINISHED.createNotification(
-					VersionManager.getName() + ": Analysis Finished",
-					message.toString(),
-					notificationType,
-					new NotificationListenerImpl(ToolWindowPanel.this, result)
-			).setImportant(false).notify(_project);
+							VersionManager.getName() + ": Analysis Finished", message.toString(), notificationType)
+							.setImportant(false)
+							.setListener(new NotificationListenerImpl(ToolWindowPanel.this, result))
+							.notify(_project);
 		}
 
 		EditorFactory.getInstance().refreshAllEditors();
@@ -372,9 +372,6 @@ public static ToolWindowPanel getInstance(@Nullable final ToolWindow toolWindow)
 			return null;
 		}
 		final ContentManager contentManager = toolWindow.getContentManager();
-		if (contentManager == null) {
-			return null;
-		}
 		final Content[] contents = contentManager.getContents();
 		if (contents.length == 0) {
 			return null;
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/gui/tree/view/BugTree.java b/src/main/java/org/jetbrains/plugins/spotbugs/gui/tree/view/BugTree.java
index fb2b35e3..e79635bb 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/gui/tree/view/BugTree.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/gui/tree/view/BugTree.java
@@ -106,7 +106,7 @@ private void installHandlers() {
 		defaultactiongroup.add(ActionManager.getInstance().getAction("EditSource"));
 		defaultactiongroup.addSeparator();
 		defaultactiongroup.add(ActionManager.getInstance().getAction("VersionControlsGroup"));
-		PopupHandler.installPopupHandler(this, defaultactiongroup, "FoundBugsViewPopup", ActionManager.getInstance());
+		PopupHandler.installPopupMenu(this, defaultactiongroup, "FoundBugsViewPopup");
 		addKeyListener(createKeyAdapter());
 
 		EditSourceOnDoubleClickHandler.install(this);
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/intentions/SuppressReportBugIntentionAction.java b/src/main/java/org/jetbrains/plugins/spotbugs/intentions/SuppressReportBugIntentionAction.java
index c6a4c542..b1d67d5a 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/intentions/SuppressReportBugIntentionAction.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/intentions/SuppressReportBugIntentionAction.java
@@ -248,7 +248,7 @@ private void addSuppressAnnotation(
 				annotation.replace(createAnnotationFromText(project, annotationText, container));
 			} else {
 				if (!ApplicationManager.getApplication().isUnitTestMode() && editor != null) {
-					Messages.showErrorDialog(editor.getComponent(), InspectionsBundle.message("suppress.inspection.annotation.syntax.error", annotation.getText()));
+					Messages.showErrorDialog(editor.getComponent(), "Incorrect annotation syntax: " + annotation.getText());
 				}
 			}
 
@@ -278,7 +278,7 @@ public void addAnnotationsDependency(@NotNull final Project project,
 										 @NotNull final Module moduleWithoutAnnotations) {
 		if (Messages.showOkCancelDialog(project, "SpotBugs annotations library is missing.\n" +
 						"Would you like to add it?",
-				"Add Missing Dependency", Messages.OK_BUTTON, Messages.CANCEL_BUTTON, Messages.getErrorIcon()) == Messages.OK) {
+				"Add Missing Dependency", Messages.getOkButton(), Messages.getCancelButton(), Messages.getErrorIcon()) == Messages.OK) {
 			final ExternalLibraryDescriptor spotbugsAnnotations = new ExternalLibraryDescriptor(
 					"com.github.spotbugs", "spotbugs-annotations", null, null, "4.0.1"
 			);
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/plugins/Plugins.java b/src/main/java/org/jetbrains/plugins/spotbugs/plugins/Plugins.java
index 0614e173..1df027c0 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/plugins/Plugins.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/plugins/Plugins.java
@@ -38,20 +38,21 @@ public enum Plugins {
 
 	// http://fb-contrib.sourceforge.net/
 	// Complete list of versions https://search.maven.org/artifact/com.mebigfatguy.fb-contrib/fb-contrib
-	fb_contrib("fb-contrib-7.4.7.jar", "com.mebigfatguy.fbcontrib", true,
-			"fb-contrib-6.8.0.jar", "fb-contrib-6.6.1.jar", "fb-contrib-6.2.1.jar",
-			"fb-contrib-6.0.0.jar", "fb-contrib-5.2.1.jar"),
+	fb_contrib("fb-contrib-7.6.0.jar", "com.mebigfatguy.fbcontrib", true,
+					"fb-contrib-7.4.7.jar", "fb-contrib-6.8.0.jar", "fb-contrib-6.6.1.jar", "fb-contrib-6.2.1.jar",
+					"fb-contrib-6.0.0.jar", "fb-contrib-5.2.1.jar"),
 	fb_contrib_java6("fb-contrib-6.2.1.jar", "com.mebigfatguy.fbcontrib", false, "fb-contrib-6.0.0.jar", "fb-contrib-5.2.1.jar"),
 
 	// http://h3xstream.github.io/find-sec-bugs/
 	// Complete list of versions : https://search.maven.org/artifact/com.h3xstream.findsecbugs/findsecbugs-plugin
-	findsecbugs_plugin("findsecbugs-plugin-1.11.0.jar","com.h3xstream.findsecbugs", true,
-			"findsecbugs-plugin-1.10.1.jar", "findsecbugs-plugin-1.10.0.jar", "findsecbugs-plugin-1.9.0.jar", "findsecbugs-plugin-1.8.0.jar",
-			"findsecbugs-plugin-1.7.1.jar", "findsecbugs-plugin-1.7.0.jar", "findsecbugs-plugin-1.6.0.jar",
-			"findsecbugs-plugin-1.5.0.jar", "findsecbugs-plugin-1.4.6.jar", "findsecbugs-plugin-1.4.5.jar",
-			"findsecbugs-plugin-1.4.4.jar", "findsecbugs-plugin-1.4.3.jar", "findsecbugs-plugin-1.4.2.jar",
-			"findsecbugs-plugin-1.4.1.jar", "findsecbugs-plugin-1.4.0.jar", "findsecbugs-plugin-1.3.0.jar",
-			"findsecbugs-plugin-1.2.1.jar", "findsecbugs-plugin-1.2.0.jar");
+	findsecbugs_plugin("findsecbugs-plugin-1.12.0.jar","com.h3xstream.findsecbugs", true,
+					"findsecbugs-plugin-1.11.0.jar", "findsecbugs-plugin-1.10.1.jar", "findsecbugs-plugin-1.10.0.jar", 
+					"findsecbugs-plugin-1.9.0.jar", "findsecbugs-plugin-1.8.0.jar",
+					"findsecbugs-plugin-1.7.1.jar", "findsecbugs-plugin-1.7.0.jar", "findsecbugs-plugin-1.6.0.jar",
+					"findsecbugs-plugin-1.5.0.jar", "findsecbugs-plugin-1.4.6.jar", "findsecbugs-plugin-1.4.5.jar",
+					"findsecbugs-plugin-1.4.4.jar", "findsecbugs-plugin-1.4.3.jar", "findsecbugs-plugin-1.4.2.jar",
+					"findsecbugs-plugin-1.4.1.jar", "findsecbugs-plugin-1.4.0.jar", "findsecbugs-plugin-1.3.0.jar",
+					"findsecbugs-plugin-1.2.1.jar", "findsecbugs-plugin-1.2.0.jar");
 
 	private static final Logger LOGGER = Logger.getInstance(Plugins.class.getName());
 
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/resources/ResourcesLoader.java b/src/main/java/org/jetbrains/plugins/spotbugs/resources/ResourcesLoader.java
index 4f1b7cbf..4ec36e31 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/resources/ResourcesLoader.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/resources/ResourcesLoader.java
@@ -94,7 +94,7 @@ public static String getString(@NotNull @PropertyKey(resourceBundle = BUNDLE) fi
 
 	@NotNull
 	public static Icon loadIcon(final String filename) {
-		return IconLoader.getIcon(ICON_RESOURCES_PKG + '/' + filename);
+		return IconLoader.getIcon(ICON_RESOURCES_PKG + '/' + filename, ResourcesLoader.class);
 	}
 
 }
\ No newline at end of file
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 18ca45c7..83504983 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -1,6 +1,6 @@
 <!--
   ~ Copyright 2008-2019 Andre Pfeiler
-  ~ Copyright 2020 SpotBugs plugin contributors
+  ~ Copyright 2020-2023 SpotBugs plugin contributors
   ~
   ~ This file is part of IntelliJ SpotBugs plugin.
   ~
@@ -41,7 +41,7 @@
 		<ul>
             <li>SpotBugs 4 support</li>
             <li>quickfix: annotate, suppress SpotBugs patterns (GutterIcon and document markup (alt+enter))</li>
-            <li>IntelliJ IDEA 2019.3+ compatibility</li>
+            <li>IntelliJ IDEA 2022.2+ compatibility</li>
             <li>configure SpotBugs on idea project and module level</li>
             <li>jump to source from results shown in toolwindow including anonymous classes</li>
             <li>bug descriptions, solutions</li>
@@ -81,6 +81,15 @@
     </description>
     <change-notes>
         <![CDATA[<html>
+        <h3>1.2.6</h3>
+        <ul>
+            <li>SpotBugs dependency updated from 4.4.2 to 4.7.3</li>
+            <li>Updated Find Security Bugs plugin to 1.12.0</li>
+            <li>Updated FB-Contrib plugin to 7.6.0</li>
+            <li>Removed built-in error reporting to GitHub</li>
+            <li>Maintenance changes to modernize IntelliJ API usage</li>
+            <li>Minimal supported IntelliJ IDEA version is set to 2022.2</li>
+        </ul>
         <h3>1.2.5</h3>
         <ul>
             <li>SpotBugs dependency updated from 4.1.3 to 4.4.2</li>
@@ -148,7 +157,7 @@
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html
          -->
-    <idea-version since-build="193.2252"/>
+    <idea-version since-build="222.1"/>
 
     <!-- please see http://confluence.jetbrains.net/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
          on how to target different products -->
@@ -163,9 +172,6 @@
         <toolWindow anchor="bottom" id="SpotBugs" icon="PluginIcons.FINDBUGS_ICON_13X13"
                     factoryClass="org.jetbrains.plugins.spotbugs.core.ToolWindowFactoryImpl"/>
 
-        <projectService serviceImplementation="org.jetbrains.plugins.spotbugs.core.WorkspaceSettings"/>
-        <projectService serviceImplementation="org.jetbrains.plugins.spotbugs.core.ProjectSettings"/>
-        <projectService serviceImplementation="org.jetbrains.plugins.spotbugs.gui.preferences.LegacyProjectSettings"/>
         <projectConfigurable groupId="tools" provider="org.jetbrains.plugins.spotbugs.core.ProjectConfigurableProvider"
                              displayName="SpotBugs"/>
         <search.optionContributor implementation="org.jetbrains.plugins.spotbugs.gui.settings.SearchableOptionContributorImpl"/>
@@ -178,7 +184,6 @@
         <projectService serviceImplementation="org.jetbrains.plugins.spotbugs.core.ProblemCacheService"/>
     </extensions>
     <extensions defaultExtensionNs="com.intellij">
-        <errorHandler implementation="org.jetbrains.plugins.spotbugs.core.ErrorReportSubmitterImpl"/>
         <annotator language="JAVA" implementationClass="org.jetbrains.plugins.spotbugs.gui.editor.BugAnnotator"/>
         <codeInsight.lineMarkerProvider language="JAVA" implementationClass="org.jetbrains.plugins.spotbugs.gui.editor.BugsLineMarkerProvider"/>
     </extensions>
diff --git a/src/main/resources/org/jetbrains/plugins/spotbugs/resources/i18n/Messages.properties b/src/main/resources/org/jetbrains/plugins/spotbugs/resources/i18n/Messages.properties
index ed73bb34..ff14726c 100644
--- a/src/main/resources/org/jetbrains/plugins/spotbugs/resources/i18n/Messages.properties
+++ b/src/main/resources/org/jetbrains/plugins/spotbugs/resources/i18n/Messages.properties
@@ -169,13 +169,5 @@ error.file.type=Path \"{0}\" is not a file.
 error.directory.type=Path \"{0}\" is not a directory.
 error.directory.writable=Directory \"{0}\" is not writable.\nPlease choose another directory.
 error.customPlugins.title=Error while loading custom SpotBugs plugins
-error.submitReport.title=Copy error to clipboard and open page
-error.submitReport.checkVersion=Check SpotBugs Plugin Version
 error.submitReport.retrieve=Retrieve infos from {0}
-error.submitReport.old.title=Old SpotBugs plugin version
-error.submitReport.old.text=<html>SpotBugs plugin is out of date. Please consider to update the plugin.<br> \
-  Your version: <b>{0}</b><br> \
-  Latest available version: <b>{1}</b><br><br> \
-  Do you want to continue reporting this issue?</html>
-
 help.copyInfos=Copy product infos to Clipboard
diff --git a/src/test/java/org/jetbrains/plugins/spotbugs/actions/BugCollectionExporterTest.java b/src/test/java/org/jetbrains/plugins/spotbugs/actions/BugCollectionExporterTest.java
index bde637c6..b21541ee 100644
--- a/src/test/java/org/jetbrains/plugins/spotbugs/actions/BugCollectionExporterTest.java
+++ b/src/test/java/org/jetbrains/plugins/spotbugs/actions/BugCollectionExporterTest.java
@@ -52,7 +52,7 @@
 public class BugCollectionExporterTest extends JavaCodeInsightFixtureTestCase {
 
     @Rule
-    private final TemporaryFolder folder = new TemporaryFolder();
+    public final TemporaryFolder folder = new TemporaryFolder();
     private File out;
     private ToolWindowPanel toolWindowPanel;
 
diff --git a/src/test/testData/NPETestData.java b/src/test/testData/NPETestData.java
index 24eade78..db1d5613 100644
--- a/src/test/testData/NPETestData.java
+++ b/src/test/testData/NPETestData.java
@@ -2,7 +2,7 @@ public class NPETestData {
     public static boolean foo(int i) {
         <warning descr="SpotBugs: Check for oddness that won't work for negative numbers
 The code uses x % 2 == 1 to check to see if a value is odd, but this won't work for negative numbers (e.g., (-5) % 2 == -1). If this code is intending to check for oddness, consider usi
-ng x & 1 == 1, or x % 2 != 0.">return i % 2 == 1;</warning>
+ng (x & 1) == 1, or x % 2 != 0.">return i % 2 == 1;</warning>
     }
     public static void main(String[] args) {
         String s = null;