Merge branch 'stable-5.0'

* stable-5.0:
  Silence API warning for new ObjectIdSerializer introduced in 4.11.1
  Ignore API warnings
  Fix photon target platform to use photon version of org.eclipse.osgi
  Update Photon orbit repository to R20180606145124
  Suppress warning for trying to delete non-empty directory
  Fix fetching with duplicate ref updates
  Fetch(Process): should tolerate duplicate refspecs
  FetchCommandTest: test add/update/delete fetch

Change-Id: I9e7fa37b100a7ea3cbe4104802d36c6f38df9e08
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
index 9ae9a28491206f5698a3b02d83f546498854da45,dfb5a8f4424e2c30b74f827380aee5aa529074cd..6fad8129faf13c07f3dadb72343b40029f3cbeee
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
@@@ -1,26 -1,26 +1,26 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
- <target name="jgit-4.5" sequenceNumber="1534608629">
 -<target name="jgit-4.5" sequenceNumber="1535179254">
++<target name="jgit-4.5" sequenceNumber="1535206408">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="org.eclipse.jetty.client" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.client.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.continuation" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.continuation.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.http" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.http.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.io" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.io.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.security" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.security.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.server" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.server.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.servlet" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.servlet.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.util" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.util.source" version="9.4.8.v20171121"/>
 -      <repository id="jetty-9.4.8" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.8.v20171121"/>
 +      <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.client.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.continuation" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.continuation.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.http" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.http.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.io" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.io.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.security" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.security.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.server" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.server.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.servlet" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/>
 +      <repository id="jetty-9.4.11" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.apache.ant" version="1.9.6.v201510161327"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
index 6a6ea8d0a504cafcdfbda9efe4d126bcdd767b39,dbfd694b24aa482453612eb5f15399069b6e0925..a17f16f61070f8aba874022b85ec63c1aea1ff5c
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
@@@ -1,26 -1,26 +1,26 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
- <target name="jgit-4.6" sequenceNumber="1534608635">
 -<target name="jgit-4.6" sequenceNumber="1535179241">
++<target name="jgit-4.6" sequenceNumber="1535206398">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="org.eclipse.jetty.client" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.client.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.continuation" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.continuation.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.http" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.http.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.io" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.io.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.security" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.security.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.server" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.server.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.servlet" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.servlet.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.util" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.util.source" version="9.4.8.v20171121"/>
 -      <repository id="jetty-9.4.8" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.8.v20171121"/>
 +      <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.client.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.continuation" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.continuation.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.http" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.http.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.io" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.io.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.security" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.security.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.server" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.server.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.servlet" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/>
 +      <repository id="jetty-9.4.11" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.apache.ant" version="1.9.6.v201510161327"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
index c271a1c8962b55b054ae4905197c4de46ea218dc,be7719d88f3c0d1117f3ab4a839d00fae9403da4..c421270f75da78b506f91aa4a9a083c75a206dba
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
@@@ -1,26 -1,26 +1,26 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
- <target name="jgit-4.7" sequenceNumber="1534608613">
 -<target name="jgit-4.7" sequenceNumber="1535179221">
++<target name="jgit-4.7" sequenceNumber="1535206380">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="org.eclipse.jetty.client" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.client.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.continuation" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.continuation.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.http" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.http.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.io" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.io.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.security" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.security.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.server" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.server.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.servlet" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.servlet.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.util" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.util.source" version="9.4.8.v20171121"/>
 -      <repository id="jetty-9.4.8" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.8.v20171121"/>
 +      <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.client.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.continuation" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.continuation.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.http" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.http.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.io" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.io.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.security" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.security.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.server" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.server.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.servlet" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/>
 +      <repository id="jetty-9.4.11" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.apache.ant" version="1.9.6.v201510161327"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
index 86342dde5471d263abb6b54fbe4f488524221c61,3de172b822c03f2d2e31efe61996e8585d2190d2..2e4a812e696984be4200a6f2de1a10e84ef3c9ad
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
@@@ -1,26 -1,26 +1,26 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
- <target name="jgit-4.8" sequenceNumber="1534608610">
 -<target name="jgit-4.8" sequenceNumber="1535179205">
