motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge changes Ia6c3935c,I46a29eae 

* changes:
  Remove unused import introduced in a551b64
  Silence API errors caused by adding enum constants in dbb137e
This commit is contained in:
David Pursehouse 2017-08-02 03:12:16 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 4d1334ce46 ba85764223
commit 9e54cbb693
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_LineMapTest.java
View File

@ -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;

20
org.eclipse.jgit/.settings/.api_filters
View File

@ -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>