motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-6.6' 

* stable-6.6:
  Update Orbit to R20230531010532 for 2023-06
  Bazel: Fix remote build execution for Java 17
  Bump bazel vesion to 6.2.0

Change-Id: I107eb2cd1ce3cb7670e7418ffd74a7b94ab858a6
This commit is contained in:
Matthias Sohn 2023-07-01 08:53:59 +02:00
parent 79b46a0ef0 6f4f7e911f
commit d443588239
27 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.bazelrc
View File

@ -11,10 +11,11 @@ build --tool_java_language_version=11
build --tool_java_runtime_version=remotejdk_11
# Builds and executes on RBE using remotejdk_11
build:remote --java_language_version=11
build:remote --java_runtime_version=remotejdk_11
build:remote --tool_java_language_version=11
build:remote --tool_java_runtime_version=remotejdk_11
build:remote11 --java_language_version=11
build:remote11 --java_runtime_version=remotejdk_11
build:remote11 --tool_java_language_version=11
build:remote11 --tool_java_runtime_version=remotejdk_11
build:remote11 --config=remote
# Builds using remote_jdk17, executes using remote_jdk11 or local_jdk
build:java17 --java_language_version=17
@ -27,6 +28,7 @@ build:remote17 --java_language_version=17
build:remote17 --java_runtime_version=remotejdk_17
build:remote17 --tool_java_language_version=17
build:remote17 --tool_java_runtime_version=remotejdk_17
build:remote17 --config=remote
test --build_tests_only
test --test_output=errors

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.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" sequenceNumber="1687869642">
<target name="jgit-4.17" sequenceNumber="1688195613">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
@ -26,7 +26,7 @@
<unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/>
<unit id="org.objenesis" version="3.3.0.v20221103-2317"/>
<unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/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.17.tpd
View File

