diff options
Diffstat (limited to 'org.eclipse.jgit.lfs.server.test')
6 files changed, 30 insertions, 25 deletions
diff --git a/org.eclipse.jgit.lfs.server.test/.classpath b/org.eclipse.jgit.lfs.server.test/.classpath index 4f9f6bf22f..f08af0a4e9 100644 --- a/org.eclipse.jgit.lfs.server.test/.classpath +++ b/org.eclipse.jgit.lfs.server.test/.classpath @@ -2,6 +2,10 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="tst"/> + <classpathentry kind="src" path="tst"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.jdt.core.prefs index 794592dee1..2ca78ff2d0 100644 --- a/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.jdt.core.prefs @@ -91,7 +91,7 @@ org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore diff --git a/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.mylyn.team.ui.prefs index ce7a0f0478..984263dd94 100644 --- a/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.mylyn.team.ui.prefs +++ b/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.mylyn.team.ui.prefs @@ -1,2 +1,2 @@ -commit.comment.template=${task.description} \n\nBug\: ${task.key} +commit.comment.template=${task.description}\n\nBug\: ${task.key} eclipse.preferences.version=1 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 dc6731cfd5..32bdf98b41 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.1.12.qualifier +Bundle-Version: 5.2.3.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.1.12,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.12,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.12,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.12,5.2.0)", - org.eclipse.jgit.junit.http;version="[5.1.12,5.2.0)", - org.eclipse.jgit.lfs;version="[5.1.12,5.2.0)", - org.eclipse.jgit.lfs.errors;version="[5.1.12,5.2.0)", - org.eclipse.jgit.lfs.lib;version="[5.1.12,5.2.0)", - org.eclipse.jgit.lfs.server;version="[5.1.12,5.2.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.1.12,5.2.0)", - org.eclipse.jgit.lfs.test;version="[5.1.12,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.12,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.12,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.12,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.12,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.12,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.12,5.2.0)", - org.eclipse.jgit.util;version="[5.1.12,5.2.0)", + org.eclipse.jgit.api;version="[5.2.3,5.3.0)", + org.eclipse.jgit.api.errors;version="[5.2.3,5.3.0)", + org.eclipse.jgit.internal.storage.file;version="[5.2.3,5.3.0)", + org.eclipse.jgit.junit;version="[5.2.3,5.3.0)", + org.eclipse.jgit.junit.http;version="[5.2.3,5.3.0)", + org.eclipse.jgit.lfs;version="[5.2.3,5.3.0)", + org.eclipse.jgit.lfs.errors;version="[5.2.3,5.3.0)", + org.eclipse.jgit.lfs.lib;version="[5.2.3,5.3.0)", + org.eclipse.jgit.lfs.server;version="[5.2.3,5.3.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.2.3,5.3.0)", + org.eclipse.jgit.lfs.test;version="[5.2.3,5.3.0)", + org.eclipse.jgit.lib;version="[5.2.3,5.3.0)", + org.eclipse.jgit.revwalk;version="[5.2.3,5.3.0)", + org.eclipse.jgit.storage.file;version="[5.2.3,5.3.0)", + org.eclipse.jgit.transport;version="[5.2.3,5.3.0)", + org.eclipse.jgit.treewalk;version="[5.2.3,5.3.0)", + org.eclipse.jgit.treewalk.filter;version="[5.2.3,5.3.0)", + org.eclipse.jgit.util;version="[5.2.3,5.3.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 3d2d1032d3..1e26b0a919 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.1.12-SNAPSHOT</version> + <version>5.2.3-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} -Xmx512m</argLine> + <argLine>-Djava.io.tmpdir=${project.build.directory} -Xmx300m</argLine> </configuration> </plugin> </plugins> diff --git a/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/PushTest.java b/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/PushTest.java index b081a8ef73..4eb4a0da54 100644 --- a/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/PushTest.java +++ b/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/PushTest.java @@ -42,6 +42,7 @@ */ package org.eclipse.jgit.lfs.server.fs; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import java.io.InputStream; @@ -149,7 +150,7 @@ public class PushTest extends LfsServerTest { new String(IO .readWholeStream(is, (int) ldr.getSize()) - .array())); + .array(), UTF_8)); } } |