diff options
Diffstat (limited to 'org.eclipse.jgit.junit')
4 files changed, 45 insertions, 25 deletions
diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index a416ae760c..c07213a52e 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,34 +3,34 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 5.2.3.qualifier +Bundle-Version: 5.3.4.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.annotations;version="[5.2.3,5.3.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.dircache;version="[5.2.3,5.3.0)", - org.eclipse.jgit.errors;version="[5.2.3,5.3.0)", - org.eclipse.jgit.internal.storage.file;version="[5.2.3,5.3.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.2.3,5.3.0)", - org.eclipse.jgit.lib;version="[5.2.3,5.3.0)", - org.eclipse.jgit.merge;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", - 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.eclipse.jgit.util.io;version="[5.2.3,5.3.0)", - org.eclipse.jgit.util.time;version="[5.2.3,5.3.0)", +Import-Package: org.eclipse.jgit.annotations;version="[5.3.4,5.4.0)", + org.eclipse.jgit.api;version="[5.3.4,5.4.0)", + org.eclipse.jgit.api.errors;version="[5.3.4,5.4.0)", + org.eclipse.jgit.dircache;version="[5.3.4,5.4.0)", + org.eclipse.jgit.errors;version="[5.3.4,5.4.0)", + org.eclipse.jgit.internal.storage.file;version="[5.3.4,5.4.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.3.4,5.4.0)", + org.eclipse.jgit.lib;version="[5.3.4,5.4.0)", + org.eclipse.jgit.merge;version="[5.3.4,5.4.0)", + org.eclipse.jgit.revwalk;version="[5.3.4,5.4.0)", + org.eclipse.jgit.storage.file;version="[5.3.4,5.4.0)", + org.eclipse.jgit.transport;version="5.3.4", + org.eclipse.jgit.treewalk;version="[5.3.4,5.4.0)", + org.eclipse.jgit.treewalk.filter;version="[5.3.4,5.4.0)", + org.eclipse.jgit.util;version="[5.3.4,5.4.0)", + org.eclipse.jgit.util.io;version="[5.3.4,5.4.0)", + org.eclipse.jgit.util.time;version="[5.3.4,5.4.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", org.junit.runner;version="[4.12,5.0.0)", org.junit.runners.model;version="[4.12,5.0.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.junit;version="5.2.3"; +Export-Package: org.eclipse.jgit.junit;version="5.3.4"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -43,4 +43,4 @@ Export-Package: org.eclipse.jgit.junit;version="5.2.3"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="5.2.3";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="5.3.4";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index e198193f5e..8efe8cb6e0 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.2.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit</artifactId> diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java index 29579d007f..3b7cdde496 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java @@ -401,10 +401,11 @@ public abstract class LocalDiskRepositoryTestCase { * @return the newly created repository, opened for access * @throws IOException * the repository could not be created in the temporary area + * @since 5.3 */ - private FileRepository createRepository(boolean bare) + protected FileRepository createRepository(boolean bare) throws IOException { - return createRepository(bare, true /* auto close */); + return createRepository(bare, false /* auto close */); } /** @@ -414,11 +415,13 @@ public abstract class LocalDiskRepositoryTestCase { * true to create a bare repository; false to make a repository * within its working directory * @param autoClose - * auto close the repository in #tearDown + * auto close the repository in {@link #tearDown()} * @return the newly created repository, opened for access * @throws IOException * the repository could not be created in the temporary area + * @deprecated use {@link #createRepository(boolean)} instead */ + @Deprecated public FileRepository createRepository(boolean bare, boolean autoClose) throws IOException { File gitdir = createUniqueTestGitDir(bare); diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java index 49a2b2010d..02ffe4f409 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -112,7 +112,7 @@ import org.eclipse.jgit.util.FileUtils; * @param <R> * type of Repository the test data is stored on. */ -public class TestRepository<R extends Repository> { +public class TestRepository<R extends Repository> implements AutoCloseable { /** Constant <code>AUTHOR="J. Author"</code> */ public static final String AUTHOR = "J. Author"; @@ -933,6 +933,23 @@ public class TestRepository<R extends Repository> { } } + /** + * Closes the underlying {@link Repository} object and any other internal + * resources. + * <p> + * {@link AutoCloseable} resources that may escape this object, such as + * those returned by the {@link #git} and {@link #getRevWalk()} methods are + * not closed. + */ + @Override + public void close() { + try { + inserter.close(); + } finally { + db.close(); + } + } + private static void prunePacked(ObjectDirectory odb) throws IOException { for (PackFile p : odb.getPacks()) { for (MutableEntry e : p) |