diff options
Diffstat (limited to 'org.eclipse.jgit.pgm.test')
5 files changed, 61 insertions, 31 deletions
diff --git a/org.eclipse.jgit.pgm.test/.settings/org.eclipse.pde.prefs b/org.eclipse.jgit.pgm.test/.settings/org.eclipse.pde.prefs new file mode 100644 index 0000000000..2174e4fd5b --- /dev/null +++ b/org.eclipse.jgit.pgm.test/.settings/org.eclipse.pde.prefs @@ -0,0 +1,34 @@ +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 +compilers.incompatible-environment=1 +compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=2 +compilers.p.build.output.library=1 +compilers.p.build.source.library=1 +compilers.p.build.src.includes=1 +compilers.p.deprecated=1 +compilers.p.discouraged-class=1 +compilers.p.internal=1 +compilers.p.missing-packages=2 +compilers.p.missing-version-export-package=2 +compilers.p.missing-version-import-package=2 +compilers.p.missing-version-require-bundle=2 +compilers.p.no-required-att=0 +compilers.p.no.automatic.module=1 +compilers.p.not-externalized-att=2 +compilers.p.service.component.without.lazyactivation=1 +compilers.p.unknown-attribute=1 +compilers.p.unknown-class=1 +compilers.p.unknown-element=1 +compilers.p.unknown-identifier=1 +compilers.p.unknown-resource=1 +compilers.p.unresolved-ex-points=0 +compilers.p.unresolved-import=0 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 +eclipse.preferences.version=1 diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index b0e6506e36..920c0cf897 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,28 +3,28 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 5.3.3.qualifier +Bundle-Version: 5.4.1.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: 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.diff;version="[5.3.3,5.4.0)", - org.eclipse.jgit.dircache;version="[5.3.3,5.4.0)", - org.eclipse.jgit.internal.storage.file;version="5.3.3", - org.eclipse.jgit.junit;version="[5.3.3,5.4.0)", - org.eclipse.jgit.lib;version="[5.3.3,5.4.0)", - org.eclipse.jgit.merge;version="[5.3.3,5.4.0)", - org.eclipse.jgit.pgm;version="[5.3.3,5.4.0)", - org.eclipse.jgit.pgm.internal;version="[5.3.3,5.4.0)", - org.eclipse.jgit.pgm.opt;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.util;version="[5.3.3,5.4.0)", - org.eclipse.jgit.util.io;version="[5.3.3,5.4.0)", +Import-Package: 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.diff;version="[5.4.1,5.5.0)", + org.eclipse.jgit.dircache;version="[5.4.1,5.5.0)", + org.eclipse.jgit.internal.storage.file;version="5.4.1", + org.eclipse.jgit.junit;version="[5.4.1,5.5.0)", + org.eclipse.jgit.lib;version="[5.4.1,5.5.0)", + org.eclipse.jgit.merge;version="[5.4.1,5.5.0)", + org.eclipse.jgit.pgm;version="[5.4.1,5.5.0)", + org.eclipse.jgit.pgm.internal;version="[5.4.1,5.5.0)", + org.eclipse.jgit.pgm.opt;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.util;version="[5.4.1,5.5.0)", + org.eclipse.jgit.util.io;version="[5.4.1,5.5.0)", org.hamcrest.core;bundle-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.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 601f0e0c57..fb493f8c54 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.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.pgm.test</artifactId> @@ -109,7 +109,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>@{argLine} -Djava.io.tmpdir=${project.build.directory}</argLine> + <argLine>@{argLine} -Xmx512m -Djava.io.tmpdir=${project.build.directory}</argLine> </configuration> </plugin> </plugins> diff --git a/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/lib/CLIRepositoryTestCase.java b/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/lib/CLIRepositoryTestCase.java index 0d1894b644..a830ff2849 100644 --- a/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/lib/CLIRepositoryTestCase.java +++ b/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/lib/CLIRepositoryTestCase.java @@ -214,7 +214,7 @@ public class CLIRepositoryTestCase extends LocalDiskRepositoryTestCase { protected void assertStringArrayEquals(String expected, String[] actual) { // if there is more than one line, ignore last one if empty assertEquals(1, - actual.length > 1 && actual[actual.length - 1].equals("") + actual.length > 1 && actual[actual.length - 1].isEmpty() ? actual.length - 1 : actual.length); assertEquals(expected, actual[0]); } diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ArchiveTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ArchiveTest.java index 47eb156c55..e07fdd50d2 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ArchiveTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ArchiveTest.java @@ -60,7 +60,6 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -703,15 +702,12 @@ public class ArchiveTest extends CLIRepositoryTestCase { private static Future<Object> writeAsync(OutputStream stream, byte[] data) { ExecutorService executor = Executors.newSingleThreadExecutor(); - return executor.submit(new Callable<Object>() { - @Override - public Object call() throws IOException { - try { - stream.write(data); - return null; - } finally { - stream.close(); - } + return executor.submit(() -> { + try { + stream.write(data); + return null; + } finally { + stream.close(); } }); } |