summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/.settings
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2019-03-13 17:47:08 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2019-03-13 17:49:42 +0100
commite53b98ba2f561768eb82d23d78b2227e0df2b6eb (patch)
treefd132bb80fc87b9d4d79e3540f94810ba02fe9ac /org.eclipse.jgit/.settings
parent51f2979f13e0baf8ab58518a5d998a21cac55a8a (diff)
parent4ade2de34f8256018cc1b574b1d28ad2abae8771 (diff)
downloadjgit-e53b98ba2f561768eb82d23d78b2227e0df2b6eb.tar.gz
jgit-e53b98ba2f561768eb82d23d78b2227e0df2b6eb.zip
Merge branch 'stable-5.3'
* stable-5.3: Prepare 5.3.1-SNAPSHOT builds JGit v5.3.0.201903130848-r Prepare 5.1.7-SNAPSHOT builds JGit v5.1.6.201903130242-r Prepare 4.11.8-SNAPSHOT builds JGit v4.11.7.201903122105-r Prepare 4.9.10-SNAPSHOT builds JGit v4.9.9.201903122025-r Prepare 4.7.9-SNAPSHOT builds JGit v4.7.8.201903121755-r Prepare 4.5.7-SNAPSHOT builds JGit v4.5.6.201903121547-r Check for packfile validity and fd before reading Move throw of PackInvalidException outside the catch Use FileSnapshot to get lastModified on PackFile Include size when comparing FileSnapshot Do not reuse packfiles when changed on filesystem Silence API warnings for new API introduced for fixes Change-Id: Ief9f6a9e89c4a1ef122daedbfd933676393fab06 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/.settings')
-rw-r--r--org.eclipse.jgit/.settings/.api_filters82
1 files changed, 4 insertions, 78 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index ac2d094327..433175b980 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -1,84 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jgit" version="2">
- <resource path="src/org/eclipse/jgit/lib/ObjectIdRef.java" type="org.eclipse.jgit.lib.ObjectIdRef">
- <filter comment="removing protected constructor breaks implementers which is ok in a minor release following OSGi semantic versioning" id="338722907">
+ <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS">
+ <filter id="1142947843">
<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 comment="class is extended by extenders but not clients of the API" 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/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&lt;String,Ref&gt;, Set&lt;ObjectId&gt;)"/>
- </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_argument value="4.5.6"/>
+ <message_argument value="fileAttributes(File)"/>
</message_arguments>
</filter>
</resource>