diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-08-19 17:52:02 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-08-19 18:30:35 +0200 |
| commit | 0eea7368e26c6a6daeb1bb6eb536977421b1ccc5 (patch) | |
| tree | 80e250c03719eebe96facdf09f4b66107a56ed41 /pom.xml | |
| parent | 0046b2a8fefcbfecc10a7b198a075eb2775d3e7a (diff) | |
| parent | 86a567f6152315f5d55309c7119885d0fa3476ce (diff) | |
| download | jgit-0eea7368e26c6a6daeb1bb6eb536977421b1ccc5.tar.gz jgit-0eea7368e26c6a6daeb1bb6eb536977421b1ccc5.zip | |
Merge branch 'stable-5.1' into stable-5.2
* stable-5.1:
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: I48c585f3c9287be7d6ddb6b01a1955444e13fa31
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -184,7 +184,7 @@ <jgit-last-release-version>5.1.0.201809111528-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> @@ -195,8 +195,8 @@ <servlet-api-version>3.1.0</servlet-api-version> <jetty-version>9.4.11.v20180605</jetty-version> <japicmp-version>0.14.1</japicmp-version> - <httpclient-version>4.5.5</httpclient-version> - <httpcore-version>4.4.9</httpcore-version> + <httpclient-version>4.5.6</httpclient-version> + <httpcore-version>4.4.10</httpcore-version> <slf4j-version>1.7.2</slf4j-version> <log4j-version>1.2.15</log4j-version> <maven-javadoc-plugin-version>3.1.0</maven-javadoc-plugin-version> |