diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-08-20 00:15:58 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-08-20 00:16:11 +0200 |
| commit | 3e2c88199f12c91206f49bd886e2eb033300cd91 (patch) | |
| tree | 48f5797d9be5d13ea45f65dddfe0205438a09a6e /org.eclipse.jgit.test/META-INF/MANIFEST.MF | |
| parent | d7ee5aafee7c4eabeea6de8dd125a1ad4ddcdc0f (diff) | |
| parent | 35d99477b81043f24314c4c84da8f29e601bec19 (diff) | |
| download | jgit-3e2c88199f12c91206f49bd886e2eb033300cd91.tar.gz jgit-3e2c88199f12c91206f49bd886e2eb033300cd91.zip | |
Merge branch 'stable-5.4'
* stable-5.4:
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
Upgrade tycho-extras to 1.4.0
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: I709de5edb626536529a99220aae7751b127c9bff
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.test/META-INF/MANIFEST.MF')
| -rw-r--r-- | org.eclipse.jgit.test/META-INF/MANIFEST.MF | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 53b79b0cb7..e36f5e419a 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", com.jcraft.jsch;version="[0.1.54,0.2.0)", - net.bytebuddy.dynamic.loading;version="[1.7.0,2.0.0)", + net.bytebuddy.dynamic.loading;version="[1.9.0,2.0.0)", org.apache.commons.compress.archivers;version="[1.15.0,2.0)", org.apache.commons.compress.archivers.tar;version="[1.15.0,2.0)", org.apache.commons.compress.archivers.zip;version="[1.15.0,2.0)", @@ -74,10 +74,10 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.junit.rules;version="[4.12,5.0.0)", org.junit.runner;version="[4.12,5.0.0)", org.junit.runners;version="[4.12,5.0.0)", - org.mockito;version="[2.13.0,3.0.0)", - org.mockito.invocation;version="[2.13.0,3.0.0)", - org.mockito.junit;version="[2.13.0,3.0.0)", - org.mockito.stubbing;version="[2.13.0,3.0.0)", + org.mockito;version="[2.23.0,3.0.0)", + org.mockito.invocation;version="[2.23.0,3.0.0)", + org.mockito.junit;version="[2.23.0,3.0.0)", + org.mockito.stubbing;version="[2.23.0,3.0.0)", org.objenesis;version="[2.6.0,3.0.0)", org.slf4j;version="[1.7.0,2.0.0)", org.tukaani.xz;version="[1.6.0,2.0)" |