diff options
28 files changed, 124 insertions, 57 deletions
@@ -210,8 +210,8 @@ maven_jar( maven_jar( name = "gson", - artifact = "com.google.code.gson:gson:2.10", - sha1 = "dd9b193aef96e973d5a11ab13cd17430c2e4306b", + artifact = "com.google.code.gson:gson:2.10.1", + sha1 = "b3add478d4382b78ea20b1671390a858002feb6c", ) JETTY_VER = "10.0.13" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target index 72f96f322d..b4ad428ef4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target @@ -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="1673875570"> +<target name="jgit-4.17" sequenceNumber="1677748416"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.http" version="10.0.13"/> @@ -19,8 +19,8 @@ <repository id="jetty-10.0.6" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.10.0.v20221207-1049"/> - <unit id="com.google.gson.source" version="2.10.0.v20221207-1049"/> + <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> + <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> @@ -83,7 +83,7 @@ <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" 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/S20230101190934/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.osgi" version="0.0.0"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd index ef498efb29..cf00c96a66 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd @@ -1,7 +1,7 @@ target "jgit-4.17" with source configurePhase include "projects/jetty-10.0.x.tpd" -include "orbit/S20230101190934.tpd" +include "orbit/R20230302014618-2023-03.tpd" location "https://download.eclipse.org/releases/2020-09/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target index a871c58092..9ad44d8113 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target @@ -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="1673875570"> +<target name="jgit-4.18" sequenceNumber="1677748416"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.http" version="10.0.13"/> @@ -19,8 +19,8 @@ <repository id="jetty-10.0.6" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.10.0.v20221207-1049"/> - <unit id="com.google.gson.source" version="2.10.0.v20221207-1049"/> + <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> + <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> @@ -83,7 +83,7 @@ <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" 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/S20230101190934/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.osgi" version="0.0.0"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd index 3abc2094cd..325b6de84a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd @@ -1,7 +1,7 @@ target "jgit-4.18" with source configurePhase include "projects/jetty-10.0.x.tpd" -include "orbit/S20230101190934.tpd" +include "orbit/R20230302014618-2023-03.tpd" location "https://download.eclipse.org/releases/2020-12/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target index 819a065862..e570bf9a54 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target @@ -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="1673875570"> +<target name="jgit-4.19-staging" sequenceNumber="1677748416"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.http" version="10.0.13"/> @@ -19,8 +19,8 @@ <repository id="jetty-10.0.6" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.10.0.v20221207-1049"/> - <unit id="com.google.gson.source" version="2.10.0.v20221207-1049"/> + <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> + <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> @@ -83,7 +83,7 @@ <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" 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/S20230101190934/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.osgi" version="0.0.0"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd index a13bc20701..08f3910289 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd @@ -1,7 +1,7 @@ target "jgit-4.19-staging" with source configurePhase include "projects/jetty-10.0.x.tpd" -include "orbit/S20230101190934.tpd" +include "orbit/R20230302014618-2023-03.tpd" location "https://download.eclipse.org/releases/2021-03/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target index cd615ff22c..a3f7c2b639 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target @@ -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="1673875570"> +<target name="jgit-4.20" sequenceNumber="1677748416"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.http" version="10.0.13"/> @@ -19,8 +19,8 @@ <repository id="jetty-10.0.6" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.10.0.v20221207-1049"/> - <unit id="com.google.gson.source" version="2.10.0.v20221207-1049"/> + <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> + <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> @@ -83,7 +83,7 @@ <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" 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/S20230101190934/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.osgi" version="0.0.0"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd index 9faf5298ed..07f8ab5d8a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd @@ -1,7 +1,7 @@ target "jgit-4.20" with source configurePhase include "projects/jetty-10.0.x.tpd" -include "orbit/S20230101190934.tpd" +include "orbit/R20230302014618-2023-03.tpd" location "https://download.eclipse.org/releases/2021-06/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target index 993c93f48c..908087fe6c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target @@ -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="1673875570"> +<target name="jgit-4.21" sequenceNumber="1677748416"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.http" version="10.0.13"/> @@ -19,8 +19,8 @@ <repository id="jetty-10.0.6" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.10.0.v20221207-1049"/> - <unit id="com.google.gson.source" version="2.10.0.v20221207-1049"/> + <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> + <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> @@ -83,7 +83,7 @@ <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" 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/S20230101190934/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.osgi" version="0.0.0"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd index 5d861c9af7..c957b85ff2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd @@ -1,7 +1,7 @@ target "jgit-4.21" with source configurePhase include "projects/jetty-10.0.x.tpd" -include "orbit/S20230101190934.tpd" +include "orbit/R20230302014618-2023-03.tpd" location "https://download.eclipse.org/releases/2021-09/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target index 86444a51a6..b07928441e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target @@ -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="1673875570"> +<target name="jgit-4.22" sequenceNumber="1677748416"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.http" version="10.0.13"/> @@ -19,8 +19,8 @@ <repository id="jetty-10.0.6" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.10.0.v20221207-1049"/> - <unit id="com.google.gson.source" version="2.10.0.v20221207-1049"/> + <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> + <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> @@ -83,7 +83,7 @@ <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" 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/S20230101190934/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.osgi" version="0.0.0"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd index b21ab17595..61a16da2aa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd @@ -1,7 +1,7 @@ target "jgit-4.22" with source configurePhase include "projects/jetty-10.0.x.tpd" -include "orbit/S20230101190934.tpd" +include "orbit/R20230302014618-2023-03.tpd" location "https://download.eclipse.org/releases/2021-12/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target index 2c1692f676..e85e43d50d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target @@ -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="1673875570"> +<target name="jgit-4.23" sequenceNumber="1677748416"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.http" version="10.0.13"/> @@ -19,8 +19,8 @@ <repository id="jetty-10.0.6" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.10.0.v20221207-1049"/> - <unit id="com.google.gson.source" version="2.10.0.v20221207-1049"/> + <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> + <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> @@ -83,7 +83,7 @@ <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" 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/S20230101190934/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.osgi" version="0.0.0"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd index a23ba3bd76..fde3bb65ec 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd @@ -1,7 +1,7 @@ target "jgit-4.23" with source configurePhase include "projects/jetty-10.0.x.tpd" -include "orbit/S20230101190934.tpd" +include "orbit/R20230302014618-2023-03.tpd" location "https://download.eclipse.org/releases/2022-03/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target index 3c296b5c71..51d8fd5995 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target @@ -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="1673875570"> +<target name="jgit-4.24" sequenceNumber="1677748416"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.http" version="10.0.13"/> @@ -19,8 +19,8 @@ <repository id="jetty-10.0.6" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.10.0.v20221207-1049"/> - <unit id="com.google.gson.source" version="2.10.0.v20221207-1049"/> + <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> + <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> @@ -83,7 +83,7 @@ <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" 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/S20230101190934/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.osgi" version="0.0.0"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd index ceea7a8ddd..6c480c3ca9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd @@ -1,7 +1,7 @@ target "jgit-4.24" with source configurePhase include "projects/jetty-10.0.x.tpd" -include "orbit/S20230101190934.tpd" +include "orbit/R20230302014618-2023-03.tpd" location "https://download.eclipse.org/releases/2022-06/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target index ad5d99516a..b7260bffbe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target @@ -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="1673875570"> +<target name="jgit-4.25" sequenceNumber="1677748416"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.http" version="10.0.13"/> @@ -19,8 +19,8 @@ <repository id="jetty-10.0.6" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.10.0.v20221207-1049"/> - <unit id="com.google.gson.source" version="2.10.0.v20221207-1049"/> + <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> + <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> @@ -83,7 +83,7 @@ <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" 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/S20230101190934/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.osgi" version="0.0.0"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd index 3cb98c9bee..4542b13258 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd @@ -1,7 +1,7 @@ target "jgit-4.25" with source configurePhase include "projects/jetty-10.0.x.tpd" -include "orbit/S20230101190934.tpd" +include "orbit/R20230302014618-2023-03.tpd" location "https://download.eclipse.org/releases/2022-09/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target index dce8c5581f..57c9d0d41e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target @@ -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="1673875557"> +<target name="jgit-4.26" sequenceNumber="1677748097"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.http" version="10.0.13"/> @@ -19,8 +19,8 @@ <repository id="jetty-10.0.6" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.10.0.v20221207-1049"/> - <unit id="com.google.gson.source" version="2.10.0.v20221207-1049"/> + <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> + <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> @@ -83,7 +83,7 @@ <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" 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/S20230101190934/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.osgi" version="0.0.0"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd index 8174d093ee..25a223ab60 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd @@ -1,7 +1,7 @@ target "jgit-4.26" with source configurePhase include "projects/jetty-10.0.x.tpd" -include "orbit/S20230101190934.tpd" +include "orbit/R20230302014618-2023-03.tpd" location "https://download.eclipse.org/releases/2022-12/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20230101190934.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd index ecc4b81ae8..ad29378af0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20230101190934.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd @@ -1,9 +1,9 @@ -target "S20230101190934" with source configurePhase +target "R20230302014618-2023-03" with source configurePhase // see https://download.eclipse.org/tools/orbit/downloads/ -location "https://download.eclipse.org/tools/orbit/downloads/drops/S20230101190934/repository" { - com.google.gson [2.10.0.v20221207-1049,2.10.0.v20221207-1049] - com.google.gson.source [2.10.0.v20221207-1049,2.10.0.v20221207-1049] +location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository" { + com.google.gson [2.10.1.v20230109-0753,2.10.1.v20230109-0753] + com.google.gson.source [2.10.1.v20230109-0753,2.10.1.v20230109-0753] 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] diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileRepositoryBuilderAfterOpenConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileRepositoryBuilderAfterOpenConfigTest.java new file mode 100644 index 0000000000..100bd32ad8 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileRepositoryBuilderAfterOpenConfigTest.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.file; + +import org.eclipse.jgit.lib.ConfigConstants; +import org.eclipse.jgit.lib.CoreConfig; +import org.eclipse.jgit.lib.StoredConfig; +import org.eclipse.jgit.util.SystemReader; +import org.junit.Before; + +public class FileRepositoryBuilderAfterOpenConfigTest extends FileRepositoryBuilderTest { + /** {@inheritDoc} */ + @Before + @Override + public void setUp() throws Exception { + super.setUp(); + StoredConfig userConfig = SystemReader.getInstance().getUserConfig(); + userConfig.setEnum(ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_TRUST_PACKED_REFS_STAT, + CoreConfig.TrustPackedRefsStat.AFTER_OPEN); + userConfig.save(); + } +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryAfterOpenConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryAfterOpenConfigTest.java new file mode 100644 index 0000000000..42304e2253 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryAfterOpenConfigTest.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.file; + +import org.eclipse.jgit.lib.ConfigConstants; +import org.eclipse.jgit.lib.CoreConfig; +import org.eclipse.jgit.lib.StoredConfig; +import org.eclipse.jgit.util.SystemReader; + +public class RefDirectoryAfterOpenConfigTest extends RefDirectoryTest { + /** {@inheritDoc} */ + @Override + public void refDirectorySetup() throws Exception { + StoredConfig userConfig = SystemReader.getInstance().getUserConfig(); + userConfig.setEnum(ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_TRUST_PACKED_REFS_STAT, + CoreConfig.TrustPackedRefsStat.AFTER_OPEN); + userConfig.save(); + super.refDirectorySetup(); + } +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java index 38c545ef57..4b80f18970 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java @@ -72,7 +72,10 @@ public class RefDirectoryTest extends LocalDiskRepositoryTestCase { @Before public void setUp() throws Exception { super.setUp(); + refDirectorySetup(); + } + public void refDirectorySetup() throws Exception { diskRepo = createBareRepository(); refdir = (RefDirectory) diskRepo.getRefDatabase(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java index e0eb126440..f02160e457 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java @@ -90,6 +90,7 @@ class FetchProcess { .collect(Collectors.toList()); } + @SuppressWarnings("Finally") void execute(ProgressMonitor monitor, FetchResult result, String initialBranch) throws NotSupportedException, TransportException { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java index d67fe074e4..ed8f450c53 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java @@ -470,6 +470,7 @@ class WalkFetchConnection extends BaseFetchConnection { } } + @SuppressWarnings("Finally") private boolean downloadPackedObject(final ProgressMonitor monitor, final AnyObjectId id) throws TransportException { // Search for the object in a remote pack whose index we have, @@ -168,7 +168,7 @@ <httpcore-version>4.4.16</httpcore-version> <slf4j-version>1.7.30</slf4j-version> <maven-javadoc-plugin-version>3.4.1</maven-javadoc-plugin-version> - <gson-version>2.10</gson-version> + <gson-version>2.10.1</gson-version> <bouncycastle-version>1.72</bouncycastle-version> <spotbugs-maven-plugin-version>4.7.3.0</spotbugs-maven-plugin-version> <maven-project-info-reports-plugin-version>3.4.2</maven-project-info-reports-plugin-version> |