Merge branch 'master' into next

* master:
  Bazel: Add support for JDK 21
  Bazel: Replace deprecated --experimental_strict_action_env option
  Fix warning about using raw type
  [errorprone] Fix pattern ModifiedButNotUsed
  [errorprone] Fix pattern CatchAndPrintStackTrace
  [errorprone] Fix pattern FutureReturnValueIgnored
  [errorprone] Fix pattern BadImport
  [errorprone] Fix pattern UseCorrectAssertInTests
  [errorprone] Fix pattern ProtectedMembersInFinalClass
  [errorprone] Fix pattern CatchFail
  [errorprone] Fix pattern see UnusedVariable
  [errorprone] Fix pattern LongLiteralLowerCaseSuffix
  [errorprone] Fix error pattern JdkObsolete
  [errorprone] Fix UnnecessaryParentheses errors
  Bazel: Update RBE docker image to Ubuntu 22.04 and JDK 17
  Bump Bazel version to 7.1.1
  PackIndex: Make #getOffset protected to allow out-of-package subclasses

Change-Id: I4ecde5e6a3cb9f122990893fa97f6d2a9978bcc4

3 files changed, 4 insertions, 6 deletions

diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/KnownHostEntryReader.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/KnownHostEntryReader.java
index a00e5d96ac..96829b7365 100644
--- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/KnownHostEntryReader.java
+++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/KnownHostEntryReader.java
@@ -18,9 +18,9 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -65,7 +65,7 @@ public class KnownHostEntryReader {
 	 */
 	public static List<KnownHostEntry> readFromFile(Path path)
 			throws IOException {
-		List<KnownHostEntry> result = new LinkedList<>();
+		List<KnownHostEntry> result = new ArrayList<>();
 		try (BufferedReader r = Files.newBufferedReader(path, UTF_8)) {
 			r.lines().forEachOrdered(l -> {
 				if (l == null) {
diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java
index 65ba5be0c5..2b4f7e50ff 100644
--- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java
+++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java
@@ -31,7 +31,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -587,7 +586,7 @@ public class OpenSshServerKeyDatabase
 				if (rawEntries == null || rawEntries.isEmpty()) {
 					return Collections.emptyList();
 				}
-				List<HostEntryPair> newEntries = new LinkedList<>();
+				List<HostEntryPair> newEntries = new ArrayList<>();
 				for (KnownHostEntry entry : rawEntries) {
 					AuthorizedKeyEntry keyPart = entry.getKeyEntry();
 					if (keyPart == null) {
diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java
index b94ccc6d4f..96316ba1aa 100644
--- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java
+++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -263,7 +262,7 @@ public class SshdSession implements RemoteSession2 {
 	private List<URIish> parseProxyJump(String proxyJump)
 			throws URISyntaxException {
 		String[] hops = proxyJump.split(","); //$NON-NLS-1$
-		List<URIish> result = new LinkedList<>();
+		List<URIish> result = new ArrayList<>();
 		for (String hop : hops) {
 			// There shouldn't be any whitespace, but let's be lenient
 			hop = hop.trim();