aboutsummaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2019-08-19 23:41:04 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2019-08-19 23:41:17 +0200
commit18fb58ae05aafb9d7c831e5c4c3c0d375e7492e8 (patch)
tree0decd77e7f7faf1b4c95c7259b7f830d1afe1400 /pom.xml
parent718555518ded4fbcafe0c1203f0035d3251884e6 (diff)
parent0eea7368e26c6a6daeb1bb6eb536977421b1ccc5 (diff)
downloadjgit-18fb58ae05aafb9d7c831e5c4c3c0d375e7492e8.tar.gz
jgit-18fb58ae05aafb9d7c831e5c4c3c0d375e7492e8.zip
Merge branch 'stable-5.2' into stable-5.3
* stable-5.2: Fix NPE in RebaseTodoFile#parseComments Fix NPE in ObjectIdOwnerMap#get Fix NPE in CommitOnlyTest#getHead FileUtils#lastModifiedInstant should not log error if path doesn't exist Cache user global and system-wide git configurations Avoid setup and saving FileStoreAttributes compete for ~/.gitconfig lock Add missing dependencies for running FS_POSIXTest in Eclipse Fix javadoc for SystemReader#getInstance Improve retry handling when saving FileStoreAttributes fails Ensure FSTest uses MockSystemReader Make supportsAtomicCreateNewFile return true as default Update orbit to R20190602212107-2019-06 to enable backports from master Handle InvalidPathException in FS_POSIX#createNewFileAtomic Ensure root cause of lock creation failures is logged Implement toString in MockSystemReader and MockConfig LocalDiskRefTreeDatabaseTest shall use MockSystemReader Ensure LocalDiskRepositoryTestCase#setup fully uses MockSystemReader Ensure we use MockSystemReader in tests Override FileBasedConfig's save method in MockConfig Remove FileBasedConfig.load(boolean) introduced in d45219ba Disable debug log for FS in org.eclipse.jgit.test Bazel: enable logging for tests in org.eclipse.jgit.test LockFile: log exception if creation of lock file failed Stop using deprecated Constants.CHARACTER_ENCODING Change-Id: If0c5010a2cf151ebebb2f2088fac3ee02c5007b9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/pom.xml b/pom.xml
index 275d1d634a..afaf890875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
<jgit-last-release-version>5.2.0.201812061821-r</jgit-last-release-version>
<apache-sshd-version>2.0.0</apache-sshd-version>
- <jsch-version>0.1.54</jsch-version>
+ <jsch-version>0.1.55</jsch-version>
<jzlib-version>1.1.1</jzlib-version>
<javaewah-version>1.1.6</javaewah-version>
<junit-version>4.12</junit-version>