motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-5.4' into stable-5.5 

* stable-5.4:
  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: I5ce55c6c152a59602fef9fb08c16dedf666444e2
This commit is contained in:
Matthias Sohn 2021-12-04 09:48:19 +01:00
parent d6fab62f9e 7ae2ee300a
commit d8f5b5c691
30 changed files with 114 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit.ant.test/.settings/org.eclipse.jdt.core.prefs
View File

@ -52,7 +52,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

2
org.eclipse.jgit.http.test/.settings/org.eclipse.jdt.core.prefs
View File

@ -52,7 +52,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

11
org.eclipse.jgit.junit/.settings/.api_filters Normal file
View File

@ -0,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>

2
org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.jdt.core.prefs
View File

@ -52,7 +52,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

2
org.eclipse.jgit.lfs.test/.settings/org.eclipse.jdt.core.prefs
View File

@ -52,7 +52,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
View File

@ -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="1567671414">
<target name="jgit-4.10" sequenceNumber="1638608437">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/>
@ -20,7 +20,7 @@
<unit id="org.eclipse.jetty.servlet.source" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util.source" version="9.4.20.v20190813"/>
<repository id="jetty-9.4.20" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.20.v20190813/"/>
<repository id="jetty-9.4.20" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.20.v20190813/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
@ -86,7 +86,7 @@
</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/releases/2018-12/"/>
<repository location="https://download.eclipse.org/releases/2018-12/"/>
</location>
</locations>
</target>

3
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd
View File

