Merge changes Ib8c199af,I621aad14,I95ade650,Ice4742bb,Ib1b29c56

* changes:
  Fix running RevWalkSortTopoWithCommitGraphTest with bazel
  [errorprone] Fix UnnecessaryParentheses error caused by ab51fe2bdb
  [errorprone] Demote InvalidBlockTag to WARN
  Silence API errors raised for breaking changes on protected methods
  Fix invalid version range format in OSGi manifest

org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF

diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
index b83e577..8bef119 100644
--- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@
  org.apache.sshd.common.signature;version="[2.19.0,3.0.0)",
  org.apache.sshd.common.util.buffer;version="[2.19.0,3.0.0)",
  org.apache.sshd.common.util.net;version="[2.19.0,3.0.0)",
- org.apache.sshd.common.util.security;version="[2.19.0,3.0.0",
+ org.apache.sshd.common.util.security;version="[2.19.0,3.0.0]",
  org.apache.sshd.core;version="[2.19.0,3.0.0)",
  org.apache.sshd.server;version="[2.19.0,3.0.0)",
  org.apache.sshd.server.forward;version="[2.19.0,3.0.0)",

org.eclipse.jgit.test/BUILD

diff --git a/org.eclipse.jgit.test/BUILD b/org.eclipse.jgit.test/BUILD
index 7dab36d..a3765da 100644
--- a/org.eclipse.jgit.test/BUILD
+++ b/org.eclipse.jgit.test/BUILD
@@ -24,6 +24,7 @@
     "nls/MissingPropertyBundle.java",
     "nls/NoPropertiesBundle.java",
     "nls/NonTranslatedBundle.java",
+    "revwalk/AbstractRevWalkWithCommitGraphTest.java",
     "revwalk/RevQueueTestCase.java",
     "revwalk/RevWalkTestCase.java",
     "transport/ObjectIdMatcher.java",

org.eclipse.jgit.test/tests.bzl

diff --git a/org.eclipse.jgit.test/tests.bzl b/org.eclipse.jgit.test/tests.bzl
index 41f76d0..a532ac3 100644
--- a/org.eclipse.jgit.test/tests.bzl
+++ b/org.eclipse.jgit.test/tests.bzl
@@ -72,6 +72,10 @@
                 "//lib:xz",
                 "//org.eclipse.jgit.archive:jgit-archive",
             ]
+        if src.endswith("RevWalkSortTopoWithCommitGraphTest.java"):
+            additional_deps = [
+                "//lib:assertj-core",
+            ]
         if src.endswith("FileRepositoryBuilderAfterOpenConfigTest.java") or \
            src.endswith("RefDirectoryAfterOpenConfigTest.java") or \
            src.endswith("SnapshottingRefDirectoryTest.java"):

org.eclipse.jgit/.settings/.api_filters

diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index 6a7d44a..641eb50 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -8,6 +8,20 @@
             </message_arguments>
         </filter>
     </resource>
+    <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger">
+        <filter id="338792546">
+            <message_arguments>
+                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
+                <message_argument value="addToCheckout(String, DirCacheEntry, Attributes[])"/>
+            </message_arguments>
+        </filter>
+        <filter id="338792546">
+            <message_arguments>
+                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
+                <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean, Attributes[])"/>
+            </message_arguments>
+        </filter>
+    </resource>
     <resource path="src/org/eclipse/jgit/revwalk/RevFlag.java" type="org.eclipse.jgit.revwalk.RevFlag">
         <filter id="336658481">
             <message_arguments>

org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java
index 5d43c5b..e1cc065 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java
@@ -30,7 +30,7 @@ protected TopoSortPendingGenerator(RevWalk walker, AbstractRevQueue pending,
 		super(walker.isFirstParent());
 
 		this.output = (output | SORT_COMMIT_TIME_DESC | SORT_TOPO)
-				& ~(NEEDS_REWRITE);
+				& ~NEEDS_REWRITE;
 		this.explorePhase = new TopoExplorePhase(walker, filter, canDispose);
 		this.inDegreePhase = new TopoInDegreePhase(walker, explorePhase,
 				(output & NEEDS_REWRITE) != 0);

tools/BUILD

diff --git a/tools/BUILD b/tools/BUILD
index 4238054..ff71fb5 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -199,7 +199,7 @@
     "-Xep:InstanceOfAndCastMatchWrongType:ERROR",
     "-Xep:InstantTemporalUnit:ERROR",
     "-Xep:IntLongMath:ERROR",
-    "-Xep:InvalidBlockTag:ERROR",
+    "-Xep:InvalidBlockTag:WARN",
     "-Xep:InvalidInlineTag:ERROR",
     "-Xep:InvalidJavaTimeConstant:ERROR",
     "-Xep:InvalidLink:ERROR",