Merge branch 'master' into stable-5.12
* master: Update Orbit to S20210518003616 and ant to 1.10.10.v20210426-1926 Skip detecting content renames for binary files RepoCommand: Retry commit on LockFailure Finish upgrading eclipse-jarsigner-plugin to 1.3.1 Upgrade maven-javadoc-plugin to 3.3.0 Update maven-project-info-reports-plugin to 3.1.2 Update spotbugs-maven-plugin to 4.2.3 Change-Id: I3b77b0ef21bdf69a3009fb64af0d23d79b518009
This commit is contained in:
Matthias Sohn
commit
3171c26244
|
|
@ -38,7 +38,7 @@
|
|||
<dependency>
|
||||
<groupId>org.apache.ant</groupId>
|
||||
<artifactId>ant</artifactId>
|
||||
<version>1.10.8</version>
|
||||
<version>1.10.10</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-project-info-reports-plugin</artifactId>
|
||||
<version>3.1.1</version>
|
||||
<version>3.1.2</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
|
|
|
|||
|
|
@ -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="1619186290">
|
||||
<target name="jgit-4.10" sequenceNumber="1622499418">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
|
||||
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
|
|
@ -41,8 +41,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.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<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"/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<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/S20210406213021/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.10" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/S20210406213021.tpd"
|
||||
include "orbit/S20210518003616.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2018-12/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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="1619186290">
|
||||
<target name="jgit-4.11" sequenceNumber="1622499418">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
|
||||
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
|
|
@ -41,8 +41,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.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<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"/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<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/S20210406213021/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.11" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/S20210406213021.tpd"
|
||||
include "orbit/S20210518003616.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2019-03/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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="1619186290">
|
||||
<target name="jgit-4.12" sequenceNumber="1622499419">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
|
||||
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
|
|
@ -41,8 +41,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.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<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"/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<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/S20210406213021/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.12" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/S20210406213021.tpd"
|
||||
include "orbit/S20210518003616.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2019-06/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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="1619186290">
|
||||
<target name="jgit-4.13" sequenceNumber="1622499419">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
|
||||
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
|
|
@ -41,8 +41,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.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<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"/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<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/S20210406213021/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.13" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/S20210406213021.tpd"
|
||||
include "orbit/S20210518003616.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2019-09/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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="1619186289">
|
||||
<target name="jgit-4.14" sequenceNumber="1622499415">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
|
||||
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
|
|
@ -41,8 +41,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.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<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"/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<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/S20210406213021/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.14" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/S20210406213021.tpd"
|
||||
include "orbit/S20210518003616.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2019-12/201912181000/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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="1619186289">
|
||||
<target name="jgit-4.15" sequenceNumber="1622499415">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
|
||||
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
|
|
@ -41,8 +41,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.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<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"/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<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/S20210406213021/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.15" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/S20210406213021.tpd"
|
||||
include "orbit/S20210518003616.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2020-03/202003181000/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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="1619186290">
|
||||
<target name="jgit-4.16" sequenceNumber="1622499415">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
|
||||
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
|
|
@ -41,8 +41,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.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<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"/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<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/S20210406213021/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.16" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/S20210406213021.tpd"
|
||||
include "orbit/S20210518003616.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2020-06/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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" sequenceNumber="1619186290">
|
||||
<target name="jgit-4.17" sequenceNumber="1622499415">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
|
||||
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
|
|
@ -41,8 +41,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.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<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"/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<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/S20210406213021/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.17" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/S20210406213021.tpd"
|
||||
include "orbit/S20210518003616.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2020-09/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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.18" sequenceNumber="1619186290">
|
||||
<target name="jgit-4.18" sequenceNumber="1622499415">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
|
||||
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
|
|
@ -41,8 +41,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.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<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"/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<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/S20210406213021/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.18" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/S20210406213021.tpd"
|
||||
include "orbit/S20210518003616.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2020-12/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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.19-staging" sequenceNumber="1619186288">
|
||||
<target name="jgit-4.19-staging" sequenceNumber="1622499415">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
|
||||
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
|
|
@ -41,8 +41,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.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<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"/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<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/S20210406213021/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.19-staging" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/S20210406213021.tpd"
|
||||
include "orbit/S20210518003616.tpd"
|
||||
|
||||
location "https://download.eclipse.org/staging/2021-03/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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.20-staging" sequenceNumber="1619186291">
|
||||
<target name="jgit-4.20-staging" sequenceNumber="1622499415">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
|
||||
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
|
|
@ -41,8 +41,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.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<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"/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<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/S20210406213021/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.20-staging" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/S20210406213021.tpd"
|
||||
include "orbit/S20210518003616.tpd"
|
||||
|
||||
location "https://download.eclipse.org/staging/2021-06/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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="1619186309">
|
||||
<target name="jgit-4.6" sequenceNumber="1622499455">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
|
||||
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
|
|
@ -41,8 +41,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.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<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"/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<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/S20210406213021/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.6" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/S20210406213021.tpd"
|
||||
include "orbit/S20210518003616.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/neon/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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="1619186297">
|
||||
<target name="jgit-4.7" sequenceNumber="1622499436">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
|
||||
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
|
|
@ -41,8 +41,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.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<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"/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<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/S20210406213021/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.7" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/S20210406213021.tpd"
|
||||
include "orbit/S20210518003616.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/oxygen/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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="1619186290">
|
||||
<target name="jgit-4.8" sequenceNumber="1622499418">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
|
||||
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
|
|
@ -41,8 +41,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.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<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"/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<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/S20210406213021/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.8" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/S20210406213021.tpd"
|
||||
include "orbit/S20210518003616.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/photon/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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="1619186290">
|
||||
<target name="jgit-4.9" sequenceNumber="1622499419">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
|
||||
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
|
|
@ -41,8 +41,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.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<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"/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<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/S20210406213021/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.9" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/S20210406213021.tpd"
|
||||
include "orbit/S20210518003616.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2018-09/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "S20210406213021" with source configurePhase
|
||||
target "S20210518003616" with source configurePhase
|
||||
// see https://download.eclipse.org/tools/orbit/downloads/
|
||||
|
||||
location "https://download.eclipse.org/tools/orbit/downloads/drops/S20210406213021/repository" {
|
||||
location "https://download.eclipse.org/tools/orbit/downloads/drops/S20210518003616/repository" {
|
||||
com.google.gson [2.8.6.v20201231-1626,2.8.6.v20201231-1626]
|
||||
com.google.gson.source [2.8.6.v20201231-1626,2.8.6.v20201231-1626]
|
||||
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/S202104062130
|
|||
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.9.v20201106-1946,1.10.9.v20201106-1946]
|
||||
org.apache.ant.source [1.10.9.v20201106-1946,1.10.9.v20201106-1946]
|
||||
org.apache.ant [1.10.10.v20210426-1926,1.10.10.v20210426-1926]
|
||||
org.apache.ant.source [1.10.10.v20210426-1926,1.10.10.v20210426-1926]
|
||||
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]
|
||||
|
|
@ -579,6 +579,57 @@ public void testInexactRename_LargeFile() throws Exception {
|
|||
assertDelete(PATH_Q, bId, FileMode.REGULAR_FILE, entries.get(1));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testExactRenameForBinaryFile_isIdentified() throws Exception {
|
||||
ObjectId aId = blob("a\nb\nc\n\0\0\0\0d\n");
|
||||
|
||||
DiffEntry a = DiffEntry.add(PATH_A, aId);
|
||||
DiffEntry b = DiffEntry.delete(PATH_Q, aId);
|
||||
|
||||
rd.add(a);
|
||||
rd.add(b);
|
||||
|
||||
List<DiffEntry> entries = rd.compute();
|
||||
assertEquals(1, entries.size());
|
||||
assertRename(b, a, 100, entries.get(0));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testInexactRenameForBinaryFile_identifiedByDefault() throws Exception {
|
||||
ObjectId aId = blob("a\nb\nc\n\0\0\0\0d\n");
|
||||
ObjectId bId = blob("a\nb\nc\n\0\0\0d\n");
|
||||
|
||||
DiffEntry a = DiffEntry.add(PATH_A, aId);
|
||||
DiffEntry b = DiffEntry.delete(PATH_Q, bId);
|
||||
|
||||
rd.add(a);
|
||||
rd.add(b);
|
||||
rd.setRenameScore(40);
|
||||
|
||||
List<DiffEntry> entries = rd.compute();
|
||||
assertEquals(1, entries.size());
|
||||
assertRename(b, a, 50, entries.get(0));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testInexactRenameForBinaryFile_notIdentifiedIfSkipParameterSet() throws Exception {
|
||||
ObjectId aId = blob("a\nb\nc\n\0\0\0\0d\n");
|
||||
ObjectId bId = blob("a\nb\nc\n\0\0\0d\n");
|
||||
|
||||
DiffEntry a = DiffEntry.add(PATH_A, aId);
|
||||
DiffEntry b = DiffEntry.delete(PATH_Q, bId);
|
||||
|
||||
rd.add(a);
|
||||
rd.add(b);
|
||||
rd.setRenameScore(40);
|
||||
rd.setSkipContentRenamesForBinaryFiles(true);
|
||||
|
||||
List<DiffEntry> entries = rd.compute();
|
||||
assertEquals(2, entries.size());
|
||||
assertAdd(PATH_A, aId, FileMode.REGULAR_FILE, entries.get(0));
|
||||
assertDelete(PATH_Q, bId, FileMode.REGULAR_FILE, entries.get(1));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSetRenameScore_IllegalArgs() throws Exception {
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -104,6 +104,13 @@ private int sortOf(ChangeType changeType) {
|
|||
*/
|
||||
private int bigFileThreshold = DEFAULT_BIG_FILE_THRESHOLD;
|
||||
|
||||
/**
|
||||
* Skip detecting content renames for binary files. Content renames are
|
||||
* those that are not exact, that is with a slight content modification
|
||||
* between the two files.
|
||||
*/
|
||||
private boolean skipContentRenamesForBinaryFiles = false;
|
||||
|
||||
/** Set if the number of adds or deletes was over the limit. */
|
||||
private boolean overRenameLimit;
|
||||
|
||||
|
|
@ -235,6 +242,26 @@ public void setBigFileThreshold(int threshold) {
|
|||
this.bigFileThreshold = threshold;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get skipping detecting content renames for binary files.
|
||||
*
|
||||
* @return true if content renames should be skipped for binary files, false otherwise.
|
||||
* @since 5.12
|
||||
*/
|
||||
public boolean getSkipContentRenamesForBinaryFiles() {
|
||||
return skipContentRenamesForBinaryFiles;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets skipping detecting content renames for binary files.
|
||||
*
|
||||
* @param value true if content renames should be skipped for binary files, false otherwise.
|
||||
* @since 5.12
|
||||
*/
|
||||
public void setSkipContentRenamesForBinaryFiles(boolean value) {
|
||||
this.skipContentRenamesForBinaryFiles = value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the detector is over the rename limit.
|
||||
* <p>
|
||||
|
|
@ -521,6 +548,7 @@ private void findContentRenames(ContentSource.Pair reader,
|
|||
d = new SimilarityRenameDetector(reader, deleted, added);
|
||||
d.setRenameScore(getRenameScore());
|
||||
d.setBigFileThreshold(getBigFileThreshold());
|
||||
d.setSkipBinaryFiles(getSkipContentRenamesForBinaryFiles());
|
||||
d.compute(pm);
|
||||
overRenameLimit |= d.isTableOverflow();
|
||||
deleted = d.getLeftOverSources();
|
||||
|
|
|
|||
|
|
@ -102,6 +102,15 @@ public static SimilarityIndex create(ObjectLoader obj) throws IOException,
|
|||
idGrowAt = growAt(idHashBits);
|
||||
}
|
||||
|
||||
static boolean isBinary(ObjectLoader obj) throws IOException {
|
||||
if (obj.isLarge()) {
|
||||
try (ObjectStream in1 = obj.openStream()) {
|
||||
return RawText.isBinary(in1);
|
||||
}
|
||||
}
|
||||
return RawText.isBinary(obj.getCachedBytes());
|
||||
}
|
||||
|
||||
void hash(ObjectLoader obj) throws MissingObjectException, IOException,
|
||||
TableFullException {
|
||||
if (obj.isLarge()) {
|
||||
|
|
@ -115,9 +124,7 @@ void hash(ObjectLoader obj) throws MissingObjectException, IOException,
|
|||
private void hashLargeObject(ObjectLoader obj) throws IOException,
|
||||
TableFullException {
|
||||
boolean text;
|
||||
try (ObjectStream in1 = obj.openStream()) {
|
||||
text = !RawText.isBinary(in1);
|
||||
}
|
||||
text = !isBinary(obj);
|
||||
|
||||
try (ObjectStream in2 = obj.openStream()) {
|
||||
hash(in2, in2.getSize(), text);
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
import org.eclipse.jgit.internal.JGitText;
|
||||
import org.eclipse.jgit.lib.FileMode;
|
||||
import org.eclipse.jgit.lib.NullProgressMonitor;
|
||||
import org.eclipse.jgit.lib.ObjectLoader;
|
||||
import org.eclipse.jgit.lib.ProgressMonitor;
|
||||
|
||||
class SimilarityRenameDetector {
|
||||
|
|
@ -87,6 +88,9 @@ class SimilarityRenameDetector {
|
|||
*/
|
||||
private int bigFileThreshold = DEFAULT_BIG_FILE_THRESHOLD;
|
||||
|
||||
/** Skip content renames for binary files. */
|
||||
private boolean skipBinaryFiles = false;
|
||||
|
||||
/** Set if any {@link SimilarityIndex.TableFullException} occurs. */
|
||||
private boolean tableOverflow;
|
||||
|
||||
|
|
@ -107,6 +111,10 @@ void setBigFileThreshold(int threshold) {
|
|||
bigFileThreshold = threshold;
|
||||
}
|
||||
|
||||
void setSkipBinaryFiles(boolean value) {
|
||||
skipBinaryFiles = value;
|
||||
}
|
||||
|
||||
void compute(ProgressMonitor pm) throws IOException, CancelledException {
|
||||
if (pm == null)
|
||||
pm = NullProgressMonitor.INSTANCE;
|
||||
|
|
@ -271,7 +279,12 @@ private int buildMatrix(ProgressMonitor pm)
|
|||
|
||||
if (s == null) {
|
||||
try {
|
||||
s = hash(OLD, srcEnt);
|
||||
ObjectLoader loader = reader.open(OLD, srcEnt);
|
||||
if (skipBinaryFiles && SimilarityIndex.isBinary(loader)) {
|
||||
pm.update(1);
|
||||
continue SRC;
|
||||
}
|
||||
s = hash(loader);
|
||||
} catch (TableFullException tableFull) {
|
||||
tableOverflow = true;
|
||||
continue SRC;
|
||||
|
|
@ -280,7 +293,12 @@ private int buildMatrix(ProgressMonitor pm)
|
|||
|
||||
SimilarityIndex d;
|
||||
try {
|
||||
d = hash(NEW, dstEnt);
|
||||
ObjectLoader loader = reader.open(NEW, dstEnt);
|
||||
if (skipBinaryFiles && SimilarityIndex.isBinary(loader)) {
|
||||
pm.update(1);
|
||||
continue;
|
||||
}
|
||||
d = hash(loader);
|
||||
} catch (TableFullException tableFull) {
|
||||
if (dstTooLarge == null)
|
||||
dstTooLarge = new BitSet(dsts.size());
|
||||
|
|
@ -364,10 +382,10 @@ static int nameScore(String a, String b) {
|
|||
return (((dirScoreLtr + dirScoreRtl) * 25) + (fileScore * 50)) / 100;
|
||||
}
|
||||
|
||||
private SimilarityIndex hash(DiffEntry.Side side, DiffEntry ent)
|
||||
private SimilarityIndex hash(ObjectLoader objectLoader)
|
||||
throws IOException, TableFullException {
|
||||
SimilarityIndex r = new SimilarityIndex();
|
||||
r.hash(reader.open(side, ent));
|
||||
r.hash(objectLoader);
|
||||
r.sort();
|
||||
return r;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,6 +80,13 @@
|
|||
* @since 3.4
|
||||
*/
|
||||
public class RepoCommand extends GitCommand<RevCommit> {
|
||||
private static final int LOCK_FAILURE_MAX_RETRIES = 5;
|
||||
|
||||
// Retry exponentially with delays in this range
|
||||
private static final int LOCK_FAILURE_MIN_RETRY_DELAY_MILLIS = 50;
|
||||
|
||||
private static final int LOCK_FAILURE_MAX_RETRY_DELAY_MILLIS = 5000;
|
||||
|
||||
private String manifestPath;
|
||||
private String baseUri;
|
||||
private URI targetUri;
|
||||
|
|
@ -686,50 +693,22 @@ public RevCommit call() throws GitAPIException {
|
|||
builder.finish();
|
||||
ObjectId treeId = index.writeTree(inserter);
|
||||
|
||||
// Create a Commit object, populate it and write it
|
||||
ObjectId headId = repo.resolve(targetBranch + "^{commit}"); //$NON-NLS-1$
|
||||
if (headId != null && rw.parseCommit(headId).getTree().getId().equals(treeId)) {
|
||||
// No change. Do nothing.
|
||||
return rw.parseCommit(headId);
|
||||
long prevDelay = 0;
|
||||
for (int i = 0; i < LOCK_FAILURE_MAX_RETRIES - 1; i++) {
|
||||
try {
|
||||
return commitTreeOnCurrentTip(
|
||||
inserter, rw, treeId);
|
||||
} catch (ConcurrentRefUpdateException e) {
|
||||
prevDelay = FileUtils.delay(prevDelay,
|
||||
LOCK_FAILURE_MIN_RETRY_DELAY_MILLIS,
|
||||
LOCK_FAILURE_MAX_RETRY_DELAY_MILLIS);
|
||||
Thread.sleep(prevDelay);
|
||||
repo.getRefDatabase().refresh();
|
||||
}
|
||||
}
|
||||
|
||||
CommitBuilder commit = new CommitBuilder();
|
||||
commit.setTreeId(treeId);
|
||||
if (headId != null)
|
||||
commit.setParentIds(headId);
|
||||
commit.setAuthor(author);
|
||||
commit.setCommitter(author);
|
||||
commit.setMessage(RepoText.get().repoCommitMessage);
|
||||
|
||||
ObjectId commitId = inserter.insert(commit);
|
||||
inserter.flush();
|
||||
|
||||
RefUpdate ru = repo.updateRef(targetBranch);
|
||||
ru.setNewObjectId(commitId);
|
||||
ru.setExpectedOldObjectId(headId != null ? headId : ObjectId.zeroId());
|
||||
Result rc = ru.update(rw);
|
||||
|
||||
switch (rc) {
|
||||
case NEW:
|
||||
case FORCED:
|
||||
case FAST_FORWARD:
|
||||
// Successful. Do nothing.
|
||||
break;
|
||||
case REJECTED:
|
||||
case LOCK_FAILURE:
|
||||
throw new ConcurrentRefUpdateException(
|
||||
MessageFormat.format(
|
||||
JGitText.get().cannotLock, targetBranch),
|
||||
ru.getRef(),
|
||||
rc);
|
||||
default:
|
||||
throw new JGitInternalException(MessageFormat.format(
|
||||
JGitText.get().updatingRefFailed,
|
||||
targetBranch, commitId.name(), rc));
|
||||
}
|
||||
|
||||
return rw.parseCommit(commitId);
|
||||
} catch (GitAPIException | IOException e) {
|
||||
// In the last try, just propagate the exceptions
|
||||
return commitTreeOnCurrentTip(inserter, rw, treeId);
|
||||
} catch (GitAPIException | IOException | InterruptedException e) {
|
||||
throw new ManifestErrorException(e);
|
||||
}
|
||||
}
|
||||
|
|
@ -746,6 +725,51 @@ public RevCommit call() throws GitAPIException {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
private RevCommit commitTreeOnCurrentTip(ObjectInserter inserter,
|
||||
RevWalk rw, ObjectId treeId)
|
||||
throws IOException, ConcurrentRefUpdateException {
|
||||
ObjectId headId = repo.resolve(targetBranch + "^{commit}"); //$NON-NLS-1$
|
||||
if (headId != null && rw.parseCommit(headId).getTree().getId().equals(treeId)) {
|
||||
// No change. Do nothing.
|
||||
return rw.parseCommit(headId);
|
||||
}
|
||||
|
||||
CommitBuilder commit = new CommitBuilder();
|
||||
commit.setTreeId(treeId);
|
||||
if (headId != null)
|
||||
commit.setParentIds(headId);
|
||||
commit.setAuthor(author);
|
||||
commit.setCommitter(author);
|
||||
commit.setMessage(RepoText.get().repoCommitMessage);
|
||||
|
||||
ObjectId commitId = inserter.insert(commit);
|
||||
inserter.flush();
|
||||
|
||||
RefUpdate ru = repo.updateRef(targetBranch);
|
||||
ru.setNewObjectId(commitId);
|
||||
ru.setExpectedOldObjectId(headId != null ? headId : ObjectId.zeroId());
|
||||
Result rc = ru.update(rw);
|
||||
switch (rc) {
|
||||
case NEW:
|
||||
case FORCED:
|
||||
case FAST_FORWARD:
|
||||
// Successful. Do nothing.
|
||||
break;
|
||||
case REJECTED:
|
||||
case LOCK_FAILURE:
|
||||
throw new ConcurrentRefUpdateException(MessageFormat
|
||||
.format(JGitText.get().cannotLock, targetBranch),
|
||||
ru.getRef(), rc);
|
||||
default:
|
||||
throw new JGitInternalException(MessageFormat.format(
|
||||
JGitText.get().updatingRefFailed,
|
||||
targetBranch, commitId.name(), rc));
|
||||
}
|
||||
|
||||
return rw.parseCommit(commitId);
|
||||
}
|
||||
|
||||
private void addSubmodule(String name, String url, String path,
|
||||
String revision, List<CopyFile> copyfiles, List<LinkFile> linkfiles,
|
||||
Git git) throws GitAPIException, IOException {
|
||||
|
|
|
|||
8
pom.xml
8
pom.xml
|
|
@ -168,12 +168,12 @@
|
|||
<httpcore-version>4.4.14</httpcore-version>
|
||||
<slf4j-version>1.7.30</slf4j-version>
|
||||
<log4j-version>1.2.15</log4j-version>
|
||||
<maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version>
|
||||
<maven-javadoc-plugin-version>3.3.0</maven-javadoc-plugin-version>
|
||||
<tycho-extras-version>1.7.0</tycho-extras-version>
|
||||
<gson-version>2.8.6</gson-version>
|
||||
<bouncycastle-version>1.65</bouncycastle-version>
|
||||
<spotbugs-maven-plugin-version>4.2.2</spotbugs-maven-plugin-version>
|
||||
<maven-project-info-reports-plugin-version>3.1.1</maven-project-info-reports-plugin-version>
|
||||
<spotbugs-maven-plugin-version>4.2.3</spotbugs-maven-plugin-version>
|
||||
<maven-project-info-reports-plugin-version>3.1.2</maven-project-info-reports-plugin-version>
|
||||
<maven-jxr-plugin-version>3.0.0</maven-jxr-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>
|
||||
|
|
@ -330,7 +330,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.cbi.maven.plugins</groupId>
|
||||
<artifactId>eclipse-jarsigner-plugin</artifactId>
|
||||
<version>1.1.7</version>
|
||||
<version>1.3.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
|
|
|
|||
Loading…
Reference in New Issue