From: Matthias Sohn <matthias.sohn@sap.com>
Date: Mon, 24 Dec 2018 12:25:31 +0000 (+0100)
Subject: Merge branch 'stable-4.6' into stable-4.7
X-Git-Tag: v4.7.7.201812240805-r~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=193a164925e968c625098c6b79bed84d8da91b5c;p=jgit.git

Merge branch 'stable-4.6' into stable-4.7

* stable-4.6:
  Fix feature versions imported by feature org.eclipse.jgit.pgm
  Prepare 4.5.6-SNAPSHOT builds
  JGit v4.5.5.201812240535-r
  Call AdvertiseRefsHook before validating wants

Change-Id: If637694f80dbd1e774d60c672fe78a6500650bb8
Signed-off-by: Jonathan Nieder <jrn@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---

193a164925e968c625098c6b79bed84d8da91b5c
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
index 1e5fbc1818,2c91754a30..20bd74115a
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
@@@ -31,8 -31,8 +31,8 @@@
           version="0.0.0"/>
  
     <requires>
-       <import feature="org.eclipse.jgit" version="4.7.1" match="equivalent"/>
-       <import feature="org.eclipse.jgit.lfs" version="4.7.1" match="equivalent"/>
 -      <import feature="org.eclipse.jgit" version="4.6.2" match="equivalent"/>
 -      <import feature="org.eclipse.jgit.lfs" version="4.6.2" match="equivalent"/>
++      <import feature="org.eclipse.jgit" version="4.7.7" match="equivalent"/>
++      <import feature="org.eclipse.jgit.lfs" version="4.7.7" match="equivalent"/>
     </requires>
  
     <plugin