Merge branch 'stable-6.2'
* stable-6.2: Update DEPENDENCIES for 6.2.0 to be released with 2022-06 Update orbit to R20220531185310 for 2022-06 Prepare 6.2.0-SNAPSHOT builds Fix connection leak for smart http connections JGit v6.2.0.202206011217-rc1 Change-Id: Ia11744588952f8627ea37421821759675aa79688
This commit is contained in:
commit
7996a2e7b4
|
@ -5,7 +5,7 @@ maven/mavencentral/com.jcraft/jsch/0.1.55, BSD-3-Clause, approved, CQ19435
|
||||||
maven/mavencentral/com.jcraft/jzlib/1.1.3, BSD-2-Clause, approved, CQ6218
|
maven/mavencentral/com.jcraft/jzlib/1.1.3, BSD-2-Clause, approved, CQ6218
|
||||||
maven/mavencentral/commons-codec/commons-codec/1.11, Apache-2.0 AND BSD-3-Clause, approved, CQ15971
|
maven/mavencentral/commons-codec/commons-codec/1.11, Apache-2.0 AND BSD-3-Clause, approved, CQ15971
|
||||||
maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162
|
maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162
|
||||||
maven/mavencentral/javax.servlet/javax.servlet-api/4.0.0, , approved, CQ16125
|
maven/mavencentral/javax.servlet/javax.servlet-api/4.0.0, (CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0) AND Apache-2.0, approved, CQ16125
|
||||||
maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636
|
maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636
|
||||||
maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.9.0, Apache-2.0, approved, clearlydefined
|
maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.9.0, Apache-2.0, approved, clearlydefined
|
||||||
maven/mavencentral/net.bytebuddy/byte-buddy/1.9.0, Apache-2.0, approved, clearlydefined
|
maven/mavencentral/net.bytebuddy/byte-buddy/1.9.0, Apache-2.0, approved, clearlydefined
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<?pde?>
|
<?pde?>
|
||||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||||
<target name="jgit-4.17" sequenceNumber="1653430139">
|
<target name="jgit-4.17" sequenceNumber="1654550635">
|
||||||
<locations>
|
<locations>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
||||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20220517184036/repository"/>
|
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/>
|
||||||
</location>
|
</location>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
target "jgit-4.17" with source configurePhase
|
target "jgit-4.17" with source configurePhase
|
||||||
|
|
||||||
include "projects/jetty-10.0.x.tpd"
|
include "projects/jetty-10.0.x.tpd"
|
||||||
include "orbit/staging-2022-06.tpd"
|
include "orbit/R20220531185310-2022-06.tpd"
|
||||||
|
|
||||||
location "https://download.eclipse.org/releases/2020-09/" {
|
location "https://download.eclipse.org/releases/2020-09/" {
|
||||||
org.eclipse.osgi lazy
|
org.eclipse.osgi lazy
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<?pde?>
|
<?pde?>
|
||||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||||
<target name="jgit-4.18" sequenceNumber="1653430139">
|
<target name="jgit-4.18" sequenceNumber="1654550635">
|
||||||
<locations>
|
<locations>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
||||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20220517184036/repository"/>
|
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/>
|
||||||
</location>
|
</location>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
target "jgit-4.18" with source configurePhase
|
target "jgit-4.18" with source configurePhase
|
||||||
|
|
||||||
include "projects/jetty-10.0.x.tpd"
|
include "projects/jetty-10.0.x.tpd"
|
||||||
include "orbit/staging-2022-06.tpd"
|
include "orbit/R20220531185310-2022-06.tpd"
|
||||||
|
|
||||||
location "https://download.eclipse.org/releases/2020-12/" {
|
location "https://download.eclipse.org/releases/2020-12/" {
|
||||||
org.eclipse.osgi lazy
|
org.eclipse.osgi lazy
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<?pde?>
|
<?pde?>
|
||||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||||
<target name="jgit-4.19-staging" sequenceNumber="1653430136">
|
<target name="jgit-4.19-staging" sequenceNumber="1654550632">
|
||||||
<locations>
|
<locations>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
||||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20220517184036/repository"/>
|
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/>
|
||||||
</location>
|
</location>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
target "jgit-4.19-staging" with source configurePhase
|
target "jgit-4.19-staging" with source configurePhase
|
||||||
|
|
||||||
include "projects/jetty-10.0.x.tpd"
|
include "projects/jetty-10.0.x.tpd"
|
||||||
include "orbit/staging-2022-06.tpd"
|
include "orbit/R20220531185310-2022-06.tpd"
|
||||||
|
|
||||||
location "https://download.eclipse.org/staging/2021-03/" {
|
location "https://download.eclipse.org/staging/2021-03/" {
|
||||||
org.eclipse.osgi lazy
|
org.eclipse.osgi lazy
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<?pde?>
|
<?pde?>
|
||||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||||
<target name="jgit-4.20" sequenceNumber="1653430139">
|
<target name="jgit-4.20" sequenceNumber="1654550634">
|
||||||
<locations>
|
<locations>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
||||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20220517184036/repository"/>
|
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/>
|
||||||
</location>
|
</location>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
target "jgit-4.20" with source configurePhase
|
target "jgit-4.20" with source configurePhase
|
||||||
|
|
||||||
include "projects/jetty-10.0.x.tpd"
|
include "projects/jetty-10.0.x.tpd"
|
||||||
include "orbit/staging-2022-06.tpd"
|
include "orbit/R20220531185310-2022-06.tpd"
|
||||||
|
|
||||||
location "https://download.eclipse.org/releases/2021-06/" {
|
location "https://download.eclipse.org/releases/2021-06/" {
|
||||||
org.eclipse.osgi lazy
|
org.eclipse.osgi lazy
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<?pde?>
|
<?pde?>
|
||||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||||
<target name="jgit-4.21" sequenceNumber="1653430139">
|
<target name="jgit-4.21" sequenceNumber="1654550635">
|
||||||
<locations>
|
<locations>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
||||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20220517184036/repository"/>
|
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/>
|
||||||
</location>
|
</location>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
target "jgit-4.21" with source configurePhase
|
target "jgit-4.21" with source configurePhase
|
||||||
|
|
||||||
include "projects/jetty-10.0.x.tpd"
|
include "projects/jetty-10.0.x.tpd"
|
||||||
include "orbit/staging-2022-06.tpd"
|
include "orbit/R20220531185310-2022-06.tpd"
|
||||||
|
|
||||||
location "https://download.eclipse.org/releases/2021-09/" {
|
location "https://download.eclipse.org/releases/2021-09/" {
|
||||||
org.eclipse.osgi lazy
|
org.eclipse.osgi lazy
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<?pde?>
|
<?pde?>
|
||||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||||
<target name="jgit-4.22" sequenceNumber="1653430138">
|
<target name="jgit-4.22" sequenceNumber="1654550634">
|
||||||
<locations>
|
<locations>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
||||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20220517184036/repository"/>
|
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/>
|
||||||
</location>
|
</location>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
target "jgit-4.22" with source configurePhase
|
target "jgit-4.22" with source configurePhase
|
||||||
|
|
||||||
include "projects/jetty-10.0.x.tpd"
|
include "projects/jetty-10.0.x.tpd"
|
||||||
include "orbit/staging-2022-06.tpd"
|
include "orbit/R20220531185310-2022-06.tpd"
|
||||||
|
|
||||||
location "https://download.eclipse.org/releases/2021-12/" {
|
location "https://download.eclipse.org/releases/2021-12/" {
|
||||||
org.eclipse.osgi lazy
|
org.eclipse.osgi lazy
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<?pde?>
|
<?pde?>
|
||||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||||
<target name="jgit-4.23" sequenceNumber="1653430138">
|
<target name="jgit-4.23" sequenceNumber="1654550634">
|
||||||
<locations>
|
<locations>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
||||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20220517184036/repository"/>
|
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/>
|
||||||
</location>
|
</location>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
target "jgit-4.23" with source configurePhase
|
target "jgit-4.23" with source configurePhase
|
||||||
|
|
||||||
include "projects/jetty-10.0.x.tpd"
|
include "projects/jetty-10.0.x.tpd"
|
||||||
include "orbit/staging-2022-06.tpd"
|
include "orbit/R20220531185310-2022-06.tpd"
|
||||||
|
|
||||||
location "https://download.eclipse.org/releases/2022-03/" {
|
location "https://download.eclipse.org/releases/2022-03/" {
|
||||||
org.eclipse.osgi lazy
|
org.eclipse.osgi lazy
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<?pde?>
|
<?pde?>
|
||||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||||
<target name="jgit-4.24" sequenceNumber="1653430121">
|
<target name="jgit-4.24" sequenceNumber="1654550621">
|
||||||
<locations>
|
<locations>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
<unit id="jakarta.servlet-api" version="4.0.0"/>
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
||||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20220517184036/repository"/>
|
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/>
|
||||||
</location>
|
</location>
|
||||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
target "jgit-4.24" with source configurePhase
|
target "jgit-4.24" with source configurePhase
|
||||||
|
|
||||||
include "projects/jetty-10.0.x.tpd"
|
include "projects/jetty-10.0.x.tpd"
|
||||||
include "orbit/staging-2022-06.tpd"
|
include "orbit/R20220531185310-2022-06.tpd"
|
||||||
|
|
||||||
location "https://download.eclipse.org/staging/2022-06/" {
|
location "https://download.eclipse.org/staging/2022-06/" {
|
||||||
org.eclipse.osgi lazy
|
org.eclipse.osgi lazy
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
target "staging-2022-06" with source configurePhase
|
target "R20220531185310-2022-06" with source configurePhase
|
||||||
// see https://download.eclipse.org/tools/orbit/downloads/
|
// see https://download.eclipse.org/tools/orbit/downloads/
|
||||||
|
|
||||||
location "https://download.eclipse.org/tools/orbit/downloads/drops/S20220517184036/repository" {
|
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository" {
|
||||||
com.google.gson [2.8.9.v20220111-1409,2.8.9.v20220111-1409]
|
com.google.gson [2.8.9.v20220111-1409,2.8.9.v20220111-1409]
|
||||||
com.google.gson.source [2.8.9.v20220111-1409,2.8.9.v20220111-1409]
|
com.google.gson.source [2.8.9.v20220111-1409,2.8.9.v20220111-1409]
|
||||||
com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
|
com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
|
|
@ -1540,14 +1540,19 @@ class SmartHttpFetchConnection extends BasePackFetchConnection {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void doFetch(final ProgressMonitor monitor,
|
protected void doFetch(ProgressMonitor monitor, Collection<Ref> want,
|
||||||
final Collection<Ref> want, final Set<ObjectId> have,
|
Set<ObjectId> have, OutputStream outputStream)
|
||||||
final OutputStream outputStream) throws TransportException {
|
throws TransportException {
|
||||||
try {
|
svc = new MultiRequestService(SVC_UPLOAD_PACK,
|
||||||
svc = new MultiRequestService(SVC_UPLOAD_PACK,
|
getProtocolVersion());
|
||||||
getProtocolVersion());
|
try (InputStream svcIn = svc.getInputStream();
|
||||||
init(svc.getInputStream(), svc.getOutputStream());
|
OutputStream svcOut = svc.getOutputStream()) {
|
||||||
|
init(svcIn, svcOut);
|
||||||
super.doFetch(monitor, want, have, outputStream);
|
super.doFetch(monitor, want, have, outputStream);
|
||||||
|
} catch (TransportException e) {
|
||||||
|
throw e;
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new TransportException(e.getMessage(), e);
|
||||||
} finally {
|
} finally {
|
||||||
svc = null;
|
svc = null;
|
||||||
}
|
}
|
||||||
|
@ -1571,13 +1576,20 @@ class SmartHttpPushConnection extends BasePackPushConnection {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void doPush(final ProgressMonitor monitor,
|
protected void doPush(ProgressMonitor monitor,
|
||||||
final Map<String, RemoteRefUpdate> refUpdates,
|
Map<String, RemoteRefUpdate> refUpdates,
|
||||||
OutputStream outputStream) throws TransportException {
|
OutputStream outputStream) throws TransportException {
|
||||||
final Service svc = new MultiRequestService(SVC_RECEIVE_PACK,
|
Service svc = new MultiRequestService(SVC_RECEIVE_PACK,
|
||||||
getProtocolVersion());
|
getProtocolVersion());
|
||||||
init(svc.getInputStream(), svc.getOutputStream());
|
try (InputStream svcIn = svc.getInputStream();
|
||||||
super.doPush(monitor, refUpdates, outputStream);
|
OutputStream svcOut = svc.getOutputStream()) {
|
||||||
|
init(svcIn, svcOut);
|
||||||
|
super.doPush(monitor, refUpdates, outputStream);
|
||||||
|
} catch (TransportException e) {
|
||||||
|
throw e;
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new TransportException(e.getMessage(), e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue