diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2017-11-22 23:25:49 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2017-11-22 23:30:13 +0100 |
| commit | 4ac790fda856296128f475558493c2db4c6d6bda (patch) | |
| tree | 333d6e94527662debab47826076548f2002d7ca1 /org.eclipse.jgit/.settings | |
| parent | 758a181b8209e9daf19105a87a46cbfc93bc15d7 (diff) | |
| parent | 5f79ef0ba495dbcf03eb4923ae7ce039fc8ab4ec (diff) | |
| download | jgit-4ac790fda856296128f475558493c2db4c6d6bda.tar.gz jgit-4ac790fda856296128f475558493c2db4c6d6bda.zip | |
Merge branch 'stable-4.7' into stable-4.8
* stable-4.7:
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: Iaa99ec84594baf733c993c2d6768281ff14f545a
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 | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 671988c457..8a24587e27 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,26 +1,41 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.jgit" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="924844039"> + <message_arguments> + <message_argument value="4.8.1"/> + <message_argument value="4.8.0"/> + </message_arguments> + </filter> + </resource> <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.lib.ConfigConstants"/> + <message_argument value="CONFIG_KEY_SUPPORTSATOMICFILECREATION"/> + </message_arguments> + </filter> <filter id="1141899266"> <message_arguments> - <message_argument value="4.7"/> + <message_argument value="4.5"/> <message_argument value="4.8"/> - <message_argument value="CONFIG_KEY_AUTODETACH"/> + <message_argument value="CONFIG_KEY_SUPPORTSATOMICFILECREATION"/> </message_arguments> </filter> + </resource> + <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS"> <filter id="1141899266"> <message_arguments> - <message_argument value="4.7"/> + <message_argument value="4.5"/> <message_argument value="4.8"/> - <message_argument value="CONFIG_KEY_LOGEXPIRY"/> + <message_argument value="createNewFile(File)"/> </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"> + <filter id="1141899266"> <message_arguments> - <message_argument value="org.eclipse.jgit.merge.MergeStrategy"/> - <message_argument value="newMerger(ObjectInserter, Config)"/> + <message_argument value="4.5"/> + <message_argument value="4.8"/> + <message_argument value="supportsAtomicCreateNewFile()"/> </message_arguments> </filter> </resource> |