aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/.settings
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2018-09-12 14:50:44 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2018-09-12 14:54:49 +0200
commitcdeecbd21f12c59c111ca59731795b4ccc20c8fa (patch)
treeb09bd6f46e52558a7c9d8b24f85fe8a2cc57bb1c /org.eclipse.jgit/.settings
parentf19625a1b8305c7762b57def535478f56975554f (diff)
parent7b365b2faa1c1568216040b6e3412c6bc1372e54 (diff)
downloadjgit-cdeecbd21f12c59c111ca59731795b4ccc20c8fa.tar.gz
jgit-cdeecbd21f12c59c111ca59731795b4ccc20c8fa.zip
Merge branch 'stable-5.1'
* stable-5.1: Fix NoSuchFileException during directory cleanup in RefDirectory Update japicmp to 0.13.0 Prepare 5.1.1-SNAPSHOT builds JGit v5.1.0.201809111528-r Externalize warning message in RefDirectory.delete() Suppress warning for trying to delete non-empty directory Fix replacement quoting for replaceAll in filter command Prepare 4.11.3-SNAPSHOT builds JGit v4.11.2.201809100523-r Change-Id: Ia27fec6dabf87db26e2fd29c17570932649e234a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/.settings')
-rw-r--r--org.eclipse.jgit/.settings/.api_filters12
1 files changed, 2 insertions, 10 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index 08fa8b3b59..e5f0e2aaf1 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -1,18 +1,10 @@
<?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.1.0"/>
- <message_argument value="5.1.0"/>
- </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="5.1"/>
+ <message_argument value="5.2"/>
<message_argument value="createNewFileAtomic(File)"/>
</message_arguments>
</filter>
@@ -21,7 +13,7 @@
<filter id="1141899266">
<message_arguments>
<message_argument value="4.7"/>
- <message_argument value="5.1"/>
+ <message_argument value="5.2"/>
<message_argument value="LockToken"/>
</message_arguments>
</filter>