motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'master' into stable-5.10 

* master:
  Update Orbit to S20201118210000 and add target for 4.18
  PacketLineIn: ensure that END != DELIM
  PacketLineIn: ensure that END != DELIM
  Allow to resolve a conflict by checking out a file
  Update Orbit to I20201111205634
  Document that setLastModified sets time of symlink target
  Fix bug in PerformanceLogContext
  Fix IOException occurring during gc

Change-Id: I2980552381d1ae61b9b2d81d7289de37d6bf4cae
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2020-11-25 17:39:25 +01:00
parent 2993b2fead b8441e1e35
commit 7eec48c444
41 changed files with 408 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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="1603879858">
<target name="jgit-4.10" sequenceNumber="1605866255">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@ -39,8 +39,8 @@
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
<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.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
@ -80,11 +80,11 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201027182932/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201118210000/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

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

@ -1,7 +1,7 @@
target "jgit-4.10" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/S20201027182932.tpd"
include "orbit/S20201118210000.tpd"
location "https://download.eclipse.org/releases/2018-12/" {
org.eclipse.osgi lazy

12
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="1603879858">
<target name="jgit-4.11" sequenceNumber="1605866333">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@ -39,8 +39,8 @@
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
<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.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
@ -80,11 +80,11 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201027182932/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201118210000/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

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

@ -1,7 +1,7 @@
target "jgit-4.11" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/S20201027182932.tpd"
include "orbit/S20201118210000.tpd"
location "https://download.eclipse.org/releases/2019-03/" {
org.eclipse.osgi lazy

12
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="1603879858">
<target name="jgit-4.12" sequenceNumber="1605866333">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@ -39,8 +39,8 @@
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
<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.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
@ -80,11 +80,11 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201027182932/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201118210000/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

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

@ -1,7 +1,7 @@
target "jgit-4.12" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/S20201027182932.tpd"
include "orbit/S20201118210000.tpd"
location "https://download.eclipse.org/releases/2019-06/" {
org.eclipse.osgi lazy

12
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" sequenceNumber="1603879858">
<target name="jgit-4.13" sequenceNumber="1605866333">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@ -39,8 +39,8 @@
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
<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.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
@ -80,11 +80,11 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201027182932/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201118210000/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

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

@ -1,7 +1,7 @@
target "jgit-4.13" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/S20201027182932.tpd"
include "orbit/S20201118210000.tpd"
location "https://download.eclipse.org/releases/2019-09/" {
org.eclipse.osgi lazy

12
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.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.14" sequenceNumber="1603879858">
<target name="jgit-4.14" sequenceNumber="1605866331">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@ -39,8 +39,8 @@
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
<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.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
@ -80,11 +80,11 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201027182932/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201118210000/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

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

@ -1,7 +1,7 @@
target "jgit-4.14" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/S20201027182932.tpd"
include "orbit/S20201118210000.tpd"
location "https://download.eclipse.org/releases/2019-12/201912181000/" {
org.eclipse.osgi lazy

12
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.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.15" sequenceNumber="1603879858">
<target name="jgit-4.15" sequenceNumber="1605866331">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@ -39,8 +39,8 @@
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
<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.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
@ -80,11 +80,11 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201027182932/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201118210000/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

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

@ -1,7 +1,7 @@
target "jgit-4.15" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/S20201027182932.tpd"
include "orbit/S20201118210000.tpd"
location "https://download.eclipse.org/releases/2020-03/202003181000/" {
org.eclipse.osgi lazy

12
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.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.16" sequenceNumber="1603879858">
<target name="jgit-4.16" sequenceNumber="1605866333">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@ -39,8 +39,8 @@
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
<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.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
@ -80,11 +80,11 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201027182932/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201118210000/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

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

@ -1,7 +1,7 @@
target "jgit-4.16" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/S20201027182932.tpd"
include "orbit/S20201118210000.tpd"
location "https://download.eclipse.org/releases/2020-06/" {
org.eclipse.osgi lazy

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

@ -1,8 +0,0 @@
target "jgit-4.17-staging" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/S20201027182932.tpd"
location "https://download.eclipse.org/staging/2020-09/" {
org.eclipse.osgi lazy
}

94
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target Normal file
View File

@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.17" sequenceNumber="1605866541">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.client.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.continuation" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.continuation.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.http" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.http.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.io" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.io.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.security" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.security.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.server" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.server.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.servlet" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.servlet.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.util" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.util.source" version="9.4.30.v20200611"/>
<repository id="jetty-9.4.30" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.30.v20200611/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<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="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
<unit id="net.bytebuddy.byte-buddy" 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="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
<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.ant" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
<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.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.4.0.v20200318-1614"/>
<unit id="org.apache.sshd.osgi.source" version="2.4.0.v20200318-1614"/>
<unit id="org.apache.sshd.sftp" version="2.4.0.v20200319-1547"/>
<unit id="org.apache.sshd.sftp.source" version="2.4.0.v20200319-1547"/>
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
<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="org.junit" version="4.13.0.v20200204-1500"/>
<unit id="org.junit.source" version="4.13.0.v20200204-1500"/>
<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.mockito" version="2.23.0.v20200310-1642"/>
<unit id="org.mockito.source" version="2.23.0.v20200310-1642"/>
<unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201118210000/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/2020-09/"/>
</location>
</locations>
</target>

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

@ -0,0 +1,8 @@
target "jgit-4.17" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/S20201118210000.tpd"
location "https://download.eclipse.org/releases/2020-09/" {
org.eclipse.osgi lazy
}

14
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17-staging.target → org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18-staging.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.17-staging" sequenceNumber="1603879858">
<target name="jgit-4.18-staging" sequenceNumber="1605866541">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@ -39,8 +39,8 @@
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
<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.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
@ -80,15 +80,15 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201027182932/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201118210000/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/staging/2020-09/"/>
<repository location="https://download.eclipse.org/staging/2020-12/"/>
</location>
</locations>
</target>

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

@ -0,0 +1,8 @@
target "jgit-4.18-staging" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/S20201118210000.tpd"
location "https://download.eclipse.org/staging/2020-12/" {
org.eclipse.osgi lazy
}

12
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="1603879858">
<target name="jgit-4.6" sequenceNumber="1605866347">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@ -39,8 +39,8 @@
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
<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.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
@ -80,11 +80,11 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201027182932/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201118210000/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

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

@ -1,7 +1,7 @@
target "jgit-4.6" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/S20201027182932.tpd"
include "orbit/S20201118210000.tpd"
location "https://download.eclipse.org/releases/neon/" {
org.eclipse.osgi lazy

12
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="1603879858">
<target name="jgit-4.7" sequenceNumber="1605866338">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@ -39,8 +39,8 @@
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
<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.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
@ -80,11 +80,11 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201027182932/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201118210000/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

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

@ -1,7 +1,7 @@
target "jgit-4.7" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/S20201027182932.tpd"
include "orbit/S20201118210000.tpd"
location "https://download.eclipse.org/releases/oxygen/" {
org.eclipse.osgi lazy

12
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="1603879858">
<target name="jgit-4.8" sequenceNumber="1605866333">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@ -39,8 +39,8 @@
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
<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.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
@ -80,11 +80,11 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201027182932/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201118210000/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

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

@ -1,7 +1,7 @@
target "jgit-4.8" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/S20201027182932.tpd"
include "orbit/S20201118210000.tpd"
location "https://download.eclipse.org/releases/photon/" {
org.eclipse.osgi lazy

12
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="1603879858">
<target name="jgit-4.9" sequenceNumber="1605866333">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@ -39,8 +39,8 @@
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
<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.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
@ -80,11 +80,11 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201016-1131"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201027182932/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20201118210000/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

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

@ -1,7 +1,7 @@
target "jgit-4.9" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/S20201027182932.tpd"
include "orbit/S20201118210000.tpd"
location "https://download.eclipse.org/releases/2018-09/" {
org.eclipse.osgi lazy

12
org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20201027182932.tpd → org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20201118210000.tpd
View File

@ -1,7 +1,7 @@
target "S20201027182932" with source configurePhase
target "S20201118210000" with source configurePhase
// see https://download.eclipse.org/tools/orbit/downloads/
location "https://download.eclipse.org/tools/orbit/downloads/drops/S20201027182932/repository" {
location "https://download.eclipse.org/tools/orbit/downloads/drops/S20201118210000/repository" {
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]
@ -18,8 +18,8 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/S202010271829
net.bytebuddy.byte-buddy.source [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
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.ant [1.10.8.v20200515-1239,1.10.8.v20200515-1239]
org.apache.ant.source [1.10.8.v20200515-1239,1.10.8.v20200515-1239]
org.apache.ant [1.10.9.v20201106-1946,1.10.9.v20201106-1946]
org.apache.ant.source [1.10.9.v20201106-1946,1.10.9.v20201106-1946]
org.apache.commons.codec [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
org.apache.commons.codec.source [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
org.apache.commons.compress [1.19.0.v20200106-2343,1.19.0.v20200106-2343]
@ -59,8 +59,8 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/S202010271829
org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
org.slf4j.api [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
org.slf4j.api.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
org.slf4j.binding.log4j12 [1.7.30.v20201016-1131,1.7.30.v20201016-1131]
org.slf4j.binding.log4j12.source [1.7.30.v20201016-1131,1.7.30.v20201016-1131]
org.slf4j.binding.log4j12 [1.7.30.v20201108-2042,1.7.30.v20201108-2042]
org.slf4j.binding.log4j12.source [1.7.30.v20201108-2042,1.7.30.v20201108-2042]
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]
}

13
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PathCheckoutCommandTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2011, Kevin Sawicki <kevin@github.com> and others
* Copyright (C) 2011, 2020 Kevin Sawicki <kevin@github.com> and others
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0 which is available at
@ -24,6 +24,7 @@
import org.eclipse.jgit.errors.NoWorkTreeException;
import org.eclipse.jgit.junit.RepositoryTestCase;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectReader;
import org.eclipse.jgit.lib.RepositoryState;
import org.eclipse.jgit.lib.StoredConfig;
@ -309,6 +310,16 @@ public void testCheckoutTheirs() throws Exception {
assertStageOneToThree(FILE1);
}
@Test
public void testCheckoutFileWithConflict() throws Exception {
setupConflictingState();
assertEquals('[' + FILE1 + ']',
git.status().call().getConflicting().toString());
git.checkout().setStartPoint(Constants.HEAD).addPath(FILE1).call();
assertEquals("3", read(FILE1));
assertTrue(git.status().call().isClean());
}
@Test
public void testCheckoutOursWhenNoBase() throws Exception {
String file = "added.txt";

40
org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheEntryTest.java
View File

@ -241,6 +241,46 @@ public void testSetFileMode() {
}
}
@Test
public void testSetStage() {
DirCacheEntry e = new DirCacheEntry("some/path", DirCacheEntry.STAGE_1);
e.setAssumeValid(true);
e.setCreationTime(2L);
e.setFileMode(FileMode.EXECUTABLE_FILE);
e.setLastModified(EPOCH.plusMillis(3L));
e.setLength(100L);
e.setObjectId(ObjectId
.fromString("0123456789012345678901234567890123456789"));
e.setUpdateNeeded(true);
e.setStage(DirCacheEntry.STAGE_2);
assertTrue(e.isAssumeValid());
assertEquals(2L, e.getCreationTime());
assertEquals(
ObjectId.fromString("0123456789012345678901234567890123456789"),
e.getObjectId());
assertEquals(FileMode.EXECUTABLE_FILE, e.getFileMode());
assertEquals(EPOCH.plusMillis(3L), e.getLastModifiedInstant());
assertEquals(100L, e.getLength());
assertEquals(DirCacheEntry.STAGE_2, e.getStage());
assertTrue(e.isUpdateNeeded());
assertEquals("some/path", e.getPathString());
e.setStage(DirCacheEntry.STAGE_0);
assertTrue(e.isAssumeValid());
assertEquals(2L, e.getCreationTime());
assertEquals(
ObjectId.fromString("0123456789012345678901234567890123456789"),
e.getObjectId());
assertEquals(FileMode.EXECUTABLE_FILE, e.getFileMode());
assertEquals(EPOCH.plusMillis(3L), e.getLastModifiedInstant());
assertEquals(100L, e.getLength());
assertEquals(DirCacheEntry.STAGE_0, e.getStage());
assertTrue(e.isUpdateNeeded());
assertEquals("some/path", e.getPathString());
}
@Test
public void testCopyMetaDataWithStage() {
copyMetaDataHelper(false);

28
org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCachePathEditTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2011, Robin Rosenberg and others
* Copyright (C) 2011, 2020 Robin Rosenberg and others
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0 which is available at
@ -123,6 +123,32 @@ public void testPathEditShouldBeCalledForEachStage() throws Exception {
assertEquals(DirCacheEntry.STAGE_3, entries.get(2).getStage());
}
@Test
public void testPathEditWithStagesAndReset() throws Exception {
DirCache dc = DirCache.newInCore();
DirCacheBuilder builder = new DirCacheBuilder(dc, 3);
builder.add(createEntry("a", DirCacheEntry.STAGE_1));
builder.add(createEntry("a", DirCacheEntry.STAGE_2));
builder.add(createEntry("a", DirCacheEntry.STAGE_3));
builder.finish();
DirCacheEditor editor = dc.editor();
PathEdit edit = new PathEdit("a") {
@Override
public void apply(DirCacheEntry ent) {
ent.setStage(DirCacheEntry.STAGE_0);
}
};
editor.add(edit);
editor.finish();
assertEquals(1, dc.getEntryCount());
DirCacheEntry entry = dc.getEntry(0);
assertEquals("a", entry.getPathString());
assertEquals(DirCacheEntry.STAGE_0, entry.getStage());
}
@Test
public void testFileReplacesTree() throws Exception {
DirCache dc = DirCache.newInCore();

23
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcBasicPackingTest.java
View File

@ -79,6 +79,29 @@ public void testPack2Commits(boolean aggressive) throws Exception {
assertEquals(2, stats.numberOfBitmaps);
}
@Theory
public void testPack2Commits_noPackFolder(boolean aggressive) throws Exception {
File packDir = repo.getObjectDatabase().getPackDirectory();
assertTrue(packDir.delete());
BranchBuilder bb = tr.branch("refs/heads/master");
bb.commit().add("A", "A").add("B", "B").create();
bb.commit().add("A", "A2").add("B", "B2").create();
stats = gc.getStatistics();
assertEquals(8, stats.numberOfLooseObjects);
assertEquals(0, stats.numberOfPackedObjects);
configureGc(gc, aggressive);
gc.gc();
stats = gc.getStatistics();
assertEquals(0, stats.numberOfLooseObjects);
assertEquals(8, stats.numberOfPackedObjects);
assertEquals(1, stats.numberOfPackFiles);
assertEquals(2, stats.numberOfBitmaps);
assertTrue(packDir.exists());
}
@Theory
public void testPackAllObjectsInOnePack(boolean aggressive)
throws Exception {

45
org.eclipse.jgit.test/tst/org/eclipse/jgit/logging/PerformanceLogContextTest.java
View File

@ -1,6 +1,7 @@
package org.eclipse.jgit.logging;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
@ -37,30 +38,58 @@ public void testCleanEvents() {
}
@Test
public void testAddEventsTwoThreads() {
TestRunnable thread1 = new TestRunnable("record1", 1);
TestRunnable thread2 = new TestRunnable("record2", 2);
public void testAddEventsTwoThreads() throws InterruptedException {
TestRunnable runnable1 = new TestRunnable("record1", 1);
TestRunnable runnable2 = new TestRunnable("record2", 2);
new Thread(thread1).start();
new Thread(thread2).start();
Thread thread1 = new Thread(runnable1);
Thread thread2 = new Thread(runnable2);
thread1.start();
thread2.start();
thread1.join();
thread2.join();
assertEquals(1, runnable1.getEventRecordsCount());
assertEquals(1, runnable2.getEventRecordsCount());
assertFalse(runnable1.isThrown());
assertFalse(runnable2.isThrown());
}
private static class TestRunnable implements Runnable {
private String name;
private long durationMs;
private long eventRecordsCount;
private boolean thrown = false;
public TestRunnable(String name, long durationMs) {
this.name = name;
this.durationMs = durationMs;
}
public boolean isThrown() {
return thrown;
}
public long getEventRecordsCount() {
return eventRecordsCount;
}
@Override
public void run() {
PerformanceLogRecord record = new PerformanceLogRecord(name,
durationMs);
PerformanceLogContext.getInstance().addEvent(record);
assertEquals(1, PerformanceLogContext.getInstance()
.getEventRecords().size());
try {
PerformanceLogContext.getInstance().addEvent(record);
eventRecordsCount = PerformanceLogContext.getInstance()
.getEventRecords().size();
PerformanceLogContext.getInstance().cleanEvents();
} catch (Exception e) {
thrown = true;
}
}
}
}

7
org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2010, Chris Aniszczyk <caniszczyk@gmail.com>
* Copyright (C) 2011, Matthias Sohn <matthias.sohn@sap.com> and others
* Copyright (C) 2011, 2020 Matthias Sohn <matthias.sohn@sap.com> and others
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0 which is available at
@ -503,6 +503,11 @@ private void checkoutPathsFromCommit(TreeWalk treeWalk, DirCache dc,
editor.add(new PathEdit(path) {
@Override
public void apply(DirCacheEntry ent) {
if (ent.getStage() != DirCacheEntry.STAGE_0) {
// A checkout on a conflicting file stages the checked
// out file and resolves the conflict.
ent.setStage(DirCacheEntry.STAGE_0);
}
ent.setObjectId(blobId);
ent.setFileMode(mode);
checkoutPath(ent, r,

32
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEditor.java
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2008-2009, Google Inc.
* Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org> and others
* Copyright (C) 2008, 2009, Google Inc.
* Copyright (C) 2008, 2020 Shawn O. Pearce <spearce@spearce.org> and others
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0 which is available at
@ -139,10 +139,28 @@ private void applyEdits() {
: eIdx;
fastAdd(ent);
} else {
// Apply to all entries of the current path (different stages)
lastIdx = cache.nextEntry(eIdx);
for (int i = eIdx; i < lastIdx; i++) {
final DirCacheEntry ent = cache.getEntry(i);
if (lastIdx > eIdx + 1) {
// Apply to all entries of the current path (different
// stages). If any apply() resets the stage to STAGE_0, take
// only that entry and omit all others.
DirCacheEntry[] tmp = new DirCacheEntry[lastIdx - eIdx];
int n = 0;
for (int i = eIdx; i < lastIdx; i++) {
DirCacheEntry ent = cache.getEntry(i);
e.apply(ent);
if (ent.getStage() == DirCacheEntry.STAGE_0) {
fastAdd(ent);
n = 0;
break;
}
tmp[n++] = ent;
}
for (int i = 0; i < n; i++) {
fastAdd(tmp[i]);
}
} else {
DirCacheEntry ent = cache.getEntry(eIdx);
e.apply(ent);
fastAdd(ent);
}
@ -257,7 +275,9 @@ private static int pdir(byte[] path, int e) {
* {@link #apply(DirCacheEntry)} method. The editor will invoke apply once
* for each record in the index which matches the path name. If there are
* multiple records (for example in stages 1, 2 and 3), the edit instance
* will be called multiple times, once for each stage.
* will be called multiple times, once for each stage. If any of these calls
* resets the stage to 0, only this entry will be taken and entries for
* other stages are discarded.
*/
public abstract static class PathEdit {
final byte[] path;

18
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java
View File

@ -541,6 +541,24 @@ public int getStage() {
return (info[infoOffset + P_FLAGS] >>> 4) & 0x3;
}
/**
* Sets the stage of an entry.
*
* @param stage
* to set, in the range [0..3]
* @throws IllegalArgumentException
* if the stage is outside the range [0..3]
* @since 5.10
*/
public void setStage(int stage) {
if ((stage & ~0x3) != 0) {
throw new IllegalArgumentException(
"Invalid stage, must be in range [0..3]"); //$NON-NLS-1$
}
byte flags = info[infoOffset + P_FLAGS];
info[infoOffset + P_FLAGS] = (byte) ((flags & 0xCF) | (stage << 4));
}
/**
* Returns whether this entry should be skipped from the working tree.
*

1
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
View File

@ -1166,6 +1166,7 @@ private PackFile writePack(@NonNull Set<? extends ObjectId> want,
// create temporary files
String id = pw.computeName().getName();
File packdir = repo.getObjectDatabase().getPackDirectory();
packdir.mkdirs();
tmpPack = File.createTempFile("gc_", ".pack_tmp", packdir); //$NON-NLS-1$ //$NON-NLS-2$
final String tmpBase = tmpPack.getName()
.substring(0, tmpPack.getName().lastIndexOf('.'));

6
org.eclipse.jgit/src/org/eclipse/jgit/logging/PerformanceLogContext.java
View File

@ -24,10 +24,10 @@ public class PerformanceLogContext {
private static final PerformanceLogContext INSTANCE = new PerformanceLogContext();
/** List that stores events as performance logs. */
private final ThreadLocal<List<PerformanceLogRecord>> eventRecords = new ThreadLocal<>();
private static final ThreadLocal<List<PerformanceLogRecord>> eventRecords = ThreadLocal
.withInitial(ArrayList::new);
private PerformanceLogContext() {
eventRecords.set(new ArrayList<>());
}
/**
@ -62,6 +62,6 @@ public void addEvent(PerformanceLogRecord record) {
* Removes all of the existing records from the current list of events.
*/
public void cleanEvents() {
eventRecords.get().clear();
eventRecords.remove();
}
}

10
org.eclipse.jgit/src/org/eclipse/jgit/transport/PacketLineIn.java
View File

@ -1,7 +1,7 @@
/*
* Copyright (C) 2008-2010, Google Inc.
* Copyright (C) 2008-2009, Robin Rosenberg <robin.rosenberg@dewire.com>
* Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org> and others
* Copyright (C) 2008, 2010 Google Inc.
* Copyright (C) 2008, 2009 Robin Rosenberg <robin.rosenberg@dewire.com>
* Copyright (C) 2008, 2020 Shawn O. Pearce <spearce@spearce.org> and others
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0 which is available at
@ -50,7 +50,7 @@ public class PacketLineIn {
* strings in the input stream until the marker is reached.
*/
@Deprecated
public static final String END = new StringBuilder(0).toString(); /* must not string pool */
public static final String END = new String(); /* must not string pool */
/**
* Magic return from {@link #readString()} when a delim packet is found.
@ -60,7 +60,7 @@ public class PacketLineIn {
* string is the delimiter.
*/
@Deprecated
public static final String DELIM = new StringBuilder(0).toString(); /* must not string pool */
public static final String DELIM = new String(); /* must not string pool */
enum AckNackResult {
/** NAK */

10
org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
View File

@ -1080,8 +1080,9 @@ public Instant lastModifiedInstant(File f) {
}
/**
* Set the last modified time of a file system object. If the OS/JRE support
* symbolic links, the link is modified, not the target,
* Set the last modified time of a file system object.
* <p>
* For symlinks it sets the modified time of the link target.
*
* @param f
* a {@link java.io.File} object.
@ -1097,8 +1098,9 @@ public void setLastModified(File f, long time) throws IOException {
}
/**
* Set the last modified time of a file system object. If the OS/JRE support
* symbolic links, the link is modified, not the target,
* Set the last modified time of a file system object.
* <p>
* For symlinks it sets the modified time of the link target.
*
* @param p
* a {@link Path} object.

4
org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java
View File

@ -710,6 +710,8 @@ static BasicFileAttributes fileAttributes(File file) throws IOException {
}
/**
* Set the last modified time of a file system object.
*
* @param file
* @param time
* @throws IOException
@ -720,6 +722,8 @@ static void setLastModified(File file, long time) throws IOException {
}
/**
* Set the last modified time of a file system object.
*
* @param path
* @param time
* @throws IOException