Merge branch 'stable-5.2' into stable-5.3

* stable-5.2:
  Fix NPE in RebaseTodoFile#parseComments
  Fix NPE in ObjectIdOwnerMap#get
  Fix NPE in CommitOnlyTest#getHead
  FileUtils#lastModifiedInstant should not log error if path doesn't exist
  Cache user global and system-wide git configurations
  Avoid setup and saving FileStoreAttributes compete for ~/.gitconfig lock
  Add missing dependencies for running FS_POSIXTest in Eclipse
  Fix javadoc for SystemReader#getInstance
  Improve retry handling when saving FileStoreAttributes fails
  Ensure FSTest uses MockSystemReader
  Make supportsAtomicCreateNewFile return true as default
  Update orbit to R20190602212107-2019-06 to enable backports from master
  Handle InvalidPathException in FS_POSIX#createNewFileAtomic
  Ensure root cause of lock creation failures is logged
  Implement toString in MockSystemReader and MockConfig
  LocalDiskRefTreeDatabaseTest shall use MockSystemReader
  Ensure LocalDiskRepositoryTestCase#setup fully uses MockSystemReader
  Ensure we use MockSystemReader in tests
  Override FileBasedConfig's save method in MockConfig
  Remove FileBasedConfig.load(boolean) introduced in d45219ba
  Disable debug log for FS in org.eclipse.jgit.test
  Bazel: enable logging for tests in org.eclipse.jgit.test
  LockFile: log exception if creation of lock file failed
  Stop using deprecated Constants.CHARACTER_ENCODING

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

diff --cc WORKSPACE
Simple merge

diff --cc lib/BUILD
Simple merge

