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>

diff --cc WORKSPACE
Simple merge

diff --cc lib/BUILD
Simple merge

diff --cc org.eclipse.jgit.junit.ssh/BUILD
Simple merge

diff --cc org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties
Simple merge

diff --cc org.eclipse.jgit.ssh.apache/BUILD
Simple merge

diff --cc org.eclipse.jgit.test/BUILD
Simple merge

diff --cc org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
index a10d1d7ed9e18a2a660a2cdea9ed08f4fa75709a,c41a565963645521d6a17137fd563fd6a4152c00..049888272bdf5cc8e0441aa612166b801b8415dd
--- 1/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
--- 2/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@@ -54,8 -51,7 +51,7 @@@ cannotAccessLastModifiedForSafeDeletion
  cannotBeCombined=Cannot be combined.
  cannotBeRecursiveWhenTreesAreIncluded=TreeWalk shouldn't be recursive when tree objects are included.
  cannotChangeActionOnComment=Cannot change action on comment line in git-rebase-todo file, old action: {0}, new action: {1}.
- cannotChangeToComment=Cannot change a non-comment line to a comment line.
 -cannotCheckoutFromUnbornBranch=Cannot checkout from unborn branch
 +cannotCheckoutFromUnbornBranch=Cannot check out from unborn branch
  cannotCheckoutOursSwitchBranch=Checking out ours/theirs is only possible when checking out index, not when switching branches.
  cannotCombineSquashWithNoff=Cannot combine --squash with --no-ff.
  cannotCombineTreeFilterWithRevFilter=Cannot combine TreeFilter {0} with RevFilter {1}.
@@@ -176,10 -161,9 +162,9 @@@ corruptObjectInvalidParent=invalid pare
  corruptObjectInvalidTree=invalid tree
  corruptObjectInvalidType=invalid type
  corruptObjectInvalidType2=invalid type {0}
- corruptObjectMalformedHeader=malformed header: {0}
  corruptObjectMissingEmail=missing email
 -corruptObjectNameContainsByte=name contains byte 0x%x
 -corruptObjectNameContainsChar=name contains '%c'
 +corruptObjectNameContainsByte=byte 0x%x not allowed in Windows filename
 +corruptObjectNameContainsChar=char '%c' not allowed in Windows filename
  corruptObjectNameContainsNullByte=name contains byte 0x00
  corruptObjectNameContainsSlash=name contains '/'
  corruptObjectNameDot=invalid name '.'
@@@ -205,24 -183,12 +184,17 @@@ corruptObjectTruncatedInName=truncated 
  corruptObjectTruncatedInObjectId=truncated in object id
  corruptObjectZeroId=entry points to null SHA-1
  corruptUseCnt=close() called when useCnt is already zero for {0}
- couldNotCheckOutBecauseOfConflicts=Could not check out because of conflicts
- couldNotDeleteLockFileShouldNotHappen=Could not delete lock file. Should not happen
- couldNotDeleteTemporaryIndexFileShouldNotHappen=Could not delete temporary index file. Should not happen
  couldNotGetAdvertisedRef=Remote {0} did not advertise Ref for branch {1}. This Ref may not exist in the remote or may be hidden by permission settings.
  couldNotGetRepoStatistics=Could not get repository statistics
- couldNotLockHEAD=Could not lock HEAD
 +couldNotFindTabInLine=Could not find tab in line {0}. Tab is the mandatory separator for the Netscape Cookie File Format.
 +couldNotFindSixTabsInLine=Could not find 6 tabs but only {0} in line '{1}'. 7 tab separated columns per line are mandatory for the Netscape Cookie File Format.
+ couldNotLockHEAD=Could not lock HEAD
 +couldNotPersistCookies=Could not persist received cookies in file ''{0}''
 +couldNotReadCookieFile=Could not read cookie file ''{0}''
 +couldNotReadIndexInOneGo=Could not read index in one go, only {0} out of {1} read
  couldNotReadObjectWhileParsingCommit=Could not read an object while parsing commit {0}
- couldNotRenameDeleteOldIndex=Could not rename delete old index
- couldNotRenameTemporaryFile=Could not rename temporary file {0} to new location {1}
- couldNotRenameTemporaryIndexFileToIndex=Could not rename temporary index file to index
  couldNotRewindToUpstreamCommit=Could not rewind to upstream commit
  couldNotURLEncodeToUTF8=Could not URL encode to UTF-8
- couldNotWriteFile=Could not write file {0}
  countingObjects=Counting objects
  corruptPack=Pack file {0} is corrupt, removing it from pack list
  createBranchFailedUnknownReason=Create branch failed for unknown reason

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
index cd50e347abeb008b464f9ba5aa4a424826be043d,d51e052b03af238be7fce551543df5af03733c9a..60d1dab23fd2d59c0ee52c0a59763111e944ee24
--- 1/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
--- 2/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
@@@ -267,24 -245,12 +246,17 @@@ public class JGitText extends Translati
        /***/ public String corruptObjectZeroId;
        /***/ public String corruptPack;
        /***/ public String corruptUseCnt;
-       /***/ public String couldNotCheckOutBecauseOfConflicts;
-       /***/ public String couldNotDeleteLockFileShouldNotHappen;
-       /***/ public String couldNotDeleteTemporaryIndexFileShouldNotHappen;
 +      /***/ public String couldNotFindTabInLine;
 +      /***/ public String couldNotFindSixTabsInLine;
        /***/ public String couldNotGetAdvertisedRef;
        /***/ public String couldNotGetRepoStatistics;
        /***/ public String couldNotLockHEAD;
 +      /***/ public String couldNotPersistCookies;
 +      /***/ public String couldNotReadCookieFile;
 +      /***/ public String couldNotReadIndexInOneGo;
        /***/ public String couldNotReadObjectWhileParsingCommit;
-       /***/ public String couldNotRenameDeleteOldIndex;
-       /***/ public String couldNotRenameTemporaryFile;
-       /***/ public String couldNotRenameTemporaryIndexFileToIndex;
        /***/ public String couldNotRewindToUpstreamCommit;
        /***/ public String couldNotURLEncodeToUTF8;
-       /***/ public String couldNotWriteFile;
        /***/ public String countingObjects;
        /***/ public String createBranchFailedUnknownReason;
        /***/ public String createBranchUnexpectedResult;

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/util/SimpleLruCache.java
index 7235b15548fe5e8bd7f4a76ad2c3b0cdd697ed4a,3fcfd21fc5238e60904ef4e3141173c149614525..c213bf9686720e278de4544d88bce6fa5f049f69
--- 1/org.eclipse.jgit/src/org/eclipse/jgit/util/SimpleLruCache.java
--- 2/org.eclipse.jgit/src/org/eclipse/jgit/util/SimpleLruCache.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SimpleLruCache.java
@@@ -186,9 -185,8 +186,9 @@@ public class SimpleLruCache<K, V> 
         * @throws NullPointerException
         *             if the specified key or value is null
         */
 +      @SuppressWarnings("NonAtomicVolatileUpdate")
        public V put(@NonNull K key, @NonNull V value) {
-               map.put(key, new Entry<>(key, value, ++time));
+               map.put(key, new Entry<>(key, value, tick()));
                if (map.size() > maximumSize) {
                        purge();
                }

diff --cc tools/BUILD
Simple merge