diff options
Diffstat (limited to 'org.eclipse.jgit.junit')
6 files changed, 33 insertions, 33 deletions
diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index a266d73392..da6c40947f 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -2,30 +2,31 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[2.4.0,2.5.0)", - org.eclipse.jgit.api.errors;version="[2.4.0,2.5.0)", - org.eclipse.jgit.diff;version="[2.4.0,2.5.0)", - org.eclipse.jgit.dircache;version="[2.4.0,2.5.0)", - org.eclipse.jgit.errors;version="[2.4.0,2.5.0)", - org.eclipse.jgit.fnmatch;version="[2.4.0,2.5.0)", - org.eclipse.jgit.lib;version="[2.4.0,2.5.0)", - org.eclipse.jgit.merge;version="[2.4.0,2.5.0)", - org.eclipse.jgit.patch;version="[2.4.0,2.5.0)", - org.eclipse.jgit.revplot;version="[2.4.0,2.5.0)", - org.eclipse.jgit.revwalk;version="[2.4.0,2.5.0)", - org.eclipse.jgit.revwalk.filter;version="[2.4.0,2.5.0)", - org.eclipse.jgit.storage.file;version="[2.4.0,2.5.0)", - org.eclipse.jgit.storage.pack;version="[2.4.0,2.5.0)", - org.eclipse.jgit.transport;version="[2.4.0,2.5.0)", - org.eclipse.jgit.treewalk;version="[2.4.0,2.5.0)", - org.eclipse.jgit.treewalk.filter;version="[2.4.0,2.5.0)", - org.eclipse.jgit.util;version="[2.4.0,2.5.0)", - org.eclipse.jgit.util.io;version="[2.4.0,2.5.0)", +Import-Package: org.eclipse.jgit.api;version="[3.0.0,3.1.0)", + org.eclipse.jgit.api.errors;version="[3.0.0,3.1.0)", + org.eclipse.jgit.diff;version="[3.0.0,3.1.0)", + org.eclipse.jgit.dircache;version="[3.0.0,3.1.0)", + org.eclipse.jgit.errors;version="[3.0.0,3.1.0)", + org.eclipse.jgit.fnmatch;version="[3.0.0,3.1.0)", + org.eclipse.jgit.storage.file;version="[3.0.0,3.1.0)", + org.eclipse.jgit.internal.storage.file;version="[3.0.0,3.1.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.0.0,3.1.0)", + org.eclipse.jgit.lib;version="[3.0.0,3.1.0)", + org.eclipse.jgit.merge;version="[3.0.0,3.1.0)", + org.eclipse.jgit.patch;version="[3.0.0,3.1.0)", + org.eclipse.jgit.revplot;version="[3.0.0,3.1.0)", + org.eclipse.jgit.revwalk;version="[3.0.0,3.1.0)", + org.eclipse.jgit.revwalk.filter;version="[3.0.0,3.1.0)", + org.eclipse.jgit.transport;version="[3.0.0,3.1.0)", + org.eclipse.jgit.treewalk;version="[3.0.0,3.1.0)", + org.eclipse.jgit.treewalk.filter;version="[3.0.0,3.1.0)", + org.eclipse.jgit.util;version="[3.0.0,3.1.0)", + org.eclipse.jgit.util.io;version="[3.0.0,3.1.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="2.4.0" +Export-Package: org.eclipse.jgit.junit;version="3.0.0" Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index b043949721..bb6b4ced85 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>2.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit</artifactId> diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/JGitTestUtil.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/JGitTestUtil.java index 4bf597a807..a20e21cb04 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/JGitTestUtil.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/JGitTestUtil.java @@ -54,7 +54,7 @@ import java.lang.reflect.Method; import java.net.URISyntaxException; import java.net.URL; -import org.eclipse.jgit.storage.file.FileRepository; +import org.eclipse.jgit.internal.storage.file.FileRepository; import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.IO; import org.eclipse.jgit.util.RawParseUtils; 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 1614c379e7..565f934f3c 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 @@ -58,13 +58,12 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; +import org.eclipse.jgit.internal.storage.file.FileRepository; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RepositoryCache; import org.eclipse.jgit.storage.file.FileBasedConfig; -import org.eclipse.jgit.storage.file.FileRepository; -import org.eclipse.jgit.storage.file.WindowCache; import org.eclipse.jgit.storage.file.WindowCacheConfig; import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FileUtils; @@ -150,7 +149,7 @@ public abstract class LocalDiskRepositoryTestCase { c.setPackedGitWindowSize(8 * WindowCacheConfig.KB); c.setPackedGitMMAP(useMMAP); c.setDeltaBaseCacheLimit(8 * WindowCacheConfig.KB); - WindowCache.reconfigure(c); + c.install(); } diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java index 067f128d2a..9b9fc14f42 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java @@ -64,6 +64,7 @@ import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheBuilder; import org.eclipse.jgit.dircache.DirCacheCheckout; import org.eclipse.jgit.dircache.DirCacheEntry; +import org.eclipse.jgit.internal.storage.file.FileRepository; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; @@ -72,7 +73,6 @@ import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.storage.file.FileRepository; import org.eclipse.jgit.treewalk.FileTreeIterator; import org.eclipse.jgit.util.FileUtils; import org.junit.Before; 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 2f5bcda49d..b30fa59bd8 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 @@ -68,6 +68,12 @@ import org.eclipse.jgit.dircache.DirCacheEntry; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.ObjectWritingException; +import org.eclipse.jgit.internal.storage.file.FileRepository; +import org.eclipse.jgit.internal.storage.file.LockFile; +import org.eclipse.jgit.internal.storage.file.ObjectDirectory; +import org.eclipse.jgit.internal.storage.file.PackFile; +import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; +import org.eclipse.jgit.internal.storage.pack.PackWriter; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; @@ -88,12 +94,6 @@ import org.eclipse.jgit.revwalk.RevObject; import org.eclipse.jgit.revwalk.RevTag; import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.storage.file.FileRepository; -import org.eclipse.jgit.storage.file.LockFile; -import org.eclipse.jgit.storage.file.ObjectDirectory; -import org.eclipse.jgit.storage.file.PackFile; -import org.eclipse.jgit.storage.file.PackIndex.MutableEntry; -import org.eclipse.jgit.storage.pack.PackWriter; import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.treewalk.filter.PathFilterGroup; import org.eclipse.jgit.util.FileUtils; |