diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-04 00:32:42 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-04 00:49:42 +0200 |
| commit | 4a3cd7f1b7533d9451cd63389c6546ef312292c3 (patch) | |
| tree | f428de4b615745b4b9819733ea1ebe4e081de7eb /org.eclipse.jgit/.settings | |
| parent | 47a95d1aed3a2e696bfa346b9e395d4b4337dbad (diff) | |
| parent | aa62f191d02c19073c22a5e33e4a07c54a67efa7 (diff) | |
| download | jgit-4a3cd7f1b7533d9451cd63389c6546ef312292c3.tar.gz jgit-4a3cd7f1b7533d9451cd63389c6546ef312292c3.zip | |
Merge branch 'stable-5.2' into stable-5.3
* stable-5.2:
Prepare 5.1.12-SNAPSHOT builds
JGit v5.1.11.201909031202-r
Prepare 4.11.10-SNAPSHOT builds
JGit v4.11.9.201909030838-r
Bazel: Update bazlets to the latest master revision
Bazel: Remove FileTreeIteratorWithTimeControl from BUILD file
BatchRefUpdate: repro racy atomic update, and fix it
Delete unused FileTreeIteratorWithTimeControl
Fix RacyGitTests#testRacyGitDetection
Change RacyGitTests to create a racy git situation in a stable way
Silence API warnings
Change-Id: I7e88c7c7d202f1e3fb8e143277650aa5fefff439
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 | 102 |
1 files changed, 88 insertions, 14 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 33630a812b..14856a2c8c 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,19 +1,5 @@ <?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="5.3.4"/> - <message_argument value="5.3.0"/> - </message_arguments> - </filter> - <filter id="924844039"> - <message_arguments> - <message_argument value="5.3.5"/> - <message_argument value="5.3.0"/> - </message_arguments> - </filter> - </resource> <resource path="src/org/eclipse/jgit/dircache/DirCacheEntry.java" type="org.eclipse.jgit.dircache.DirCacheEntry"> <filter id="1142947843"> <message_arguments> @@ -68,6 +54,36 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/lib/ObjectIdRef.java" type="org.eclipse.jgit.lib.ObjectIdRef"> + <filter 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 id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lib.RefDatabase"/> + <message_argument value="exactRef(String)"/> + </message_arguments> + </filter> + <filter id="421654647"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lib.RefDatabase"/> + <message_argument value="getRef(String)"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/storage/pack/PackConfig.java" type="org.eclipse.jgit.storage.pack.PackConfig"> <filter id="336658481"> <message_arguments> @@ -124,6 +140,58 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/transport/BaseReceivePack.java" type="org.eclipse.jgit.transport.BaseReceivePack"> + <filter id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.transport.BaseReceivePack"/> + <message_argument value="getAdvertisedRefs()"/> + </message_arguments> + </filter> + <filter id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.transport.BaseReceivePack"/> + <message_argument value="getPushCertificate()"/> + </message_arguments> + </filter> + <filter id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.transport.BaseReceivePack"/> + <message_argument value="getRepository()"/> + </message_arguments> + </filter> + <filter id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.transport.BaseReceivePack"/> + <message_argument value="getRevWalk()"/> + </message_arguments> + </filter> + <filter id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.transport.BaseReceivePack"/> + <message_argument value="setAdvertisedRefs(Map<String,Ref>, Set<ObjectId>)"/> + </message_arguments> + </filter> + <filter id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.transport.BaseReceivePack"/> + <message_argument value="setPushCertificate(PushCertificate)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/transport/TransferConfig.java" type="org.eclipse.jgit.transport.TransferConfig"> + <filter id="1159725059"> + <message_arguments> + <message_argument value="5.1.4"/> + <message_argument value="TransferConfig(Config)"/> + </message_arguments> + </filter> + <filter id="1159725059"> + <message_arguments> + <message_argument value="5.1.4"/> + <message_argument value="TransferConfig(Repository)"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java" type="org.eclipse.jgit.treewalk.WorkingTreeIterator"> <filter id="1142947843"> <message_arguments> @@ -149,6 +217,12 @@ <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS"> <filter id="1142947843"> <message_arguments> + <message_argument value="4.5.6"/> + <message_argument value="fileAttributes(File)"/> + </message_arguments> + </filter> + <filter id="1142947843"> + <message_arguments> <message_argument value="5.1.9"/> <message_argument value="getFileStoreAttributes(Path)"/> </message_arguments> |