diff options
Diffstat (limited to 'org.eclipse.jgit.lfs.server.test')
3 files changed, 28 insertions, 29 deletions
diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 4bef1de931..d5bf494448 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 5.3.3.qualifier +Bundle-Version: 5.4.1.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -28,24 +28,24 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", - org.eclipse.jgit.api;version="[5.3.3,5.4.0)", - org.eclipse.jgit.api.errors;version="[5.3.3,5.4.0)", - org.eclipse.jgit.internal.storage.file;version="[5.3.3,5.4.0)", - org.eclipse.jgit.junit;version="[5.3.3,5.4.0)", - org.eclipse.jgit.junit.http;version="[5.3.3,5.4.0)", - org.eclipse.jgit.lfs;version="[5.3.3,5.4.0)", - org.eclipse.jgit.lfs.errors;version="[5.3.3,5.4.0)", - org.eclipse.jgit.lfs.lib;version="[5.3.3,5.4.0)", - org.eclipse.jgit.lfs.server;version="[5.3.3,5.4.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.3.3,5.4.0)", - org.eclipse.jgit.lfs.test;version="[5.3.3,5.4.0)", - org.eclipse.jgit.lib;version="[5.3.3,5.4.0)", - org.eclipse.jgit.revwalk;version="[5.3.3,5.4.0)", - org.eclipse.jgit.storage.file;version="[5.3.3,5.4.0)", - org.eclipse.jgit.transport;version="[5.3.3,5.4.0)", - org.eclipse.jgit.treewalk;version="[5.3.3,5.4.0)", - org.eclipse.jgit.treewalk.filter;version="[5.3.3,5.4.0)", - org.eclipse.jgit.util;version="[5.3.3,5.4.0)", + org.eclipse.jgit.api;version="[5.4.1,5.5.0)", + org.eclipse.jgit.api.errors;version="[5.4.1,5.5.0)", + org.eclipse.jgit.internal.storage.file;version="[5.4.1,5.5.0)", + org.eclipse.jgit.junit;version="[5.4.1,5.5.0)", + org.eclipse.jgit.junit.http;version="[5.4.1,5.5.0)", + org.eclipse.jgit.lfs;version="[5.4.1,5.5.0)", + org.eclipse.jgit.lfs.errors;version="[5.4.1,5.5.0)", + org.eclipse.jgit.lfs.lib;version="[5.4.1,5.5.0)", + org.eclipse.jgit.lfs.server;version="[5.4.1,5.5.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.4.1,5.5.0)", + org.eclipse.jgit.lfs.test;version="[5.4.1,5.5.0)", + org.eclipse.jgit.lib;version="[5.4.1,5.5.0)", + org.eclipse.jgit.revwalk;version="[5.4.1,5.5.0)", + org.eclipse.jgit.storage.file;version="[5.4.1,5.5.0)", + org.eclipse.jgit.transport;version="[5.4.1,5.5.0)", + org.eclipse.jgit.treewalk;version="[5.4.1,5.5.0)", + org.eclipse.jgit.treewalk.filter;version="[5.4.1,5.5.0)", + org.eclipse.jgit.util;version="[5.4.1,5.5.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 44f166b2c7..7194449b09 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.4.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs.server.test</artifactId> @@ -137,7 +137,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>@{argLine} -Djava.io.tmpdir=${project.build.directory} -Xmx300m</argLine> + <argLine>@{argLine} -Djava.io.tmpdir=${project.build.directory} -Xmx512m</argLine> </configuration> </plugin> </plugins> diff --git a/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/UploadTest.java b/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/UploadTest.java index 09f8d0aeaf..2334ec37af 100644 --- a/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/UploadTest.java +++ b/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/UploadTest.java @@ -44,6 +44,7 @@ package org.eclipse.jgit.lfs.server.fs; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -53,10 +54,10 @@ import java.nio.file.Paths; import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.Callable; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.eclipse.jgit.lfs.lib.AnyLongObjectId; @@ -123,14 +124,12 @@ public class UploadTest extends LfsServerTest { ExecutorService e = Executors.newFixedThreadPool(count); try { for (Path p : paths) { - e.submit(new Callable<Void>() { - @Override - public Void call() throws Exception { - barrier.await(); - putContent(p); - return null; - } + Future<Object> result = e.submit(() -> { + barrier.await(); + putContent(p); + return null; }); + assertNotNull(result); } } finally { e.shutdown(); |