++<target name="jgit-4.8" sequenceNumber="1535206368">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="org.eclipse.jetty.client" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.client.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.continuation" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.continuation.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.http" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.http.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.io" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.io.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.security" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.security.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.server" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.server.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.servlet" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.servlet.source" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.util" version="9.4.8.v20171121"/>
 -      <unit id="org.eclipse.jetty.util.source" version="9.4.8.v20171121"/>
 -      <repository id="jetty-9.4.8" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.8.v20171121"/>
 +      <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.client.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.continuation" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.continuation.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.http" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.http.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.io" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.io.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.security" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.security.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.server" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.server.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.servlet" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/>
 +      <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/>
 +      <repository id="jetty-9.4.11" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.apache.ant" version="1.9.6.v201510161327"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd
index 9c2d3f92702de5d1b48d7d6e320a57e4392ba16b,0ea2b99f326db4609e47868e8579065f0cf9fddc..341fbd0dc4b5f91f8f160973ff24a7d65248eae0
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd
@@@ -1,8 -1,8 +1,8 @@@
  target "jgit-4.8" with source configurePhase
  
 -include "projects/jetty-9.4.8.tpd"
 -include "orbit/R20180606145124-Photon.tpd"
 +include "projects/jetty-9.4.11.tpd"
 +include "orbit/S20180730183850-2018-09.tpd"
  