diff --cc org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java
index aad029ccfc6d273c0ad321b3baf54dc121075408,78bf778cc8fdfac835e6314fc8378058c8f3d78e..017e2c7aa336615255fa825d63eb0def3c419a83
--- 1/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java
--- 2/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java
+++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java
@@@ -653,10 -659,12 +651,10 @@@ public class SmartClientSmartServerTes
  
        @Test
        public void testInitialClone_RedirectTooOften() throws Exception {
-               FileBasedConfig userConfig = SystemReader.getInstance()
-                               .openUserConfig(null, FS.DETECTED);
+               StoredConfig userConfig = SystemReader.getInstance()
+                               .getUserConfig();
                userConfig.setInt("http", null, "maxRedirects", 3);
                userConfig.save();
 -              Repository dst = createBareRepository();
 -              assertFalse(dst.hasObject(A_txt));
  
                URIish cloneFrom = extendPath(redirectURI, "/response/4/302");
                String remoteUri = cloneFrom.toString();
@@@ -692,21 -699,22 +690,21 @@@
  
        @Test
        public void testInitialClone_RedirectOnPostAllowed() throws Exception {
-               FileBasedConfig userConfig = SystemReader.getInstance()
-                               .openUserConfig(null, FS.DETECTED);
+               StoredConfig userConfig = SystemReader.getInstance()
+                               .getUserConfig();
                userConfig.setString("http", null, "followRedirects", "true");
                userConfig.save();
 -              Repository dst = createBareRepository();
 -              assertFalse(dst.hasObject(A_txt));
  
                URIish cloneFrom = extendPath(remoteURI, "/post");
 -              try (Transport t = Transport.open(dst, cloneFrom)) {
 +              try (Repository dst = createBareRepository();
 +                              Transport t = Transport.open(dst, cloneFrom)) {
 +                      assertFalse(dst.getObjectDatabase().has(A_txt));
                        t.fetch(NullProgressMonitor.INSTANCE, mirror(master));
 +                      assertTrue(dst.getObjectDatabase().has(A_txt));
 +                      assertEquals(B, dst.exactRef(master).getObjectId());
 +                      fsck(dst, B);
                }
  
 -              assertTrue(dst.hasObject(A_txt));
 -              assertEquals(B, dst.exactRef(master).getObjectId());
 -              fsck(dst, B);
 -
                List<AccessEvent> requests = getRequests();
                assertEquals(3, requests.size());
  

diff --cc org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java
Simple merge

diff --cc org.eclipse.jgit.lfs/.settings/.api_filters
index 0000000000000000000000000000000000000000,95a45574ec8126bf3c650fb6da0da9c52ea6e831..371f35376d8292919a974edd5aafbd2acb665bc6
mode 000000,100644..100644
--- /dev/null
--- 2/org.eclipse.jgit.lfs/.settings/.api_filters
+++ b/org.eclipse.jgit.lfs/.settings/.api_filters
@@@ -1,0 -1,11 +1,11 @@@
 -                <message_argument value="5.2.3"/>
 -                <message_argument value="5.2.0"/>
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <component id="org.eclipse.jgit.lfs" version="2">
+     <resource path="META-INF/MANIFEST.MF">
+         <filter id="924844039">
+             <message_arguments>
++                <message_argument value="5.3.3"/>
++                <message_argument value="5.3.0"/>
+             </message_arguments>
+         </filter>
+     </resource>
+ </component>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
index 1a6a0fcaa5cddc0e59532d421aee52bd54e734a9,0000000000000000000000000000000000000000..86653bef028185200273f15512105819944d1734
mode 100644,000000..100644
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
@@@ -1,89 -1,0 +1,92 @@@
- <?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde?><!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --><target name="jgit-4.10" sequenceNumber="1551829107">
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<?pde?>
++<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
++<target name="jgit-4.10" sequenceNumber="1566244557">
 +  <locations>
-     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
++    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 +      <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.client.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util.source" version="9.4.14.v20181114"/>
 +      <repository id="jetty-9.4.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181114"/>
 +    </location>
-     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-       <unit id="org.apache.ant" version="1.10.5.v20180808-0324"/>
-       <unit id="org.apache.ant.source" version="1.10.5.v20180808-0324"/>
++    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
++      <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/>
++      <unit id="org.apache.ant.source" version="1.10.5.v20190526-1402"/>
 +      <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.18.0.v20181121-2221"/>
 +      <unit id="org.apache.commons.compress.source" version="1.18.0.v20181121-2221"/>
 +      <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.6.v20190213-1430"/>
-       <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.6.v20190213-1430"/>
++      <unit id="org.apache.httpcomponents.httpclient" version="4.5.6.v20190503-0009"/>
++      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.6.v20190503-0009"/>
 +      <unit id="org.apache.httpcomponents.httpcore" version="4.4.10.v20190123-2214"/>
 +      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.10.v20190123-2214"/>
 +      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
 +      <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
 +      <unit id="org.bouncycastle.bcpg" version="1.60.0.v20181210-2057"/>
 +      <unit id="org.bouncycastle.bcpg.source" version="1.60.0.v20181210-2057"/>
 +      <unit id="org.bouncycastle.bcpkix" version="1.60.0.v20181210-2057"/>
 +      <unit id="org.bouncycastle.bcpkix.source" version="1.60.0.v20181210-2057"/>
 +      <unit id="org.bouncycastle.bcprov" version="1.60.0.v20181210-2057"/>
 +      <unit id="org.bouncycastle.bcprov.source" version="1.60.0.v20181210-2057"/>
 +      <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="2.6.0.v20180420-1519"/>
 +      <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
-       <unit id="org.mockito" version="2.13.0.v20180426-1843"/>
-       <unit id="org.mockito.source" version="2.13.0.v20180426-1843"/>
-       <unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/>
-       <unit id="net.bytebuddy.byte-buddy.source" version="1.7.9.v20180420-1519"/>
-       <unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/>
-       <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.7.9.v20180420-1519"/>
++      <unit id="org.mockito" version="2.23.0.v20190527-1420"/>
++      <unit id="org.mockito.source" version="2.23.0.v20190527-1420"/>
++      <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
++      <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
++      <unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/>
++      <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.9.0.v20181106-1534"/>
 +      <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="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
++      <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
 +      <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.8.0.v20180207-1613"/>
 +      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
 +      <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"/>
 +      <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
 +      <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
 +      <unit id="org.apache.sshd.core" version="2.0.0.v20181102-1323"/>
 +      <unit id="org.apache.sshd.core.source" version="2.0.0.v20181102-1323"/>
 +      <unit id="org.apache.sshd.sftp" version="2.0.0.v20181102-1323"/>
 +      <unit id="org.apache.sshd.sftp.source" version="2.0.0.v20181102-1323"/>
-       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository"/>
++      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository"/>
 +    </location>
-     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
++    <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/releases/2018-12/"/>
 +    </location>
 +  </locations>
- </target>
++</target>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd
index 31981f276123a0437b743d27123520ae28ebf941,0000000000000000000000000000000000000000..6beb42e33af41cde20ecdade5eccd2b7b4722166
mode 100644,000000..100644
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd
@@@ -1,8 -1,0 +1,8 @@@
- include "orbit/R20190226160451-2019-03.tpd"
 +target "jgit-4.10" with source configurePhase
 +
 +include "projects/jetty-9.4.14.tpd"
++include "orbit/R20190602212107-2019-06.tpd"
 +
 +location "http://download.eclipse.org/releases/2018-12/" {
 +      org.eclipse.osgi lazy
 +}

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11-staging.target
index 14cd0d791975cfb44a670001e4dc620c67b04a90,0000000000000000000000000000000000000000..0857af3979de7bce8c963472a31ec2670d13dfe3
mode 100644,000000..100644
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11-staging.target
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11-staging.target
@@@ -1,92 -1,0 +1,92 @@@
- <target name="jgit-4.11-staging" sequenceNumber="1551829209">
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +<?pde?>
 +<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-       <unit id="org.apache.ant" version="1.10.5.v20180808-0324"/>
-       <unit id="org.apache.ant.source" version="1.10.5.v20180808-0324"/>
++<target name="jgit-4.11-staging" sequenceNumber="1566244434">
 +  <locations>
 +    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 +      <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.client.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util.source" version="9.4.14.v20181114"/>
 +      <repository id="jetty-9.4.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181114"/>
 +    </location>
 +    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-       <unit id="org.apache.httpcomponents.httpclient" version="4.5.6.v20190213-1430"/>
-       <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.6.v20190213-1430"/>
++      <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/>
++      <unit id="org.apache.ant.source" version="1.10.5.v20190526-1402"/>
 +      <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.18.0.v20181121-2221"/>
 +      <unit id="org.apache.commons.compress.source" version="1.18.0.v20181121-2221"/>
 +      <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.mockito" version="2.13.0.v20180426-1843"/>
-       <unit id="org.mockito.source" version="2.13.0.v20180426-1843"/>
-       <unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/>
-       <unit id="net.bytebuddy.byte-buddy.source" version="1.7.9.v20180420-1519"/>
-       <unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/>
-       <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.7.9.v20180420-1519"/>
++      <unit id="org.apache.httpcomponents.httpclient" version="4.5.6.v20190503-0009"/>
++      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.6.v20190503-0009"/>
 +      <unit id="org.apache.httpcomponents.httpcore" version="4.4.10.v20190123-2214"/>
 +      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.10.v20190123-2214"/>
 +      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
 +      <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
 +      <unit id="org.bouncycastle.bcpg" version="1.60.0.v20181210-2057"/>
 +      <unit id="org.bouncycastle.bcpg.source" version="1.60.0.v20181210-2057"/>
 +      <unit id="org.bouncycastle.bcpkix" version="1.60.0.v20181210-2057"/>
 +      <unit id="org.bouncycastle.bcpkix.source" version="1.60.0.v20181210-2057"/>
 +      <unit id="org.bouncycastle.bcprov" version="1.60.0.v20181210-2057"/>
 +      <unit id="org.bouncycastle.bcprov.source" version="1.60.0.v20181210-2057"/>
 +      <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="2.6.0.v20180420-1519"/>
 +      <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
-       <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.mockito" version="2.23.0.v20190527-1420"/>
++      <unit id="org.mockito.source" version="2.23.0.v20190527-1420"/>
++      <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
++      <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
++      <unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/>
++      <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.9.0.v20181106-1534"/>
 +      <unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
 +      <unit id="com.google.gson.source" version="2.8.2.v20180104-1110"/>
-       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository"/>
++      <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
++      <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
 +      <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.8.0.v20180207-1613"/>
 +      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
 +      <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"/>
 +      <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
 +      <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
 +      <unit id="org.apache.sshd.core" version="2.0.0.v20181102-1323"/>
 +      <unit id="org.apache.sshd.core.source" version="2.0.0.v20181102-1323"/>
 +      <unit id="org.apache.sshd.sftp" version="2.0.0.v20181102-1323"/>
 +      <unit id="org.apache.sshd.sftp.source" version="2.0.0.v20181102-1323"/>
++      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/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/2019-03/"/>
 +    </location>
 +  </locations>
 +</target>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11-staging.tpd
index 05002f2349913ca5bbde0c27e6c0899e2fb56a00,0000000000000000000000000000000000000000..4fc23eda87967a4afa00c7120a481ffbc3f73af1
mode 100644,000000..100644
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11-staging.tpd
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11-staging.tpd
@@@ -1,8 -1,0 +1,8 @@@
- include "orbit/R20190226160451-2019-03.tpd"
 +target "jgit-4.11-staging" with source configurePhase
 +
 +include "projects/jetty-9.4.14.tpd"
++include "orbit/R20190602212107-2019-06.tpd"
 +
 +location "http://download.eclipse.org/staging/2019-03/" {
 +      org.eclipse.osgi lazy
 +}

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
index f8641ca454f1141a3d3cb52a7c5346cd2b46723c,997d9c98320ca660d8db8617aff071faff9809f1..05488b9c3d7efc356d90eacaabf6b06cc4d30895
--- 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,30 -1,30 +1,30 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.6" sequenceNumber="1551829238">
 -<target name="jgit-4.6" sequenceNumber="1566229352">
++<target name="jgit-4.6" sequenceNumber="1566244561">
    <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"/>
 +      <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.client.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util.source" version="9.4.14.v20181114"/>
 +      <repository id="jetty-9.4.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181114"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-       <unit id="org.apache.ant" version="1.10.5.v20180808-0324"/>
-       <unit id="org.apache.ant.source" version="1.10.5.v20180808-0324"/>
+       <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/>
+       <unit id="org.apache.ant.source" version="1.10.5.v20190526-1402"/>
        <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.18.0.v20181121-2221"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
index 81eb219037206d5b964d44ddb58fad20bb4374b8,8b3dd0b4766182ac04fa91275c6be73ee0202a12..1a2c9a3a16e28085ef25459fd7f1fe3245cb3f75
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
@@@ -1,7 -1,7 +1,7 @@@
  target "jgit-4.6" with source configurePhase
  
 -include "projects/jetty-9.4.11.tpd"
 +include "projects/jetty-9.4.14.tpd"
- include "orbit/R20190226160451-2019-03.tpd"
+ include "orbit/R20190602212107-2019-06.tpd"
  
  location "http://download.eclipse.org/releases/neon/" {
        org.eclipse.osgi lazy

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
index 427f9dcf118887930854d191acddfaf3d7645224,03c9a8b528967bbb8da0a8020636275a6e36a124..e82222a0c5ee4c4be3525996494334c46b0a4a73
--- 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,30 -1,30 +1,30 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.7" sequenceNumber="1551829255">
 -<target name="jgit-4.7" sequenceNumber="1566229348">
++<target name="jgit-4.7" sequenceNumber="1566244564">
    <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"/>
 +      <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.client.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util.source" version="9.4.14.v20181114"/>
 +      <repository id="jetty-9.4.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181114"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-       <unit id="org.apache.ant" version="1.10.5.v20180808-0324"/>
-       <unit id="org.apache.ant.source" version="1.10.5.v20180808-0324"/>
+       <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/>
+       <unit id="org.apache.ant.source" version="1.10.5.v20190526-1402"/>
        <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.18.0.v20181121-2221"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd
index 10a4eb7b6abac3e157be3144ca6d7436788c1e19,e93fc46b59d73a43d6d7ef734697f309821c8c5b..fc1b046edd1b5b3bcbc36214b8068b336cf56f08
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd
@@@ -1,7 -1,7 +1,7 @@@
  target "jgit-4.7" with source configurePhase
  
 -include "projects/jetty-9.4.11.tpd"
 +include "projects/jetty-9.4.14.tpd"
- include "orbit/R20190226160451-2019-03.tpd"
+ include "orbit/R20190602212107-2019-06.tpd"
  
  location "http://download.eclipse.org/releases/oxygen/" {
        org.eclipse.osgi lazy

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
index fe641efa5cea7e9c8aac184a92c4c53fc6964b54,e29620cc11d61f75e56914238731cfba9d20bdd0..0b353db260c02e68d461af6d172d33269d9647a8
--- 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,30 -1,30 +1,30 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.8" sequenceNumber="1551829263">
 -<target name="jgit-4.8" sequenceNumber="1566229344">
++<target name="jgit-4.8" sequenceNumber="1566244569">
    <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"/>
 +      <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.client.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util.source" version="9.4.14.v20181114"/>
 +      <repository id="jetty-9.4.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181114"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-       <unit id="org.apache.ant" version="1.10.5.v20180808-0324"/>
-       <unit id="org.apache.ant.source" version="1.10.5.v20180808-0324"/>
+       <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/>
+       <unit id="org.apache.ant.source" version="1.10.5.v20190526-1402"/>
        <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.18.0.v20181121-2221"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd
index daa24dd63ccbd3b48f40d070c2fe95dd26da7e80,ba6337dbf9050d703826aaffb4d5f385075a13ab..a8f837e9caa243d9cd69e1d8cea9d6d29005f335
--- 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,7 -1,7 +1,7 @@@
  target "jgit-4.8" with source configurePhase
  
 -include "projects/jetty-9.4.11.tpd"
 +include "projects/jetty-9.4.14.tpd"
- include "orbit/R20190226160451-2019-03.tpd"
+ include "orbit/R20190602212107-2019-06.tpd"
  
  location "http://download.eclipse.org/releases/photon/" {
        org.eclipse.osgi lazy

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
index 4f63f6635528f493dbbc13e8c649cc86d3b5812b,82a64ce3d558bb74467a989fc92134ac63eb890c..94a752c74c251744650b5f75d2b48e0404ecc1f7
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
@@@ -1,30 -1,30 +1,30 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.9" sequenceNumber="1551829271">
 -<target name="jgit-4.9" sequenceNumber="1566229339">
++<target name="jgit-4.9" sequenceNumber="1566244572">
    <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"/>
 +      <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.client.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util.source" version="9.4.14.v20181114"/>
 +      <repository id="jetty-9.4.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181114"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-       <unit id="org.apache.ant" version="1.10.5.v20180808-0324"/>
-       <unit id="org.apache.ant.source" version="1.10.5.v20180808-0324"/>
+       <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/>
+       <unit id="org.apache.ant.source" version="1.10.5.v20190526-1402"/>
        <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.18.0.v20181121-2221"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd
index d024dca851bc1490f100586594daedf64394abc5,d5beea361621b453f5d273809ed9c83f45a2cdc0..f91f53eb8b921282d6c72a98db599880013b2f00
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd
@@@ -1,7 -1,7 +1,7 @@@
  target "jgit-4.9" with source configurePhase
  
 -include "projects/jetty-9.4.11.tpd"
 +include "projects/jetty-9.4.14.tpd"
- include "orbit/R20190226160451-2019-03.tpd"
+ include "orbit/R20190602212107-2019-06.tpd"
  
  location "http://download.eclipse.org/releases/2018-09/" {
        org.eclipse.osgi lazy

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20190602212107-2019-06.tpd
index 0000000000000000000000000000000000000000,b503092954ed9738cdd14891705ff784a0a12156..65d5c9f1f5bd45d79cdf33c977a96560d83ef678
mode 000000,100644..100644
--- /dev/null
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20190602212107-2019-06.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20190602212107-2019-06.tpd
@@@ -1,0 -1,58 +1,64 @@@
 -      org.tukaani.xz [1.6.0.v20170629-1752,1.6.0.v20170629-1752]
 -      org.tukaani.xz.source [1.6.0.v20170629-1752,1.6.0.v20170629-1752]
+ target "R20190602212107-2019-06" with source configurePhase
+ // see http://download.eclipse.org/tools/orbit/downloads/
+ 
+ location "http://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository" {
+       org.apache.ant [1.10.5.v20190526-1402,1.10.5.v20190526-1402]
+       org.apache.ant.source [1.10.5.v20190526-1402,1.10.5.v20190526-1402]
+       org.apache.commons.codec [1.10.0.v20180409-1845,1.10.0.v20180409-1845]
+       org.apache.commons.codec.source [1.10.0.v20180409-1845,1.10.0.v20180409-1845]
+       org.apache.commons.compress [1.18.0.v20181121-2221,1.18.0.v20181121-2221]
+       org.apache.commons.compress.source [1.18.0.v20181121-2221,1.18.0.v20181121-2221]
+       org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
+       org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
+       org.apache.httpcomponents.httpclient [4.5.6.v20190503-0009,4.5.6.v20190503-0009]
+       org.apache.httpcomponents.httpclient.source [4.5.6.v20190503-0009,4.5.6.v20190503-0009]
+       org.apache.httpcomponents.httpcore [4.4.10.v20190123-2214,4.4.10.v20190123-2214]
+       org.apache.httpcomponents.httpcore.source [4.4.10.v20190123-2214,4.4.10.v20190123-2214]
+       org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
+       org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815]
++      org.bouncycastle.bcpg [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
++      org.bouncycastle.bcpg.source [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
++      org.bouncycastle.bcpkix [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
++      org.bouncycastle.bcpkix.source [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
++      org.bouncycastle.bcprov [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
++      org.bouncycastle.bcprov.source [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
+       org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
+       org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
+       org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000]
+       org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519]
+       org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519]
+       org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
+       org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
+       javaewah [1.1.6.v20160919-1400,1.1.6.v20160919-1400]
+       javaewah.source [1.1.6.v20160919-1400,1.1.6.v20160919-1400]
+       org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
+       org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
+       org.mockito [2.23.0.v20190527-1420,2.23.0.v20190527-1420]
+       org.mockito.source [2.23.0.v20190527-1420,2.23.0.v20190527-1420]
+       net.bytebuddy.byte-buddy [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
+       net.bytebuddy.byte-buddy.source [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
+       net.bytebuddy.byte-buddy-agent [1.9.0.v20181106-1534,1.9.0.v20181106-1534]
+       net.bytebuddy.byte-buddy-agent.source [1.9.0.v20181106-1534,1.9.0.v20181106-1534]
+       com.google.gson [2.8.2.v20180104-1110,2.8.2.v20180104-1110]
+       com.google.gson.source [2.8.2.v20180104-1110,2.8.2.v20180104-1110]
+       com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
+       com.jcraft.jsch.source [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
+       org.junit [4.12.0.v201504281640,4.12.0.v201504281640]
+       org.junit.source [4.12.0.v201504281640,4.12.0.v201504281640]
+       javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800]
+       javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800]
++      org.tukaani.xz [1.8.0.v20180207-1613,1.8.0.v20180207-1613]
++      org.tukaani.xz.source [1.8.0.v20180207-1613,1.8.0.v20180207-1613]
+       org.slf4j.api [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
+       org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
+       org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
+       org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
+       com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305]
+       com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305]
+       net.i2p.crypto.eddsa [0.3.0.v20181102-1323,0.3.0.v20181102-1323]
+       net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323]
+       org.apache.sshd.core [2.0.0.v20181102-1323,2.0.0.v20181102-1323]
+       org.apache.sshd.core.source [2.0.0.v20181102-1323,2.0.0.v20181102-1323]
+       org.apache.sshd.sftp [2.0.0.v20181102-1323,2.0.0.v20181102-1323]
+       org.apache.sshd.sftp.source [2.0.0.v20181102-1323,2.0.0.v20181102-1323]
+ }

diff --cc org.eclipse.jgit.test/BUILD
Simple merge

diff --cc org.eclipse.jgit.test/META-INF/MANIFEST.MF
Simple merge

diff --cc org.eclipse.jgit.test/pom.xml
Simple merge

diff --cc org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java
Simple merge

diff --cc org.eclipse.jgit.test/tst/org/eclipse/jgit/util/FSTest.java
Simple merge

diff --cc org.eclipse.jgit/.settings/.api_filters
Simple merge

diff --cc org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java
index 716711e067277187522002f7cb3259db0b8e0661,eda8afb10f1e2c3bbc6a64b5255967d43ccb5848..eda0fae2475606a3f2bd6f61174c6a2664267e2d
--- 1/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java
--- 2/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java
@@@ -48,8 -51,9 +51,10 @@@ import java.io.IOException
  import java.io.InputStreamReader;
  import java.io.PrintStream;
  import java.nio.charset.Charset;
 +import java.nio.file.AccessDeniedException;
+ import java.nio.file.FileAlreadyExistsException;
  import java.nio.file.Files;
+ import java.nio.file.InvalidPathException;
  import java.nio.file.Path;
  import java.nio.file.Paths;
  import java.nio.file.attribute.PosixFilePermission;

diff --cc pom.xml
index 275d1d634a20b88ff6a5f3a4b7af883755c91b52,732308b7cc693c0bb8e5704259e7454a2010cdc5..afaf890875ba1d7221ff4a85ed6fdb27772205e8
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -182,9 -182,9 +182,9 @@@
      <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
      <bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest>
  
 -    <jgit-last-release-version>5.1.0.201809111528-r</jgit-last-release-version>
 +    <jgit-last-release-version>5.2.0.201812061821-r</jgit-last-release-version>
      <apache-sshd-version>2.0.0</apache-sshd-version>
-     <jsch-version>0.1.54</jsch-version>
+     <jsch-version>0.1.55</jsch-version>
      <jzlib-version>1.1.1</jzlib-version>
      <javaewah-version>1.1.6</javaewah-version>
      <junit-version>4.12</junit-version>