Merge branch 'stable-5.3' into stable-5.4

* stable-5.3:
  Format BUILD files with buildifier
  [error prone] Suppress NonAtomicVolatileUpdate in SimpleLruCache
  Bazel: Format BUILD files with buildifier
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
  Bazel: Fix warning about deprecated lib.bzl
  Format lib/BUILD with buildifier
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
  Bazel: Bump minimum supported version to 0.29.0
  Bazel: Bump skylib library version to 0.8.0
  Use bazelisk to switch between used bazel version
  Bazel: Require minimum bazel version 0.17.1
  Fix wrong placeholder index in error message packInaccessible
  JGitText: Remove unused externalized strings
  RepoText: Remove unused externalized string
  CLI: Remove unused externalized strings

Change-Id: Iaea77a89fcd821df5dbb24f5e3e39e6d1dfc0bd4
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

3 files changed, 2 insertions, 6 deletions

diff --git a/org.eclipse.jgit.pgm/BUILD b/org.eclipse.jgit.pgm/BUILD
index 1a115dd427..18607ea6ea 100644
--- a/org.eclipse.jgit.pgm/BUILD
+++ b/org.eclipse.jgit.pgm/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_binary", "java_import", "java_library")
+
 java_library(
     name = "pgm",
     srcs = glob(["src/**/*.java"]),
diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties
index 2a5a31eba8..124bb44d33 100644
--- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties
+++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties
@@ -32,7 +32,6 @@ cannotDeleteFile=error: The following file could not be deleted:
 cannotDeleteTheBranchWhichYouAreCurrentlyOn=Cannot delete the branch ''{0}'' which you are currently on.
 cannotGuessLocalNameFrom=cannot guess local name from {0}
 cannotLock=Cannot lock {0}
-cannotMergeDetachedHead=Cannot merge into detached HEAD
 cannotReadBecause=cannot read {0}: {1}
 cannotReadPackageInformation=Cannot read package information.
 cannotRenameDetachedHEAD=Cannot rename detached HEAD
@@ -64,7 +63,6 @@ expectedNumberOfbytes=Expected {0} bytes.
 exporting=Exporting {0}
 failedToCommitIndex=failed to commit index
 failedToLockIndex=failed to lock index
-failedToLockTag=Failed to lock tag {0}: {1}
 fatalError=fatal: {0}
 fatalThisProgramWillDestroyTheRepository=fatal: This program will destroy the repository\nfatal:\nfatal:\nfatal:    {0}\nfatal:\nfatal: To continue, add {1} to the command line\nfatal:
 fetchingSubmodule=Fetching submodule {0}
@@ -155,7 +153,6 @@ needSingleRevision=Needed a single revision
 noGitRepositoryConfigured=No Git repository configured.
 noNamesFound=No names found, cannot describe anything.
 noSuchFile=no such file: {0}
-noSuchRemoteRef=no such remote ref: ''{0}''
 noSystemConsoleAvailable=No System.console available
 noTREESectionInIndex=no 'TREE' section in index
 nonFastForward=non-fast forward
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java
index 7b9401f362..8a3e43e090 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java
@@ -146,7 +146,6 @@ public class CLIText extends TranslationBundle {
 	/***/ public String cannotDeleteTheBranchWhichYouAreCurrentlyOn;
 	/***/ public String cannotGuessLocalNameFrom;
 	/***/ public String cannotLock;
-	/***/ public String cannotMergeDetachedHead;
 	/***/ public String cannotReadBecause;
 	/***/ public String cannotReadPackageInformation;
 	/***/ public String cannotRenameDetachedHEAD;
@@ -177,7 +176,6 @@ public class CLIText extends TranslationBundle {
 	/***/ public String exporting;
 	/***/ public String failedToCommitIndex;
 	/***/ public String failedToLockIndex;
-	/***/ public String failedToLockTag;
 	/***/ public String fatalError;
 	/***/ public String fatalThisProgramWillDestroyTheRepository;
 	/***/ public String fetchingSubmodule;
@@ -257,7 +255,6 @@ public class CLIText extends TranslationBundle {
 	/***/ public String noGitRepositoryConfigured;
 	/***/ public String noNamesFound;
 	/***/ public String noSuchFile;
-	/***/ public String noSuchRemoteRef;
 	/***/ public String noTREESectionInIndex;
 	/***/ public String nonFastForward;
 	/***/ public String noSystemConsoleAvailable;