aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm/src/org
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2024-05-02 15:16:45 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2024-05-02 15:23:55 +0200
commitacbb197355bc1ce3d2be747e3af62a01ca6821e5 (patch)
treed90b6be67723c00db1e85251eb91410bb10c8e62 /org.eclipse.jgit.pgm/src/org
parentc8844571b3a483e3cc5f77d18b4e972ad5fe2c5e (diff)
parent98f329e93791a49068adc0bc2f5c81234fe2d943 (diff)
downloadjgit-acbb197355bc1ce3d2be747e3af62a01ca6821e5.tar.gz
jgit-acbb197355bc1ce3d2be747e3af62a01ca6821e5.zip
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
Diffstat (limited to 'org.eclipse.jgit.pgm/src/org')
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandCatalog.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandCatalog.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandCatalog.java
index 210e17277f..2a9f7acdb9 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandCatalog.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandCatalog.java
@@ -19,10 +19,10 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
-import java.util.Vector;
/**
* List of all commands known by jgit's command line tools.
@@ -104,7 +104,7 @@ public class CommandCatalog {
final String pfx = "META-INF/services/"; //$NON-NLS-1$
return ldr.getResources(pfx + TextBuiltin.class.getName());
} catch (IOException err) {
- return new Vector<URL>().elements();
+ return Collections.emptyEnumeration();
}
}