Merge branch 'stable-5.3' into stable-5.4

* stable-5.3:
  Remove unused import in ApacheSshTest
  Update maven plugins
  Ignore missing javadoc in test bundles
  storage: file: De-duplicate File.exists()+File.isFile()
  RefDirectory.scanRef: Re-use file existence check done in snapshot creation
  FileSnapshot: Lazy load file store attributes cache
  Update eclipse-jarsigner-plugin to 1.3.2
  Fix p2 repository URLs

Change-Id: I0e80612c8ddb934466105312f9107e91d581de0b

diff --cc org.eclipse.jgit.junit/.settings/.api_filters
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..05665a3d154a6ad8a9ff4e9e3726146483941119
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/org.eclipse.jgit.junit/.settings/.api_filters
@@@ -1,0 -1,0 +1,11 @@@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<component id="org.eclipse.jgit.junit" version="2">
++    <resource path="src/org/eclipse/jgit/junit/Repeat.java" type="org.eclipse.jgit.junit.Repeat">
++        <filter id="1092616195">
++            <message_arguments>
++                <message_argument value="5.1.9"/>
++                <message_argument value="abortOnFailure()"/>
++            </message_arguments>
++        </filter>
++    </resource>
++</component>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
index 36660ff3e6e35c3cafb1425afe117a4e38060a1c,8176f0c82729bcf59a706644297a7581d802f453..941d4961d7bce514c94b377044100feee9349eb4
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
@@@ -1,7 -1,7 +1,7 @@@
  <?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="1566251637">
 -<target name="jgit-4.10" sequenceNumber="1638578807">
++<target name="jgit-4.10" sequenceNumber="1638580694">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
index afa4b3da2cc617db208692402f7967087a21e1b8,414e02cefb9c5a8b048b44cf40c7e53f7994a6f4..4be2f466d22ac66a99eb49b06d84052a16809822
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.11" sequenceNumber="1566251633">
 -<target name="jgit-4.11" sequenceNumber="1638579452">
++<target name="jgit-4.11" sequenceNumber="1638580694">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..34ffd455a6d96ce181aeca585d0ed273cc81b374
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target
@@@ -1,0 -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.12" sequenceNumber="1638580694">
++  <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="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/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.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.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.61.0.v20190602-1335"/>
++      <unit id="org.bouncycastle.bcpg.source" version="1.61.0.v20190602-1335"/>
++      <unit id="org.bouncycastle.bcpkix" version="1.61.0.v20190602-1335"/>
++      <unit id="org.bouncycastle.bcpkix.source" version="1.61.0.v20190602-1335"/>
++      <unit id="org.bouncycastle.bcprov" version="1.61.0.v20190602-1335"/>
++      <unit id="org.bouncycastle.bcprov.source" version="1.61.0.v20190602-1335"/>
++      <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.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.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.osgi" version="2.2.0.v20190425-2127"/>
++      <unit id="org.apache.sshd.osgi.source" version="2.2.0.v20190425-2127"/>
++      <unit id="org.apache.sshd.sftp" version="2.2.0.v20190425-2127"/>
++      <unit id="org.apache.sshd.sftp.source" version="2.2.0.v20190425-2127"/>
++      <repository location="https://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="https://download.eclipse.org/releases/2019-06/"/>
++    </location>
++  </locations>
++</target>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..cff602607a085f5f06cd77a9d8aed793cfe1e293
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd
@@@ -1,0 -1,0 +1,8 @@@
++target "jgit-4.12" with source configurePhase
++
++include "projects/jetty-9.4.14.tpd"
++include "orbit/R20190602212107-2019-06.tpd"
++
++location "https://download.eclipse.org/releases/2019-06/" {
++      org.eclipse.osgi lazy
++}

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
index 9724939f8a967a893b6220bfcc7e1ef87f3e7cb2,1a9608e611ce8c377fcf1f9e0b37db11a9e80a14..489b01c58a2aad815733c357d7c2f6c7b3ca9d26
--- 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,7 -1,7 +1,7 @@@
  <?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="1566251641">
 -<target name="jgit-4.6" sequenceNumber="1638579461">
++<target name="jgit-4.6" sequenceNumber="1638580694">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
index 6bd70e0160bd395b65523fa726612428f27ed80b,4d8e451f58d53b2066e52b7e55af0a6074a34cd9..627a83a755385bbdef026496060ecc5e985f33b5
--- 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,7 -1,7 +1,7 @@@
  <?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="1566251627">
 -<target name="jgit-4.7" sequenceNumber="1638579458">
++<target name="jgit-4.7" sequenceNumber="1638580694">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
index e33ece710ac2632c1c886e5f0899c7490da6ccfb,491ff48c1ecb1124aed2d56ca0c1b4b0a734f34b..dc45c7d16e36ce7c70b31f9306da286e508772b2
--- 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,7 -1,7 +1,7 @@@
  <?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="1566251616">
 -<target name="jgit-4.8" sequenceNumber="1638579452">
++<target name="jgit-4.8" sequenceNumber="1638580694">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
index 9b3fe1b930f299190d91c95b924bcdb29af75b96,d3267056794ec2b96d432eb5c83b21efc1dd77b8..040c1d127454af9b24be81b64bd74ba4b30682d1
--- 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,7 -1,7 +1,7 @@@
  <?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="1566251604">
 -<target name="jgit-4.9" sequenceNumber="1638578807">
++<target name="jgit-4.9" sequenceNumber="1638580694">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>

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

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectoryPackParser.java
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
Simple merge

diff --cc pom.xml
index 7c47ca4ed04bcd2a428c6343bf413d775a6b0ddb,d5c3a78424b5c2272f4be9634676309e5fb0db9e..26b1c1ae8ab84e289c56d7a89cf53b9cc094adc3
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -199,15 -199,14 +199,14 @@@
      <httpcore-version>4.4.10</httpcore-version>
      <slf4j-version>1.7.2</slf4j-version>
      <log4j-version>1.2.15</log4j-version>
-     <maven-javadoc-plugin-version>3.1.0</maven-javadoc-plugin-version>
-     <tycho-extras-version>1.4.0</tycho-extras-version>
+     <maven-javadoc-plugin-version>3.3.1</maven-javadoc-plugin-version>
+     <tycho-extras-version>1.7.0</tycho-extras-version>
      <gson-version>2.8.2</gson-version>
 -    <bouncycastle-version>1.60</bouncycastle-version>
 +    <bouncycastle-version>1.61</bouncycastle-version>
-     <spotbugs-maven-plugin-version>3.1.12</spotbugs-maven-plugin-version>
-     <maven-project-info-reports-plugin-version>3.0.0</maven-project-info-reports-plugin-version>
-     <maven-jxr-plugin-version>3.0.0</maven-jxr-plugin-version>
-     <spotbugs-maven-plugin-version>3.1.12</spotbugs-maven-plugin-version>
-     <maven-surefire-plugin-version>3.0.0-M3</maven-surefire-plugin-version>
+     <maven-project-info-reports-plugin-version>3.1.2</maven-project-info-reports-plugin-version>
 -    <maven-jxr-plugin-version>3.1.1</maven-jxr-plugin-version>
++    <maven-surefire-plugin-version>3.0.0-M5</maven-surefire-plugin-version>
+     <spotbugs-maven-plugin-version>4.3.0</spotbugs-maven-plugin-version>
+     <maven-surefire-plugin-version>3.0.0-M5</maven-surefire-plugin-version>
      <maven-surefire-report-plugin-version>${maven-surefire-plugin-version}</maven-surefire-report-plugin-version>
      <maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>