@ -3,6 +3,7 @@ target "jgit-4.10" with source configurePhase
include "projects/jetty-9.4.20.tpd"
include "orbit/R20190827152740-2019-09.tpd"
location "http://download.eclipse.org/releases/2018-12/" {
location "https://download.eclipse.org/releases/2018-12/" {
org.eclipse.osgi lazy
}

6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
View File

@ -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="1567671414">
<target name="jgit-4.11" sequenceNumber="1638608437">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/>
@ -20,7 +20,7 @@
<unit id="org.eclipse.jetty.servlet.source" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util.source" version="9.4.20.v20190813"/>
<repository id="jetty-9.4.20" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.20.v20190813/"/>
<repository id="jetty-9.4.20" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.20.v20190813/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
@ -86,7 +86,7 @@
</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/releases/2019-03/"/>
<repository location="https://download.eclipse.org/releases/2019-03/"/>
</location>
</locations>
</target>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd
View File

@ -3,6 +3,6 @@ target "jgit-4.11" with source configurePhase
include "projects/jetty-9.4.20.tpd"
include "orbit/R20190827152740-2019-09.tpd"
location "http://download.eclipse.org/releases/2019-03/" {
location "https://download.eclipse.org/releases/2019-03/" {
org.eclipse.osgi lazy
}

6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target
View File

@ -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.12" sequenceNumber="1567671414">
<target name="jgit-4.12" sequenceNumber="1638608437">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/>
@ -20,7 +20,7 @@
<unit id="org.eclipse.jetty.servlet.source" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util.source" version="9.4.20.v20190813"/>
<repository id="jetty-9.4.20" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.20.v20190813/"/>
<repository id="jetty-9.4.20" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.20.v20190813/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
@ -86,7 +86,7 @@
</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/releases/2019-06/"/>
<repository location="https://download.eclipse.org/releases/2019-06/"/>
</location>
</locations>
</target>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd
View File

@ -3,6 +3,6 @@ target "jgit-4.12" with source configurePhase
include "projects/jetty-9.4.20.tpd"
include "orbit/R20190827152740-2019-09.tpd"
location "http://download.eclipse.org/releases/2019-06/" {
location "https://download.eclipse.org/releases/2019-06/" {
org.eclipse.osgi lazy
}

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13-staging.tpd
View File

@ -1,8 +0,0 @@
target "jgit-4.13-staging" with source configurePhase
include "projects/jetty-9.4.20.tpd"
include "orbit/R20190827152740-2019-09.tpd"
location "http://download.eclipse.org/staging/2019-09/" {
org.eclipse.osgi lazy
}

6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13-staging.target → org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target
View File

@ -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.13-staging" sequenceNumber="1567671414">
<target name="jgit-4.13" sequenceNumber="1638608439">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/>
@ -20,7 +20,7 @@
<unit id="org.eclipse.jetty.servlet.source" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util.source" version="9.4.20.v20190813"/>
<repository id="jetty-9.4.20" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.20.v20190813/"/>
<repository id="jetty-9.4.20" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.20.v20190813/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
@ -86,7 +86,7 @@
</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-09/"/>
<repository location="https://download.eclipse.org/releases/2019-09/"/>
</location>
</locations>
</target>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.tpd Normal file
View File

@ -0,0 +1,8 @@
target "jgit-4.13" with source configurePhase
include "projects/jetty-9.4.20.tpd"
include "orbit/R20190827152740-2019-09.tpd"
location "https://download.eclipse.org/releases/2019-09/" {
org.eclipse.osgi lazy
}

6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
View File

@ -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="1567671414">
<target name="jgit-4.6" sequenceNumber="1638608437">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/>
@ -20,7 +20,7 @@
<unit id="org.eclipse.jetty.servlet.source" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util.source" version="9.4.20.v20190813"/>
<repository id="jetty-9.4.20" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.20.v20190813/"/>
<repository id="jetty-9.4.20" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.20.v20190813/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
@ -86,7 +86,7 @@
</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/releases/neon/"/>
<repository location="https://download.eclipse.org/releases/neon/"/>
</location>
</locations>
</target>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
View File

@ -3,6 +3,6 @@ target "jgit-4.6" with source configurePhase
include "projects/jetty-9.4.20.tpd"
include "orbit/R20190827152740-2019-09.tpd"
location "http://download.eclipse.org/releases/neon/" {
location "https://download.eclipse.org/releases/neon/" {
org.eclipse.osgi lazy
}

6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
View File

@ -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="1567671414">
<target name="jgit-4.7" sequenceNumber="1638608437">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/>
@ -20,7 +20,7 @@
<unit id="org.eclipse.jetty.servlet.source" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util.source" version="9.4.20.v20190813"/>
<repository id="jetty-9.4.20" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.20.v20190813/"/>
<repository id="jetty-9.4.20" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.20.v20190813/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
@ -86,7 +86,7 @@
</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/releases/oxygen/"/>
<repository location="https://download.eclipse.org/releases/oxygen/"/>
</location>
</locations>
</target>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd
View File

@ -3,6 +3,6 @@ target "jgit-4.7" with source configurePhase
include "projects/jetty-9.4.20.tpd"
include "orbit/R20190827152740-2019-09.tpd"
location "http://download.eclipse.org/releases/oxygen/" {
location "https://download.eclipse.org/releases/oxygen/" {
org.eclipse.osgi lazy
}

6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
View File

@ -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="1567671414">
<target name="jgit-4.8" sequenceNumber="1638608437">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/>
@ -20,7 +20,7 @@
<unit id="org.eclipse.jetty.servlet.source" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util.source" version="9.4.20.v20190813"/>
<repository id="jetty-9.4.20" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.20.v20190813/"/>
<repository id="jetty-9.4.20" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.20.v20190813/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
@ -86,7 +86,7 @@
</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/releases/photon/"/>
<repository location="https://download.eclipse.org/releases/photon/"/>
</location>
</locations>
</target>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd
View File

@ -3,6 +3,6 @@ target "jgit-4.8" with source configurePhase
include "projects/jetty-9.4.20.tpd"
include "orbit/R20190827152740-2019-09.tpd"
location "http://download.eclipse.org/releases/photon/" {
location "https://download.eclipse.org/releases/photon/" {
org.eclipse.osgi lazy
}

6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
View File

@ -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="1567671414">
<target name="jgit-4.9" sequenceNumber="1638608437">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.20.v20190813"/>
@ -20,7 +20,7 @@
<unit id="org.eclipse.jetty.servlet.source" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util" version="9.4.20.v20190813"/>
<unit id="org.eclipse.jetty.util.source" version="9.4.20.v20190813"/>
<repository id="jetty-9.4.20" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.20.v20190813/"/>
<repository id="jetty-9.4.20" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.20.v20190813/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
@ -86,7 +86,7 @@
</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/releases/2018-09/"/>
<repository location="https://download.eclipse.org/releases/2018-09/"/>
</location>
</locations>
</target>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd
View File

@ -3,6 +3,6 @@ target "jgit-4.9" with source configurePhase
include "projects/jetty-9.4.20.tpd"
include "orbit/R20190827152740-2019-09.tpd"
location "http://download.eclipse.org/releases/2018-09/" {
location "https://download.eclipse.org/releases/2018-09/" {
org.eclipse.osgi lazy
}

2
org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.20.tpd
View File

@ -1,6 +1,6 @@
target "jetty-9.4.20" with source configurePhase
location jetty-9.4.20 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.20.v20190813/" {
location jetty-9.4.20 "https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.20.v20190813/" {
org.eclipse.jetty.client [9.4.20.v20190813,9.4.20.v20190813]
org.eclipse.jetty.client.source [9.4.20.v20190813,9.4.20.v20190813]
org.eclipse.jetty.continuation [9.4.20.v20190813,9.4.20.v20190813]

4
org.eclipse.jgit.packaging/pom.xml
View File

@ -55,7 +55,7 @@
<name>JGit Tycho Parent</name>
<properties>
<tycho-version>1.4.0</tycho-version>
<tycho-version>1.7.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
<target-platform>jgit-4.6</target-platform>
</properties>
@ -313,7 +313,7 @@
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
<version>1.1.5</version>
<version>1.3.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>

2
org.eclipse.jgit.pgm.test/.settings/org.eclipse.jdt.core.prefs
View File

@ -52,7 +52,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

2
org.eclipse.jgit.test/.settings/org.eclipse.jdt.core.prefs
View File

@ -52,7 +52,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

36
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java
View File

@ -217,6 +217,12 @@ public static FileSnapshot save(Instant modified) {
/** measured FileStore attributes */
private FileStoreAttributes fileStoreAttributeCache;
/**
* if {@code true} read filesystem time resolution from configuration file
* otherwise use fallback resolution
*/
private boolean useConfig;
/**
* Object that uniquely identifies the given file, or {@code
* null} if a file key is not available
@ -253,9 +259,7 @@ protected FileSnapshot(File file) {
protected FileSnapshot(File file, boolean useConfig) {
this.file = file;
this.lastRead = Instant.now();
this.fileStoreAttributeCache = useConfig
? FS.getFileStoreAttributes(file.toPath().getParent())
: FALLBACK_FILESTORE_ATTRIBUTES;
this.useConfig = useConfig;
BasicFileAttributes fileAttributes = null;
try {
fileAttributes = FS.DETECTED.fileAttributes(file);
@ -399,7 +403,7 @@ public void setClean(FileSnapshot other) {
* if sleep was interrupted
*/
public void waitUntilNotRacy() throws InterruptedException {
long timestampResolution = fileStoreAttributeCache
long timestampResolution = fileStoreAttributeCache()
.getFsTimestampResolution().toNanos();
while (isRacyClean(Instant.now())) {
TimeUnit.NANOSECONDS.sleep(timestampResolution);
@ -436,6 +440,15 @@ public boolean equals(Object obj) {
return equals(other);
}
/**
* Check if the file exists
*
* @return true if the file exists
*/
public boolean fileExists() {
return !MISSING_FILEKEY.equals(this.fileKey);
}
/** {@inheritDoc} */
@Override
public int hashCode() {
@ -520,10 +533,10 @@ private boolean isRacyClean(Instant read) {
}
private long getEffectiveRacyThreshold() {
long timestampResolution = fileStoreAttributeCache
long timestampResolution = fileStoreAttributeCache()
.getFsTimestampResolution().toNanos();
long minRacyInterval = fileStoreAttributeCache.getMinimalRacyInterval()
.toNanos();
long minRacyInterval = fileStoreAttributeCache()
.getMinimalRacyInterval().toNanos();
long max = Math.max(timestampResolution, minRacyInterval);
// safety margin: factor 2.5 below 100ms otherwise 1.25
return max < 100_000_000L ? max * 5 / 2 : max * 5 / 4;
@ -583,4 +596,13 @@ private boolean isSizeChanged(long currSize) {
}
return changed;
}
private FileStoreAttributes fileStoreAttributeCache() {
if (fileStoreAttributeCache == null) {
fileStoreAttributeCache = useConfig
? FS.getFileStoreAttributes(file.toPath().getParent())
: FALLBACK_FILESTORE_ATTRIBUTES;
}
return fileStoreAttributeCache;
}
}

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectoryPackParser.java
View File

@ -184,7 +184,7 @@ public long getPackSize() {
String p = pack.getAbsolutePath();
String i = p.substring(0, p.length() - ".pack".length()) + ".idx"; //$NON-NLS-1$ //$NON-NLS-2$
File idx = new File(i);
if (idx.exists() && idx.isFile())
if (idx.isFile())
size += idx.length();
return size;
}

6
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
View File

@ -1124,10 +1124,14 @@ LooseRef scanRef(LooseRef ref, String name) throws IOException {
final int limit = 4096;
final byte[] buf;
FileSnapshot otherSnapshot = FileSnapshot.save(path);
if (!otherSnapshot.fileExists()) {
return null;
}
try {
buf = IO.readSome(path, limit);
} catch (FileNotFoundException noFile) {
if (path.exists() && path.isFile()) {
if (path.isFile()) {
throw noFile;
}
return null; // doesn't exist or no file; not a reference.

37
pom.xml
View File

@ -199,14 +199,15 @@
<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.1</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.61</bouncycastle-version>
<spotbugs-maven-plugin-version>3.1.12.2</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>
<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>
@ -240,7 +241,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.0</version>
<configuration>
<archive>
<manifestEntries>
@ -265,25 +266,25 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.1</version>
</plugin>
<plugin>
@ -306,7 +307,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.0</version>
</plugin>
<plugin>
@ -329,7 +330,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.12.0</version>
<version>3.15.0</version>
<configuration>
<sourceEncoding>utf-8</sourceEncoding>
<minimumTokens>100</minimumTokens>
@ -352,7 +353,7 @@
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
<version>1.1.6</version>
<version>1.3.2</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
@ -367,12 +368,12 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.4</version>
<version>0.8.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.8.2</version>
<version>3.9.1</version>
<dependencies>
<dependency><!-- add support for ssh/scp -->
<groupId>org.apache.maven.wagon</groupId>
@ -414,7 +415,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
@ -428,7 +429,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<version>3.0.0</version>
<executions>
<execution>
<id>enforce-maven</id>