diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-04-28 00:21:16 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-04-28 00:30:47 +0200 |
| commit | 32f0963b84b8e40d05f683752d6cec3c94d07279 (patch) | |
| tree | 56ac47686fd6685109bc91363b30b4be56d4958b /org.eclipse.jgit/.settings | |
| parent | c23ccd29b5269e68aa23cbbba30b1b2df521e81f (diff) | |
| parent | a72e0b0188376c72d153d0e6fc784952274870ae (diff) | |
| download | jgit-32f0963b84b8e40d05f683752d6cec3c94d07279.tar.gz jgit-32f0963b84b8e40d05f683752d6cec3c94d07279.zip | |
Merge branch 'stable-5.2' into stable-5.3
* stable-5.2:
Prepare 5.2.3-SNAPSHOT builds
JGit v5.2.2.201904231744-r
Revert 4678f4b and provide another solution for bug 467631
Apache MINA sshd: make sendKexInit() work also for re-keying
Prepare 5.1.8-SNAPSHOT builds
JGit v5.1.7.201904200442-r
ObjectUploadListener: Add callback interface
Prepare 4.11.9-SNAPSHOT builds
JGit v4.11.8.201904181247-r
Prepare 4.9.11-SNAPSHOT builds
JGit v4.9.10.201904181027-r
Prepare 4.7.10-SNAPSHOT builds
JGit v4.7.9.201904161809-r
Prepare 4.5.8-SNAPSHOT builds
JGit v4.5.7.201904151645-r
Remember the cause for invalidating a packfile
Fix API problem filters
Fix pack files scan when filesnapshot isn't modified
Change-Id: Ie7e572ac7e346f21fe0c387d7448be168a9c127a
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 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index e90d41bfa8..771bdbb2f0 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -3,16 +3,22 @@ <resource path="META-INF/MANIFEST.MF"> <filter id="924844039"> <message_arguments> - <message_argument value="5.3.0"/> + <message_argument value="5.3.1"/> <message_argument value="5.3.0"/> </message_arguments> </filter> </resource> - <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS"> + <resource path="src/org/eclipse/jgit/errors/PackInvalidException.java" type="org.eclipse.jgit.errors.PackInvalidException"> + <filter id="1142947843"> + <message_arguments> + <message_argument value="4.5.7"/> + <message_argument value="PackInvalidException(File, Throwable)"/> + </message_arguments> + </filter> <filter id="1142947843"> <message_arguments> - <message_argument value="4.5.6"/> - <message_argument value="fileAttributes(File)"/> + <message_argument value="4.5.7"/> + <message_argument value="PackInvalidException(String, Throwable)"/> </message_arguments> </filter> </resource> |