diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-03 23:41:03 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-04 00:08:21 +0200 |
| commit | aa62f191d02c19073c22a5e33e4a07c54a67efa7 (patch) | |
| tree | e3ca1dce3fc78830075f84a90b0a12b338cb8416 /org.eclipse.jgit/.settings | |
| parent | 60283a58a79578a41ba31d2f57ac2ef7cf2e1521 (diff) | |
| parent | c8e42ca3ba646afe35e635eb0ebac6c76ddca6cd (diff) | |
| download | jgit-aa62f191d02c19073c22a5e33e4a07c54a67efa7.tar.gz jgit-aa62f191d02c19073c22a5e33e4a07c54a67efa7.zip | |
Merge branch 'stable-5.1' into stable-5.2
* stable-5.1:
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: Iac5dc9683cea97db04d20f27c10f2e103d3ae7b5
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 | 82 |
1 files changed, 74 insertions, 8 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index cbb9de113d..857fcac17d 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,13 +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.2.3"/> - <message_argument value="5.2.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> @@ -42,6 +34,28 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/gitrepo/RepoCommand.java" type="org.eclipse.jgit.gitrepo.RepoCommand$DefaultRemoteReader"> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.gitrepo.RepoCommand.DefaultRemoteReader"/> + <message_argument value="readFile(String, String, String)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.gitrepo.RepoCommand.DefaultRemoteReader"/> + <message_argument value="readFileFromRepo(Repository, String, String)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/gitrepo/RepoCommand.java" type="org.eclipse.jgit.gitrepo.RepoCommand$RemoteReader"> + <filter id="403804204"> + <message_arguments> + <message_argument value="org.eclipse.jgit.gitrepo.RepoCommand.RemoteReader"/> + <message_argument value="readFileWithMode(String, String, String)"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants"> <filter id="1142947843"> <message_arguments> @@ -62,6 +76,42 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/lib/GitmoduleEntry.java" type="org.eclipse.jgit.lib.GitmoduleEntry"> + <filter id="1109393411"> + <message_arguments> + <message_argument value="4.7.5"/> + <message_argument value="org.eclipse.jgit.lib.GitmoduleEntry"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/lib/ObjectChecker.java" type="org.eclipse.jgit.lib.ObjectChecker"> + <filter id="1142947843"> + <message_arguments> + <message_argument value="4.7.5"/> + <message_argument value="getGitsubmodules()"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/revwalk/DepthWalk.java" type="org.eclipse.jgit.revwalk.DepthWalk"> + <filter id="403804204"> + <message_arguments> + <message_argument value="org.eclipse.jgit.revwalk.DepthWalk"/> + <message_argument value="getDeepenNotFlag()"/> + </message_arguments> + </filter> + <filter id="404000815"> + <message_arguments> + <message_argument value="org.eclipse.jgit.revwalk.DepthWalk"/> + <message_argument value="getDeepenNots()"/> + </message_arguments> + </filter> + <filter id="404000815"> + <message_arguments> + <message_argument value="org.eclipse.jgit.revwalk.DepthWalk"/> + <message_argument value="getDeepenSince()"/> + </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> @@ -118,6 +168,14 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/transport/RemoteSession.java" type="org.eclipse.jgit.transport.RemoteSession"> + <filter id="404000815"> + <message_arguments> + <message_argument value="org.eclipse.jgit.transport.RemoteSession"/> + <message_argument value="getFtpChannel()"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/transport/TransferConfig.java" type="org.eclipse.jgit.transport.TransferConfig"> <filter id="1159725059"> <message_arguments> @@ -132,6 +190,14 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/transport/http/HttpConnection.java" type="org.eclipse.jgit.transport.http.HttpConnection"> + <filter id="403804204"> + <message_arguments> + <message_argument value="org.eclipse.jgit.transport.http.HttpConnection"/> + <message_argument value="getHeaderFields(String)"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java" type="org.eclipse.jgit.treewalk.WorkingTreeIterator"> <filter id="1142947843"> <message_arguments> |