diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-08-19 23:41:04 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-08-19 23:41:17 +0200 |
| commit | 18fb58ae05aafb9d7c831e5c4c3c0d375e7492e8 (patch) | |
| tree | 0decd77e7f7faf1b4c95c7259b7f830d1afe1400 /WORKSPACE | |
| parent | 718555518ded4fbcafe0c1203f0035d3251884e6 (diff) | |
| parent | 0eea7368e26c6a6daeb1bb6eb536977421b1ccc5 (diff) | |
| download | jgit-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 'WORKSPACE')
| -rw-r--r-- | WORKSPACE | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -30,8 +30,8 @@ maven_jar( maven_jar( name = "jsch", - artifact = "com.jcraft:jsch:0.1.54", - sha1 = "da3584329a263616e277e15462b387addd1b208d", + artifact = "com.jcraft:jsch:0.1.55", + sha1 = "bbd40e5aa7aa3cfad5db34965456cee738a42a50", ) maven_jar( @@ -138,22 +138,22 @@ maven_jar( maven_jar( name = "mockito", - artifact = "org.mockito:mockito-core:2.13.0", - sha1 = "8e372943974e4a121fb8617baced8ebfe46d54f0", + artifact = "org.mockito:mockito-core:2.23.0", + sha1 = "497ddb32fd5d01f9dbe99a2ec790aeb931dff1b1", ) -BYTE_BUDDY_VERSION = "1.7.9" +BYTE_BUDDY_VERSION = "1.9.0" maven_jar( - name = "byte_buddy", + name = "bytebuddy", artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "51218a01a882c04d0aba8c028179cce488bbcb58", + sha1 = "8cb0d5baae526c9df46ae17693bbba302640538b", ) maven_jar( - name = "byte_buddy_agent", + name = "bytebuddy-agent", artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "a6c65f9da7f467ee1f02ff2841ffd3155aee2fc9", + sha1 = "37b5703b4a6290be3fffc63ae9c6bcaaee0ff856", ) maven_jar( |