diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
index 3a396aa11..de14282cf 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
@@ -1269,7 +1269,9 @@ public static String shortenRefName(String refName) {
* @param refName
* @return a {@link ReflogReader} for the supplied refname, or null if the
* named ref does not exist.
- * @throws IOException the ref could not be accessed.
+ * @throws IOException
+ * the ref could not be accessed.
+ * @since 3.0
*/
public abstract ReflogReader getReflogReader(String refName)
throws IOException;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java
index 3b64ddd36..c5e615ed8 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java
@@ -76,6 +76,7 @@ public abstract class MergeStrategy {
/**
* Recursive strategy to merge paths. It tries to merge also contents.
* Multiple merge bases are supported
+ * @since 3.0
*/
public static final ThreeWayMergeStrategy RECURSIVE = new StrategyRecursive();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
index 04c29e6e8..134632876 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
@@ -197,6 +197,7 @@ public boolean merge(final AnyObjectId... tips) throws IOException {
* one of the input objects is not a commit.
* @throws IOException
* objects are missing or multiple merge bases were found.
+ * @since 3.0
*/
protected AbstractTreeIterator mergeBase(RevCommit a, RevCommit b)
throws IOException {
@@ -241,6 +242,7 @@ public RevCommit getBaseCommit(final int aIdx, final int bIdx)
* one of the input objects is not a commit.
* @throws IOException
* objects are missing or multiple merge bases were found.
+ * @since 3.0
*/
protected RevCommit getBaseCommit(RevCommit a, RevCommit b)
throws IncorrectObjectTypeException, IOException {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java
index d68be3540..540d6a8c6 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java
@@ -82,9 +82,8 @@
* - uses "Lists" instead of Arrays for chained types
*
* - recursively merges the merge bases together to compute a usable base
- *
+ * @since 3.0
*/
-
public class RecursiveMerger extends ResolveMerger {
static Logger log = Logger.getLogger(RecursiveMerger.class.toString());
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
index 213a1d4da..2ea116079 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -109,6 +109,8 @@ public enum MergeFailureReason {
/**
* string versions of a list of commit SHA1s
+ *
+ * @since 3.0
*/
protected String commitNames[];
@@ -126,6 +128,8 @@ public enum MergeFailureReason {
/**
* merge result as tree
+ *
+ * @since 3.0
*/
protected ObjectId resultTree;
@@ -149,6 +153,7 @@ public enum MergeFailureReason {
* created as temporary files and a new empty, in-memory dircache will be
* used instead the repo's one. Often used for bare repos where the repo
* doesn't even have a workingtree and dircache.
+ * @since 3.0
*/
protected boolean inCore;
@@ -157,22 +162,26 @@ public enum MergeFailureReason {
* repository and should handle locking and unlocking of the dircache. If
* this merger should work in-core or if an explicit dircache was specified
* during construction then this field is set to false.
+ * @since 3.0
*/
protected boolean implicitDirCache;
/**
* Directory cache
+ * @since 3.0
*/
protected DirCache dircache;
/**
* The iterator to access the working tree. If set to null this
* merger will not touch the working tree.
+ * @since 3.0
*/
protected WorkingTreeIterator workingTreeIterator;
/**
* our merge algorithm
+ * @since 3.0
*/
protected MergeAlgorithm mergeAlgorithm;
@@ -893,6 +902,7 @@ public void setWorkingTreeIterator(WorkingTreeIterator workingTreeIterator) {
* @param mergeTree
* @return whether the trees merged cleanly
* @throws IOException
+ * @since 3.0
*/
protected boolean mergeTrees(AbstractTreeIterator baseTree,
RevTree headTree, RevTree mergeTree) throws IOException {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileRepositoryBuilder.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileRepositoryBuilder.java
index 5efa2507a..944fb4f5e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileRepositoryBuilder.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileRepositoryBuilder.java
@@ -104,6 +104,7 @@ public Repository build() throws IOException {
* @throws IOException
* the repository could not be accessed to configure the rest of
* the builder's parameters.
+ * @since 3.0
*/
public static Repository create(File gitDir) throws IOException {
return new FileRepositoryBuilder().setGitDir(gitDir).readEnvironment()
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java
index 50158d880..e16cce0e3 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java
@@ -428,6 +428,7 @@ public List getSortedObjectList(
* {@link #setLockMessage(String)}.
* @throws IOException
* the stream is malformed, or contains corrupt objects.
+ * @since 3.0
*/
public final PackLock parse(ProgressMonitor progress) throws IOException {
return parse(progress, progress);
@@ -446,6 +447,7 @@ public final PackLock parse(ProgressMonitor progress) throws IOException {
* {@link #setLockMessage(String)}.
* @throws IOException
* the stream is malformed, or contains corrupt objects.
+ * @since 3.0
*/
public PackLock parse(ProgressMonitor receiving, ProgressMonitor resolving)
throws IOException {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
index 01bc5b75b..1377a37cd 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
@@ -537,6 +537,7 @@ public void upload(final InputStream input, final OutputStream output,
* @return statistics about pack output, if a pack was sent. Null if no pack
* was sent, such as during the negotation phase of a smart HTTP
* connection, or if the client was already up-to-date.
+ * @since 3.0
*/
public PackWriter.Statistics getPackStatistics() {
return statistics;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPackLoggerChain.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPackLoggerChain.java
index 0facfe0e4..3f14cc6f5 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPackLoggerChain.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPackLoggerChain.java
@@ -78,6 +78,9 @@ else if (i == 1)
return new UploadPackLoggerChain(newLoggers, i);
}
+ /**
+ * @since 3.0
+ */
public void onPackStatistics(PackWriter.Statistics stats) {
for (int i = 0; i < count; i++)
loggers[i].onPackStatistics(stats);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeOptions.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeOptions.java
index 93590fd22..15bfb917d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeOptions.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeOptions.java
@@ -85,7 +85,7 @@ public AutoCRLF getAutoCRLF() {
/**
* @return how stat data is compared
- * @since 2.3
+ * @since 3.0
*/
public CheckStat getCheckStat() {
return checkStat;