Browse Source

Suppress the API errors introduced by 3e9a5f99

I1ce92869435d5eebb7d671be44561e69c6233134 merged BaseReceivePack into
ReceivePack which breaks API but is only affecting the few jgit based
servers out in the wild.

Change-Id: Iad856a2afaf3cad95d01ad81a0116cebcd9de2d9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
next
Matthias Sohn 5 years ago
parent
commit
63fc6970cc
  1. 59
      org.eclipse.jgit/.settings/.api_filters
  2. 1
      org.eclipse.jgit/src/org/eclipse/jgit/transport/AdvertiseRefsHook.java
  3. 2
      org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceiveCommand.java
  4. 2
      org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java

59
org.eclipse.jgit/.settings/.api_filters

@ -1,5 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jgit" version="2">
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.jgit.transport.BaseReceivePack">
<filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="305324134">
<message_arguments>
<message_argument value="org.eclipse.jgit.transport.BaseReceivePack"/>
<message_argument value="org.eclipse.jgit_5.6.0"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/lib/Config.java" type="org.eclipse.jgit.lib.Config">
<filter id="1142947843">
<message_arguments>
@ -30,6 +38,57 @@
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/transport/AbstractAdvertiseRefsHook.java" type="org.eclipse.jgit.transport.AbstractAdvertiseRefsHook">
<filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.jgit.transport.AbstractAdvertiseRefsHook"/>
<message_argument value="advertiseRefs(BaseReceivePack)"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/transport/AdvertiseRefsHook.java" type="org.eclipse.jgit.transport.AdvertiseRefsHook">
<filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="403804204">
<message_arguments>
<message_argument value="org.eclipse.jgit.transport.AdvertiseRefsHook"/>
<message_argument value="advertiseRefs(ReceivePack)"/>
</message_arguments>
</filter>
<filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="405901410">
<message_arguments>
<message_argument value="org.eclipse.jgit.transport.AdvertiseRefsHook"/>
<message_argument value="advertiseRefs(BaseReceivePack)"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/transport/AdvertiseRefsHookChain.java" type="org.eclipse.jgit.transport.AdvertiseRefsHookChain">
<filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.jgit.transport.AdvertiseRefsHookChain"/>
<message_argument value="advertiseRefs(BaseReceivePack)"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/transport/ReceiveCommand.java" type="org.eclipse.jgit.transport.ReceiveCommand">
<filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.jgit.transport.ReceiveCommand"/>
<message_argument value="execute(BaseReceivePack)"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/transport/ReceivePack.java" type="org.eclipse.jgit.transport.ReceivePack">
<filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.jgit.transport.ReceivePack"/>
<message_argument value="getLockMessageProcessName()"/>
</message_arguments>
</filter>
<filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="338849923">
<message_arguments>
<message_argument value="org.eclipse.jgit.transport.ReceivePack"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/util/SystemReader.java" type="org.eclipse.jgit.util.SystemReader">
<filter id="336695337">
<message_arguments>

1
org.eclipse.jgit/src/org/eclipse/jgit/transport/AdvertiseRefsHook.java

@ -89,6 +89,7 @@ public interface AdvertiseRefsHook {
* if necessary.
* @throws org.eclipse.jgit.transport.ServiceMayNotContinueException
* abort; the message will be sent to the user.
* @since 5.6
*/
void advertiseRefs(ReceivePack receivePack)
throws ServiceMayNotContinueException;

2
org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceiveCommand.java

@ -768,7 +768,7 @@ public class ReceiveCommand {
*
* @param rp
* receive-pack session.
* @since 2.0
* @since 5.6
*/
public void execute(ReceivePack rp) {
try {

2
org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java

@ -124,6 +124,7 @@ public class ReceivePack {
* Data in the first line of a request, the line itself plus capabilities.
*
* @deprecated Use {@link FirstCommand} instead.
* @since 5.6
*/
@Deprecated
public static class FirstLine {
@ -1849,6 +1850,7 @@ public class ReceivePack {
* the reporter for sending the status strings.
* @throws java.io.IOException
* an error occurred writing the status report.
* @since 5.6
*/
protected void sendStatusReport(final boolean forClient,
final Throwable unpackError, final Reporter out)

Loading…
Cancel
Save