- location "http://download.eclipse.org/releases/oxygen/" {
+ location "http://download.eclipse.org/releases/photon/" {
        org.eclipse.osgi lazy
  }

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9-staging.target
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..9064c1b32c4984cf3dc7e7ae44fdb4096aefa432
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9-staging.target
@@@ -1,0 -1,0 +1,76 @@@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<?pde?>
++<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
++<target name="jgit-4.9-staging" sequenceNumber="1535206361">
++  <locations>
++    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
++      <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
++      <unit id="org.eclipse.jetty.client.source" version="9.4.11.v20180605"/>
++      <unit id="org.eclipse.jetty.continuation" version="9.4.11.v20180605"/>
++      <unit id="org.eclipse.jetty.continuation.source" version="9.4.11.v20180605"/>
++      <unit id="org.eclipse.jetty.http" version="9.4.11.v20180605"/>
++      <unit id="org.eclipse.jetty.http.source" version="9.4.11.v20180605"/>
++      <unit id="org.eclipse.jetty.io" version="9.4.11.v20180605"/>
++      <unit id="org.eclipse.jetty.io.source" version="9.4.11.v20180605"/>
++      <unit id="org.eclipse.jetty.security" version="9.4.11.v20180605"/>
++      <unit id="org.eclipse.jetty.security.source" version="9.4.11.v20180605"/>
++      <unit id="org.eclipse.jetty.server" version="9.4.11.v20180605"/>
++      <unit id="org.eclipse.jetty.server.source" version="9.4.11.v20180605"/>
++      <unit id="org.eclipse.jetty.servlet" version="9.4.11.v20180605"/>
++      <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/>
++      <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/>
++      <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/>
++      <repository id="jetty-9.4.11" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605"/>
++    </location>
++    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
++      <unit id="org.apache.ant" version="1.9.6.v201510161327"/>
++      <unit id="org.apache.ant.source" version="1.9.6.v201510161327"/>
++      <unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
++      <unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
++      <unit id="org.apache.commons.compress" version="1.15.0.v20180119-1613"/>
++      <unit id="org.apache.commons.compress.source" version="1.15.0.v20180119-1613"/>
++      <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
++      <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
++      <unit id="org.apache.httpcomponents.httpclient" version="4.5.5.v20180409-1525"/>
++      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.5.v20180409-1525"/>
++      <unit id="org.apache.httpcomponents.httpcore" version="4.4.9.v20180409-1525"/>
++      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.9.v20180409-1525"/>
++      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
++      <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
++      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
++      <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
++      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
++      <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
++      <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
++      <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
++      <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
++      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
++      <unit id="javaewah.source" version="1.1.6.v20160919-1400"/>
++      <unit id="org.objenesis" version="1.0.0.v201505121915"/>
++      <unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
++      <unit id="org.mockito" version="1.8.4.v201303031500"/>
++      <unit id="org.mockito.source" version="1.8.4.v201303031500"/>
++      <unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
++      <unit id="com.google.gson.source" version="2.8.2.v20180104-1110"/>
++      <unit id="com.jcraft.jsch" version="0.1.54.v20170116-1932"/>
++      <unit id="com.jcraft.jsch.source" version="0.1.54.v20170116-1932"/>
++      <unit id="org.junit" version="4.12.0.v201504281640"/>
++      <unit id="org.junit.source" version="4.12.0.v201504281640"/>
++      <unit id="javax.servlet" version="3.1.0.v201410161800"/>
++      <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
++      <unit id="org.tukaani.xz" version="1.6.0.v20170629-1752"/>
++      <unit id="org.tukaani.xz.source" version="1.6.0.v20170629-1752"/>
++      <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
++      <unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
++      <unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
++      <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
++      <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
++      <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
++      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180730183850/repository"/>
++    </location>
++    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
++      <unit id="org.eclipse.osgi" version="0.0.0"/>
++      <repository location="http://download.eclipse.org/staging/2018-09/"/>
++    </location>
++  </locations>
++</target>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9-staging.tpd
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..2319e927401a91841274755a3ec04a6556375922
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9-staging.tpd
@@@ -1,0 -1,0 +1,8 @@@
++target "jgit-4.9-staging" with source configurePhase
++
++include "projects/jetty-9.4.11.tpd"
++include "orbit/S20180730183850-2018-09.tpd"
++
++location "http://download.eclipse.org/staging/2018-09/" {
++      org.eclipse.osgi lazy
++}

diff --cc org.eclipse.jgit/.settings/.api_filters
index b7b49bc658c7b469594ba457b04695e721e73a42,0000000000000000000000000000000000000000..9f4b761495602690e17337dd1b5f877e165b8622
mode 100644,000000..100644
--- 1/org.eclipse.jgit/.settings/.api_filters
--- /dev/null
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -1,33 -1,0 +1,17 @@@
-     <resource path="src/org/eclipse/jgit/lib/ObjectIdSerializer.java" type="org.eclipse.jgit.lib.ObjectIdSerializer">
-         <filter id="1141899266">
-             <message_arguments>
-                 <message_argument value="4.11"/>
-                 <message_argument value="5.0"/>
-                 <message_argument value="readWithoutMarker(InputStream)"/>
-             </message_arguments>
-         </filter>
-         <filter id="1141899266">
-             <message_arguments>
-                 <message_argument value="4.11"/>
-                 <message_argument value="5.0"/>
-                 <message_argument value="writeWithoutMarker(OutputStream, AnyObjectId)"/>
-             </message_arguments>
-         </filter>
-     </resource>
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +<component id="org.eclipse.jgit" version="2">
 +    <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
 +        <filter id="337768515">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
- </component>
 +    <resource path="src/org/eclipse/jgit/transport/GitProtocolConstants.java" type="org.eclipse.jgit.transport.GitProtocolConstants">
 +        <filter id="337768515">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.transport.GitProtocolConstants"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
++</component>

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
index 7d2bd4897a93663b884a31d36edcb27cf0275c66,b088d726601338f041615c9704da16f567dfa023..40c6de33fa10dad07c9641518646f73ca6776160
--- 1/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
--- 2/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
@@@ -1287,8 -1288,12 +1288,12 @@@ public class RefDirectory extends RefDa
                for (int i = 0; i < depth; ++i) {
                        try {
                                Files.delete(dir.toPath());
+                       } catch (DirectoryNotEmptyException e) {
+                               // Don't log; normal case when there are other refs with the
+                               // same prefix
+                               break;
                        } catch (IOException e) {
 -                              LOG.warn("Unable to remove path {}", dir, e);
 +                              LOG.warn("Unable to remove path {}", dir, e); //$NON-NLS-1$
                                break;
                        }
                        dir = dir.getParentFile();