summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2018-12-28 03:18:58 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2018-12-29 00:17:33 +0100
commit7b989eed722a23b341c7cf75cd817ce514bce08f (patch)
tree46f0d576c1672c0a034d744da347fbd7fc91f08c
parent2f9ebeacc8a73444976e1ba888dd83801e6b6306 (diff)
downloadjgit-7b989eed722a23b341c7cf75cd817ce514bce08f.tar.gz
jgit-7b989eed722a23b341c7cf75cd817ce514bce08f.zip
Suppress API errors and add missing @since tags caused by 6ea888a
Change-Id: Id042d46ba078af35b9c22a079da4ae14fc5fa231 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.jgit/.settings/.api_filters16
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdRef.java4
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/SymbolicRef.java1
3 files changed, 21 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index 1e18de6647..c17bdda254 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -38,6 +38,22 @@
</message_arguments>
</filter>
</resource>
+ <resource path="src/org/eclipse/jgit/lib/ObjectIdRef.java" type="org.eclipse.jgit.lib.ObjectIdRef">
+ <filter comment="removing protected constructor breaks implementers which is ok in a minor release following OSGi semantic versioning" id="338722907">
+ <message_arguments>
+ <message_argument value="org.eclipse.jgit.lib.ObjectIdRef"/>
+ <message_argument value="ObjectIdRef(Ref.Storage, String, ObjectId)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/jgit/lib/Ref.java" type="org.eclipse.jgit.lib.Ref">
+ <filter id="404000815">
+ <message_arguments>
+ <message_argument value="org.eclipse.jgit.lib.Ref"/>
+ <message_argument value="getUpdateIndex()"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/jgit/lib/RefDatabase.java" type="org.eclipse.jgit.lib.RefDatabase">
<filter comment="class is extended by extenders but not clients of the API" id="421650549">
<message_arguments>
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdRef.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdRef.java
index 747318170a..bcda53879a 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdRef.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdRef.java
@@ -82,6 +82,7 @@ public abstract class ObjectIdRef implements Ref {
* a ref that does not exist yet.
* @param updateIndex
* number increasing with each update to the reference.
+ * @since 5.3
*/
public Unpeeled(@NonNull Storage st, @NonNull String name,
@Nullable ObjectId id, long updateIndex) {
@@ -136,6 +137,7 @@ public abstract class ObjectIdRef implements Ref {
* the first non-tag object that tag {@code id} points to.
* @param updateIndex
* number increasing with each update to the reference.
+ * @since 5.3
*/
public PeeledTag(@NonNull Storage st, @NonNull String name,
@Nullable ObjectId id, @NonNull ObjectId p, long updateIndex) {
@@ -185,6 +187,7 @@ public abstract class ObjectIdRef implements Ref {
* a ref that does not exist yet.
* @param updateIndex
* number increasing with each update to the reference.
+ * @since 5.3
*/
public PeeledNonTag(@NonNull Storage st, @NonNull String name,
@Nullable ObjectId id, long updateIndex) {
@@ -224,6 +227,7 @@ public abstract class ObjectIdRef implements Ref {
* @param updateIndex
* number that increases with each ref update. Set to -1 if the
* storage doesn't support versioning.
+ * @since 5.3
*/
protected ObjectIdRef(@NonNull Storage st, @NonNull String name,
@Nullable ObjectId id, long updateIndex) {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/SymbolicRef.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/SymbolicRef.java
index 0e9a23fe15..ee0eb2f6ae 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/SymbolicRef.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/SymbolicRef.java
@@ -83,6 +83,7 @@ public class SymbolicRef implements Ref {
* the ref we reference and derive our value from.
* @param updateIndex
* index that increases with each update of the reference
+ * @since 5.3
*/
public SymbolicRef(@NonNull String refName, @NonNull Ref target,
long updateIndex) {