@ -1,6 +1,6 @@
target "jgit-4.17" with source configurePhase
include "orbit/S20230516204213.tpd"
include "orbit/R20230531010532-2023-06.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2020-09/" {

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.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.18" sequenceNumber="1687869642">
<target name="jgit-4.18" sequenceNumber="1688195613">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
@ -26,7 +26,7 @@
<unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/>
<unit id="org.objenesis" version="3.3.0.v20221103-2317"/>
<unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/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.18.tpd
View File

@ -1,6 +1,6 @@
target "jgit-4.18" with source configurePhase
include "orbit/S20230516204213.tpd"
include "orbit/R20230531010532-2023-06.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2020-12/" {

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.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.19-staging" sequenceNumber="1687869642">
<target name="jgit-4.19-staging" sequenceNumber="1688195613">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
@ -26,7 +26,7 @@
<unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/>
<unit id="org.objenesis" version="3.3.0.v20221103-2317"/>
<unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/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.19.tpd
View File

@ -1,6 +1,6 @@
target "jgit-4.19-staging" with source configurePhase
include "orbit/S20230516204213.tpd"
include "orbit/R20230531010532-2023-06.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2021-03/" {

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.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.20" sequenceNumber="1687869642">
<target name="jgit-4.20" sequenceNumber="1688195613">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
@ -26,7 +26,7 @@
<unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/>
<unit id="org.objenesis" version="3.3.0.v20221103-2317"/>
<unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/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.20.tpd
View File

@ -1,6 +1,6 @@
target "jgit-4.20" with source configurePhase
include "orbit/S20230516204213.tpd"
include "orbit/R20230531010532-2023-06.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2021-06/" {

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.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.21" sequenceNumber="1687869642">
<target name="jgit-4.21" sequenceNumber="1688195613">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
@ -26,7 +26,7 @@
<unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/>
<unit id="org.objenesis" version="3.3.0.v20221103-2317"/>
<unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/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.21.tpd
View File

@ -1,6 +1,6 @@
target "jgit-4.21" with source configurePhase
include "orbit/S20230516204213.tpd"
include "orbit/R20230531010532-2023-06.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2021-09/" {

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.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.22" sequenceNumber="1687869641">
<target name="jgit-4.22" sequenceNumber="1688195612">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
@ -26,7 +26,7 @@
<unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/>
<unit id="org.objenesis" version="3.3.0.v20221103-2317"/>
<unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/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.22.tpd
View File

@ -1,6 +1,6 @@
target "jgit-4.22" with source configurePhase
include "orbit/S20230516204213.tpd"
include "orbit/R20230531010532-2023-06.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2021-12/" {

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.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.23" sequenceNumber="1687869641">
<target name="jgit-4.23" sequenceNumber="1688195612">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
@ -26,7 +26,7 @@
<unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/>
<unit id="org.objenesis" version="3.3.0.v20221103-2317"/>
<unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/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.23.tpd
View File

@ -1,6 +1,6 @@
target "jgit-4.23" with source configurePhase
include "orbit/S20230516204213.tpd"
include "orbit/R20230531010532-2023-06.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2022-03/" {

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.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.24" sequenceNumber="1687869641">
<target name="jgit-4.24" sequenceNumber="1688195612">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
@ -26,7 +26,7 @@
<unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/>
<unit id="org.objenesis" version="3.3.0.v20221103-2317"/>
<unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/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.24.tpd
View File

@ -1,6 +1,6 @@
target "jgit-4.24" with source configurePhase
include "orbit/S20230516204213.tpd"
include "orbit/R20230531010532-2023-06.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2022-06/" {

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.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.25" sequenceNumber="1687869641">
<target name="jgit-4.25" sequenceNumber="1688195612">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
@ -26,7 +26,7 @@
<unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/>
<unit id="org.objenesis" version="3.3.0.v20221103-2317"/>
<unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/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.25.tpd
View File

@ -1,6 +1,6 @@
target "jgit-4.25" with source configurePhase
include "orbit/S20230516204213.tpd"
include "orbit/R20230531010532-2023-06.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2022-09/" {

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.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.26" sequenceNumber="1687869641">
<target name="jgit-4.26" sequenceNumber="1688195610">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
@ -26,7 +26,7 @@
<unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/>
<unit id="org.objenesis" version="3.3.0.v20221103-2317"/>
<unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/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.26.tpd
View File

@ -1,6 +1,6 @@
target "jgit-4.26" with source configurePhase
include "orbit/S20230516204213.tpd"
include "orbit/R20230531010532-2023-06.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2022-12/" {

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.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.27" sequenceNumber="1687869641">
<target name="jgit-4.27" sequenceNumber="1688195610">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
@ -26,7 +26,7 @@
<unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/>
<unit id="org.objenesis" version="3.3.0.v20221103-2317"/>
<unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/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.27.tpd
View File

@ -1,6 +1,6 @@
target "jgit-4.27" with source configurePhase
include "orbit/S20230516204213.tpd"
include "orbit/R20230531010532-2023-06.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2023-03/" {

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.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.28" sequenceNumber="1687869645">
<target name="jgit-4.28" sequenceNumber="1688195610">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
@ -26,7 +26,7 @@
<unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/>
<unit id="org.objenesis" version="3.3.0.v20221103-2317"/>
<unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/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.28.tpd
View File

@ -1,6 +1,6 @@
target "jgit-4.28" with source configurePhase
include "orbit/S20230516204213.tpd"
include "orbit/R20230531010532-2023-06.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/staging/2023-06" {

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20230516204213.tpd → org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230531010532-2023-06.tpd
View File

@ -1,7 +1,7 @@
target "S20230516204213" with source configurePhase
target "R20230531010532-2023-06" with source configurePhase
// see https://download.eclipse.org/tools/orbit/downloads/
location "https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository" {
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository" {
com.jcraft.jsch [0.1.55.v20221112-0806,0.1.55.v20221112-0806]
com.jcraft.jsch.source [0.1.55.v20221112-0806,0.1.55.v20221112-0806]
com.jcraft.jzlib [1.1.3.v20220502-1820,1.1.3.v20220502-1820]

2
tools/remote-bazelrc
View File

@ -30,8 +30,6 @@ build:remote --disk_cache=
# Set several flags related to specifying the platform, toolchain and java
# properties.
build:remote --host_javabase=@rbe_jdk11//java:jdk
build:remote --javabase=@rbe_jdk11//java:jdk
build:remote --crosstool_top=@rbe_jdk11//cc:toolchain
build:remote --extra_toolchains=@rbe_jdk11//config:cc-toolchain
build:remote --extra_execution_platforms=@rbe_jdk11//config:platform