Fix API errors caused by 23a71696cd

- add missing @since 6.3 for new protected field workTreeUpdater and new
  class WorkTreeUpdater
- suppress API errors caused by removing/adding protected fields and
  methods

We follow OSGi semantic versioning which allows breaking implementers in
minor versions which are e.g. subclassing a public class.

Change-Id: I28f0d7b4fdd9a1f0fbc6b137d6c68dda9fe3c11e

diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index 1c283e7613648178e4a47d800516137f3341d41e..b517849555bbc46ba13660b9c7f0c1daebb56e6c 100644 (file)
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -24,22 +24,52 @@
         </filter>
     </resource>
     <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger">
-        <filter id="338792546">
+        <filter id="336658481">
+            <message_arguments>
+                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
+                <message_argument value="workTreeUpdater"/>
+            </message_arguments>
+        </filter>
+        <filter id="338755678">
+            <message_arguments>
+                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
+                <message_argument value="builder"/>
+            </message_arguments>
+        </filter>
+        <filter id="338755678">
+            <message_arguments>
+                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
+                <message_argument value="implicitDirCache"/>
+            </message_arguments>
+        </filter>
+        <filter id="338755678">
+            <message_arguments>
+                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
+                <message_argument value="toBeCheckedOut"/>
+            </message_arguments>
+        </filter>
+        <filter id="338755678">
+            <message_arguments>
+                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
+                <message_argument value="toBeDeleted"/>
+            </message_arguments>
+        </filter>
+        <filter id="338755678">
             <message_arguments>
                 <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
-                <message_argument value="addCheckoutMetadata(String, Attributes)"/>
+                <message_argument value="workingTreeOptions"/>
             </message_arguments>
         </filter>
         <filter id="338792546">
             <message_arguments>
                 <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
-                <message_argument value="addToCheckout(String, DirCacheEntry, Attributes)"/>
+                <message_argument value="addCheckoutMetadata(Map&lt;String,DirCacheCheckout.CheckoutMetadata&gt;, String, Attributes)"/>
             </message_arguments>
         </filter>
         <filter id="338792546">
             <message_arguments>
                 <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
-                <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean, Attributes)"/>
+                <message_argument value="cleanUp()"/>
             </message_arguments>
         </filter>
     </resource>

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 949ab5f449a156484892b686c75316f5e7aafab0..ab82dd0c30c3460d8a8321612cb6692d5249b678 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -133,6 +133,8 @@ public class ResolveMerger extends ThreeWayMerger {
 
        /**
         * Handler for repository I/O actions.
+        *
+        * @since 6.3
         */
        protected WorkTreeUpdater workTreeUpdater;
 

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java
index f3531a6d1fca14b7aef271d76569a5a23e9ba8af..fb0b33a042e997437ad63c712d24a0a17f13a6ae 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java
@@ -58,8 +58,11 @@ import org.eclipse.jgit.util.io.EolStreamTypeUtil;
 /**
  * Handles work tree updates on both the checkout and the index.
  * <p>
- * You should use a single instance for all of your file changes. In case of an error, make sure
- * your instance is released, and initiate a new one if necessary.
+ * You should use a single instance for all of your file changes. In case of an
+ * error, make sure your instance is released, and initiate a new one if
+ * necessary.
+ *
+ * @since 6.3
  */
 public class WorkTreeUpdater implements Closeable {