diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2017-11-22 23:06:50 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2017-11-22 23:07:01 +0100 |
| commit | 5f79ef0ba495dbcf03eb4923ae7ce039fc8ab4ec (patch) | |
| tree | 360ab0538388336bc59e30f276590eb9693edfc9 /org.eclipse.jgit/.settings | |
| parent | 53becf1f59437c3295622c7203db470afad5b8d4 (diff) | |
| parent | 182d3b3dadeb729ac3c5a7c1b653f30506f38d8e (diff) | |
| download | jgit-5f79ef0ba495dbcf03eb4923ae7ce039fc8ab4ec.tar.gz jgit-5f79ef0ba495dbcf03eb4923ae7ce039fc8ab4ec.zip | |
Merge branch 'stable-4.6' into stable-4.7
* stable-4.6:
Silence boxing warning
Prepare 4.5.5-SNAPSHOT builds
JGit v4.5.4.201711221230-r
Fix LockFile semantics when running on NFS
Honor trustFolderStats also when reading packed-refs
Prepare 4.5.4-SNAPSHOT builds
JGit v4.5.3.201708160445-r
Change-Id: I8f6bc09540727c6273d22775a9f9ca382a729c9b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/.settings')
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 52 |
1 files changed, 22 insertions, 30 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 822f1215d5..c68b9a0935 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -3,59 +3,51 @@ <resource path="META-INF/MANIFEST.MF"> <filter id="924844039"> <message_arguments> - <message_argument value="4.7.1"/> + <message_argument value="4.7.2"/> <message_argument value="4.7.0"/> </message_arguments> </filter> </resource> - <resource path="src/org/eclipse/jgit/api/ArchiveCommand.java" type="org.eclipse.jgit.api.ArchiveCommand$Format"> - <filter comment="OSGi semver allows to break implementors in minor releases" id="403804204"> + <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants"> + <filter id="336658481"> <message_arguments> - <message_argument value="org.eclipse.jgit.api.ArchiveCommand.Format"/> - <message_argument value="putEntry(T, ObjectId, String, FileMode, ObjectLoader)"/> + <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/> + <message_argument value="CONFIG_KEY_AUTODETACH"/> </message_arguments> </filter> - </resource> - <resource path="src/org/eclipse/jgit/errors/NoPackSignatureException.java" type="org.eclipse.jgit.errors.NoPackSignatureException"> - <filter comment="non-breaking addition of exception classes needed to cleanly fix error handling in PackFile" id="1108344834"> + <filter id="336658481"> <message_arguments> - <message_argument value="4.5"/> - <message_argument value="4.7"/> - <message_argument value="org.eclipse.jgit.errors.NoPackSignatureException"/> + <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/> + <message_argument value="CONFIG_KEY_LOGEXPIRY"/> </message_arguments> </filter> - </resource> - <resource path="src/org/eclipse/jgit/errors/UnsupportedPackIndexVersionException.java" type="org.eclipse.jgit.errors.UnsupportedPackIndexVersionException"> - <filter comment="non-breaking addition of exception classes needed to cleanly fix error handling in PackFile" id="1108344834"> + <filter id="336658481"> <message_arguments> - <message_argument value="4.5"/> - <message_argument value="4.7"/> - <message_argument value="org.eclipse.jgit.errors.UnsupportedPackIndexVersionException"/> + <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/> + <message_argument value="CONFIG_KEY_SUPPORTSATOMICFILECREATION"/> </message_arguments> </filter> - </resource> - <resource path="src/org/eclipse/jgit/errors/UnsupportedPackVersionException.java" type="org.eclipse.jgit.errors.UnsupportedPackVersionException"> - <filter comment="non-breaking addition of exception classes needed to cleanly fix error handling in PackFile" id="1108344834"> + <filter id="1141899266"> <message_arguments> <message_argument value="4.5"/> <message_argument value="4.7"/> - <message_argument value="org.eclipse.jgit.errors.UnsupportedPackVersionException"/> + <message_argument value="CONFIG_KEY_SUPPORTSATOMICFILECREATION"/> </message_arguments> </filter> </resource> - <resource path="src/org/eclipse/jgit/lib/ObjectInserter.java" type="org.eclipse.jgit.lib.ObjectInserter"> - <filter comment="changed return type of digest() breaking implementors which is ok in minor releases according to OSGi semantic versioning" id="338792546"> + <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS"> + <filter id="1141899266"> <message_arguments> - <message_argument value="org.eclipse.jgit.lib.ObjectInserter"/> - <message_argument value="digest()"/> + <message_argument value="4.5"/> + <message_argument value="4.7"/> + <message_argument value="createNewFile(File)"/> </message_arguments> </filter> - </resource> - <resource path="src/org/eclipse/jgit/transport/http/HttpConnection.java" type="org.eclipse.jgit.transport.http.HttpConnection"> - <filter comment="OSGi semantic versioning rules allow to break implementors in minor releases" id="403767336"> + <filter id="1141899266"> <message_arguments> - <message_argument value="org.eclipse.jgit.transport.http.HttpConnection"/> - <message_argument value="HTTP_MOVED_PERM"/> + <message_argument value="4.5"/> + <message_argument value="4.7"/> + <message_argument value="supportsAtomicCreateNewFile()"/> </message_arguments> </filter> </resource> |