commit 9e54cbb6934893765f736cec09b7b8307aee66ab
author David Pursehouse <david.pursehouse@gmail.com> Wed Aug 02 03:12:16 2017 -0400
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Wed Aug 02 03:12:16 2017 -0400
tree fdf558ac044b0ef3d1b814f8b79a2193a5e2b33d
parent 4d1334ce46bdd9559977f5f89277a7f240e713f6
parent ba85764223a6efbbca1a81879495b9e5fa803e80

Merge changes Ia6c3935c,I46a29eae

* changes:
  Remove unused import introduced in a551b64
  Silence API errors caused by adding enum constants in dbb137e

org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_LineMapTest.java

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_LineMapTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_LineMapTest.java
index 2e9cbb5..6efdce6 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_LineMapTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_LineMapTest.java
@@ -44,7 +44,6 @@
 package org.eclipse.jgit.util;
 
 import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.UnsupportedEncodingException;

org.eclipse.jgit/.settings/.api_filters

diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index da7c122..83da4c5 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -16,6 +16,26 @@
             </message_arguments>
         </filter>
     </resource>
+    <resource path="src/org/eclipse/jgit/lib/ReflogEntry.java" type="org.eclipse.jgit.lib.ReflogEntry">
+        <filter comment="adding enum constant does not break binary compatibility" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.jgit.lib.ReflogEntry"/>
+                <message_argument value="PREFIX_CREATED"/>
+            </message_arguments>
+        </filter>
+        <filter comment="adding enum constant does not break binary compatibility" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.jgit.lib.ReflogEntry"/>
+                <message_argument value="PREFIX_FAST_FORWARD"/>
+            </message_arguments>
+        </filter>
+        <filter comment="adding enum constant does not break binary compatibility" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.jgit.lib.ReflogEntry"/>
+                <message_argument value="PREFIX_FORCED_UPDATE"/>
+            </message_arguments>
+        </filter>
+    </resource>
     <resource path="src/org/eclipse/jgit/merge/MergeStrategy.java" type="org.eclipse.jgit.merge.MergeStrategy">
         <filter comment="OSGi semantic versioning allows breaking implementors of an API in a minor version" id="336695337">
             <message_arguments>