diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-03 15:54:54 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-03 15:59:39 +0200 |
| commit | c31879ac4e92110bfaa13285ebd76968d5b30894 (patch) | |
| tree | f504c925ac488ffa08e45bfff3687b4378786142 /org.eclipse.jgit/.settings | |
| parent | 710d00b85e9419c7feaed71a1945351dab486f71 (diff) | |
| parent | 261881055d42b34def764ffb99898665ba0bc6a7 (diff) | |
| download | jgit-stable-5.0.tar.gz jgit-stable-5.0.zip | |
Merge branch 'stable-4.11' into stable-5.0stable-5.0
* stable-4.11:
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: Ifb6a4dbea2f48fd2ffa66eb737d61920aefedfbd
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, 25 insertions, 8 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index af6030dc52..404b45d152 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.0.4"/> - <message_argument value="5.0.0"/> - </message_arguments> - </filter> - </resource> <resource path="src/org/eclipse/jgit/errors/PackInvalidException.java" type="org.eclipse.jgit.errors.PackInvalidException"> <filter id="1142947843"> <message_arguments> @@ -22,6 +14,15 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants"> + <filter id="1141899266"> + <message_arguments> + <message_argument value="4.7"/> + <message_argument value="5.0"/> + <message_argument value="LOCK_SUFFIX"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/lib/GitmoduleEntry.java" type="org.eclipse.jgit.lib.GitmoduleEntry"> <filter id="1109393411"> <message_arguments> @@ -38,6 +39,22 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/lib/ObjectIdSerializer.java" type="org.eclipse.jgit.lib.ObjectIdSerializer"> + <filter id="1141899266"> + <message_arguments> + <message_argument value="4.11"/> + <message_argument value="5.0"/> + <message_argument value="readWithoutMarker(InputStream)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="4.11"/> + <message_argument value="5.0"/> + <message_argument value="writeWithoutMarker(OutputStream, AnyObjectId)"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS"> <filter id="1141899266"> <message_arguments> |