diff options
50 files changed, 155 insertions, 147 deletions
diff --git a/DEPENDENCIES b/DEPENDENCIES index bd90df4146..fe173bb5b2 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -8,8 +8,8 @@ maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ maven/mavencentral/javax.servlet/javax.servlet-api/3.1.0, Apache-2.0 AND (CDDL-1.1 OR GPL-2.0 WITH Classpath-exception-2.0), approved, emo_ip_team maven/mavencentral/junit/junit/4.13, , approved, CQ22796 maven/mavencentral/log4j/log4j/1.2.15, Apache-2.0, approved, CQ7837 -maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.9.0, Apache-2.0, restricted, clearlydefined -maven/mavencentral/net.bytebuddy/byte-buddy/1.9.0, Apache-2.0, restricted, 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.i2p.crypto/eddsa/0.3.0, CC0, approved, CQ17804 maven/mavencentral/net.sf.jopt-simple/jopt-simple/4.6, MIT, approved, CQ14441 maven/mavencentral/org.apache.ant/ant-launcher/1.10.10, Apache-2.0 AND W3C AND LicenseRef-Public-Domain, approved, CQ15560 @@ -22,17 +22,17 @@ maven/mavencentral/org.apache.sshd/sshd-common/2.7.0, Apache-2.0 and ISC, approv maven/mavencentral/org.apache.sshd/sshd-core/2.7.0, Apache-2.0, approved, CQ23469 maven/mavencentral/org.apache.sshd/sshd-osgi/2.7.0, Apache-2.0 and ISC, approved, CQ23469 maven/mavencentral/org.apache.sshd/sshd-sftp/2.7.0, Apache-2.0, approved, CQ23470 -maven/mavencentral/org.assertj/assertj-core/3.14.0, Apache-2.0, approved, CQ21437 +maven/mavencentral/org.assertj/assertj-core/3.20.2, Apache-2.0, approved, CQ23501 maven/mavencentral/org.bouncycastle/bcpg-jdk15on/1.65, Apache-2.0, approved, CQ21975 maven/mavencentral/org.bouncycastle/bcpkix-jdk15on/1.65, MIT AND LicenseRef-Public-Domain, approved, CQ21976 maven/mavencentral/org.bouncycastle/bcprov-jdk15on/1.65.01, MIT AND LicenseRef-Public-Domain, approved, CQ21977 -maven/mavencentral/org.eclipse.jetty/jetty-http/9.4.42.v20210604, EPL-2.0, approved, eclipse -maven/mavencentral/org.eclipse.jetty/jetty-io/9.4.42.v20210604, EPL-2.0, approved, eclipse -maven/mavencentral/org.eclipse.jetty/jetty-security/9.4.42.v20210604, EPL-2.0, approved, eclipse -maven/mavencentral/org.eclipse.jetty/jetty-server/9.4.42.v20210604, EPL-2.0, approved, eclipse -maven/mavencentral/org.eclipse.jetty/jetty-servlet/9.4.42.v20210604, EPL-2.0, approved, eclipse -maven/mavencentral/org.eclipse.jetty/jetty-util-ajax/9.4.42.v20210604, EPL-2.0, approved, eclipse -maven/mavencentral/org.eclipse.jetty/jetty-util/9.4.42.v20210604, EPL-2.0, approved, eclipse +maven/mavencentral/org.eclipse.jetty/jetty-http/9.4.43.v20210629, EPL-2.0, approved, eclipse +maven/mavencentral/org.eclipse.jetty/jetty-io/9.4.43.v20210629, EPL-2.0, approved, eclipse +maven/mavencentral/org.eclipse.jetty/jetty-security/9.4.43.v20210629, EPL-2.0, approved, eclipse +maven/mavencentral/org.eclipse.jetty/jetty-server/9.4.43.v20210629, EPL-2.0, approved, eclipse +maven/mavencentral/org.eclipse.jetty/jetty-servlet/9.4.43.v20210629, EPL-2.0, approved, eclipse +maven/mavencentral/org.eclipse.jetty/jetty-util-ajax/9.4.43.v20210629, EPL-2.0, approved, eclipse +maven/mavencentral/org.eclipse.jetty/jetty-util/9.4.43.v20210629, EPL-2.0, approved, eclipse maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant.test/5.13.0-SNAPSHOT, BSD-3-Clause, approved, eclipse maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant/5.13.0-SNAPSHOT, BSD-3-Clause, approved, eclipse maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.archive/5.13.0-SNAPSHOT, BSD-3-Clause, approved, eclipse @@ -55,7 +55,7 @@ maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.jsch/5.13.0-SNAPSHOT, B maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.test/5.13.0-SNAPSHOT, BSD-3-Clause, approved, eclipse maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ui/5.13.0-SNAPSHOT, BSD-3-Clause, approved, eclipse maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit/5.13.0-SNAPSHOT, BSD-3-Clause, approved, eclipse -maven/mavencentral/org.hamcrest/hamcrest-core/1.3, BSD-2-Clause, approved, CQ7063 +maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-2-Clause, approved, clearlydefined maven/mavencentral/org.mockito/mockito-core/2.23.0, MIT, approved, CQ17976 maven/mavencentral/org.objenesis/objenesis/2.6, Apache-2.0, approved, CQ15478 maven/mavencentral/org.openjdk.jmh/jmh-core/1.32, GPL-2.0, approved, CQ23499 @@ -188,15 +188,9 @@ maven_jar( ) maven_jar( - name = "hamcrest-library", - artifact = "org.hamcrest:hamcrest-library:1.3", - sha1 = "4785a3c21320980282f9f33d0d1264a69040538f", -) - -maven_jar( - name = "hamcrest-core", - artifact = "org.hamcrest:hamcrest-core:1.3", - sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0", + name = "hamcrest", + artifact = "org.hamcrest:hamcrest:2.2", + sha1 = "1820c0968dba3a11a1b30669bb1f01978a91dedc", ) maven_jar( @@ -207,8 +201,8 @@ maven_jar( maven_jar( name = "assertj-core", - artifact = "org.assertj:assertj-core:3.14.0", - sha1 = "3b7b0fcac821f3d167764e9926573cd64f78f9e9", + artifact = "org.assertj:assertj-core:3.20.2", + sha1 = "66f1f0ebd6db2b24e4a731979171da16ba919cd5", ) BYTE_BUDDY_VERSION = "1.9.0" @@ -205,8 +205,7 @@ java_library( exports = [ "@bytebuddy-agent//jar", "@bytebuddy//jar", - "@hamcrest-core//jar", - "@hamcrest-library//jar", + "@hamcrest//jar", "@junit//jar", "@mockito//jar", "@objenesis//jar", diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index aeac06ada1..63f0305ffe 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Import-Package: org.apache.tools.ant, org.eclipse.jgit.junit;version="[5.13.0,5.14.0)", org.eclipse.jgit.lib;version="[5.13.0,5.14.0)", org.eclipse.jgit.util;version="[5.13.0,5.14.0)", - org.hamcrest.core;version="[1.1.0,2.0.0)", + org.hamcrest.core;version="[2.2.0,3.0.0)", org.junit;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 9b80629206..e5ac4fc162 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -15,10 +15,9 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)", org.eclipse.jgit.gpg.bc.internal;version="[5.13.0,5.14.0)", org.eclipse.jgit.gpg.bc.internal.keys;version="[5.13.0,5.14.0)", org.eclipse.jgit.util.sha1;version="[5.13.0,5.14.0)", + org.hamcrest;version="[2.2.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" Export-Package: org.eclipse.jgit.gpg.bc.internal;x-internal:=true, org.eclipse.jgit.gpg.bc.internal.keys;x-internal:=true -Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", - org.hamcrest.library;bundle-version="[1.1.0,2.0.0)" diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 1aef1cd36c..c012c90402 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -48,10 +48,9 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jgit.transport.http.apache;version="[5.13.0,5.14.0)", org.eclipse.jgit.transport.resolver;version="[5.13.0,5.14.0)", org.eclipse.jgit.util;version="[5.13.0,5.14.0)", - org.hamcrest;version="[1.1.0,2.0.0)", - org.hamcrest.core;version="[1.1.0,2.0.0)", + org.hamcrest;version="[2.2.0,3.0.0)", + org.hamcrest.core;version="[2.2.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" -Require-Bundle: org.hamcrest.library;bundle-version="[1.1.0,2.0.0)" diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index d3c154d420..0ecc883801 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -52,9 +52,9 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-library</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> - <version>[1.1.0,2.0.0)</version> + <version>${hamcrest-version}</version> </dependency> <dependency> diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 3ab248e612..3b208aafe9 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -46,7 +46,7 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)", org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)", org.eclipse.jgit.util;version="[5.13.0,5.14.0)", - org.hamcrest.core;version="[1.1.0,2.0.0)", + org.hamcrest.core;version="[2.2.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 35f2af02b0..5a7bbad060 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Import-Package: org.eclipse.jgit.api;version="[5.13.0,5.14.0)", org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)", org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)", org.eclipse.jgit.util;version="[5.13.0,5.14.0)", - org.hamcrest.core;version="[1.1.0,2.0.0)", + org.hamcrest.core;version="[2.2.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target index 44a3c78c23..bbcb96234a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.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.10" sequenceNumber="1625773751"> +<target name="jgit-4.10" sequenceNumber="1626078675"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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.10.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd index 19b121d39c..635ff49f12 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd @@ -1,7 +1,7 @@ target "jgit-4.10" with source configurePhase include "projects/jetty-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.tpd" location "https://download.eclipse.org/releases/2018-12/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target index df8edf4092..a967164897 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.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.11" sequenceNumber="1625773751"> +<target name="jgit-4.11" sequenceNumber="1626078700"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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.11.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd index ea5cfca147..b33916d59f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd @@ -1,7 +1,7 @@ target "jgit-4.11" with source configurePhase include "projects/jetty-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.tpd" location "https://download.eclipse.org/releases/2019-03/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target index 9ec8d28a24..4e8fbe1d18 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.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.12" sequenceNumber="1625773751"> +<target name="jgit-4.12" sequenceNumber="1626078700"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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.12.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd index 6bd6483e6d..29e070d051 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd @@ -1,7 +1,7 @@ target "jgit-4.12" with source configurePhase include "projects/jetty-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.tpd" location "https://download.eclipse.org/releases/2019-06/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target index 04e472ce23..6325b59723 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.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.13" sequenceNumber="1625773751"> +<target name="jgit-4.13" sequenceNumber="1626078700"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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.13.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.tpd index 6cff6b2924..18b3d5cfcf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.tpd @@ -1,7 +1,7 @@ target "jgit-4.13" with source configurePhase include "projects/jetty-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.tpd" location "https://download.eclipse.org/releases/2019-09/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target index a5ce93e42f..4cc1f21ae1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.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.14" sequenceNumber="1625773751"> +<target name="jgit-4.14" sequenceNumber="1626078698"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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.14.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.tpd index 68fc3cae10..2140d943c0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.tpd @@ -1,7 +1,7 @@ target "jgit-4.14" with source configurePhase include "projects/jetty-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.tpd" location "https://download.eclipse.org/releases/2019-12/201912181000/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target index 765f349497..cca13da1c7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.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.15" sequenceNumber="1625773751"> +<target name="jgit-4.15" sequenceNumber="1626078698"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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.15.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.tpd index 3124326448..97588dba5a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.tpd @@ -1,7 +1,7 @@ target "jgit-4.15" with source configurePhase include "projects/jetty-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.tpd" location "https://download.eclipse.org/releases/2020-03/202003181000/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target index 123ab6944b..c36d2ef856 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.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.16" sequenceNumber="1625773751"> +<target name="jgit-4.16" sequenceNumber="1626078700"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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.16.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.tpd index 8f87c866cc..6f5cc8aa78 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.tpd @@ -1,7 +1,7 @@ target "jgit-4.16" with source configurePhase include "projects/jetty-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.tpd" location "https://download.eclipse.org/releases/2020-06/" { org.eclipse.osgi lazy 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 cde727d3cb..b91ed7c717 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="1625773751"> +<target name="jgit-4.17" sequenceNumber="1626078700"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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 7ae2b1d30a..9114181957 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-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.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 cdd280dd7a..d93bdf70b9 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="1625773751"> +<target name="jgit-4.18" sequenceNumber="1626078700"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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 6bac8370a5..4e6c59a012 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-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.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 ad706d8445..0769e53576 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="1625773751"> +<target name="jgit-4.19-staging" sequenceNumber="1626078698"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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 3cc1ebc153..c0fa592a0c 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-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.tpd" location "https://download.eclipse.org/staging/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 46f9f67544..11b7151dbf 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="1625773751"> +<target name="jgit-4.20" sequenceNumber="1626078700"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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 f4ffd40e66..aba2a259ad 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-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.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 d55c62c9f1..e23f4142ce 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="1625773751"> +<target name="jgit-4.21" sequenceNumber="1626078698"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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 1e9d4f004a..f35d6b8f44 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-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.tpd" location "https://download.eclipse.org/staging/2021-09/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target index b8540d0940..098773f533 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.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.6" sequenceNumber="1625773763"> +<target name="jgit-4.6" sequenceNumber="1626078714"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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.6.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd index 530aeb75d7..4f10e7ded1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd @@ -1,7 +1,7 @@ target "jgit-4.6" with source configurePhase include "projects/jetty-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.tpd" location "https://download.eclipse.org/releases/neon/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target index 8ebcceec85..79f21315ef 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.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.7" sequenceNumber="1625773754"> +<target name="jgit-4.7" sequenceNumber="1626078705"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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.7.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd index f59dc2baae..0970da67c9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd @@ -1,7 +1,7 @@ target "jgit-4.7" with source configurePhase include "projects/jetty-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.tpd" location "https://download.eclipse.org/releases/oxygen/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target index 3164a7eb7f..b98319a071 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.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.8" sequenceNumber="1625773751"> +<target name="jgit-4.8" sequenceNumber="1626078700"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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.8.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd index d228d3d187..8d602b39f2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd @@ -1,7 +1,7 @@ target "jgit-4.8" with source configurePhase include "projects/jetty-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.tpd" location "https://download.eclipse.org/releases/photon/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target index 2ec5bf8df8..640ced3214 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.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.9" sequenceNumber="1625773751"> +<target name="jgit-4.9" sequenceNumber="1626078700"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> @@ -59,15 +59,16 @@ <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> + <unit id="org.assertj" version="3.20.2.v20210706-1104"/> + <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/> <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/> <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/> + <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/> <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> @@ -86,7 +87,7 @@ <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <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/S20210705204906/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/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.9.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd index 21af8b1d86..2ec27c6f75 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd @@ -1,7 +1,7 @@ target "jgit-4.9" with source configurePhase include "projects/jetty-9.4.x.tpd" -include "orbit/S20210705204906.tpd" +include "orbit/I20210711110031.tpd" location "https://download.eclipse.org/releases/2018-09/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20210705204906.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/I20210711110031.tpd index 4cd68c86f7..c0413400d8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20210705204906.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/I20210711110031.tpd @@ -1,7 +1,7 @@ -target "S20210705204906" with source configurePhase +target "I20210711110031" with source configurePhase // see https://download.eclipse.org/tools/orbit/downloads/ -location "https://download.eclipse.org/tools/orbit/downloads/drops/S20210705204906/repository" { +location "https://download.eclipse.org/tools/orbit/downloads/drops/I20210711110031/repository" { com.google.gson [2.8.7.v20210624-1215,2.8.7.v20210624-1215] com.google.gson.source [2.8.7.v20210624-1215,2.8.7.v20210624-1215] com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902] @@ -36,15 +36,16 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/S202107052049 org.apache.sshd.osgi.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618] org.apache.sshd.sftp [2.7.0.v20210623-0618,2.7.0.v20210623-0618] org.apache.sshd.sftp.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618] - org.assertj [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.assertj.source [3.14.0.v20200120-1926,3.14.0.v20200120-1926] + org.assertj [3.20.2.v20210706-1104,3.20.2.v20210706-1104] + org.assertj.source [3.20.2.v20210706-1104,3.20.2.v20210706-1104] org.bouncycastle.bcpg [1.65.0.v20200527-1955,1.65.0.v20200527-1955] org.bouncycastle.bcpg.source [1.65.0.v20200527-1955,1.65.0.v20200527-1955] org.bouncycastle.bcpkix [1.65.0.v20200527-1955,1.65.0.v20200527-1955] org.bouncycastle.bcpkix.source [1.65.0.v20200527-1955,1.65.0.v20200527-1955] org.bouncycastle.bcprov [1.65.1.v20200529-1514,1.65.1.v20200529-1514] org.bouncycastle.bcprov.source [1.65.1.v20200529-1514,1.65.1.v20200529-1514] - org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000] + org.hamcrest [2.2.0.v20210711-0821,2.2.0.v20210711-0821] + org.hamcrest.source [2.2.0.v20210711-0821,2.2.0.v20210711-0821] org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519] org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519] org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246] diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210602031627-2021-06.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210602031627-2021-06.tpd index ff007bc36d..83b5bb3fd2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210602031627-2021-06.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210602031627-2021-06.tpd @@ -1,4 +1,4 @@ -target "S20210705204906" with source configurePhase +target "R20210602031627-2021-06" with source configurePhase // see https://download.eclipse.org/tools/orbit/downloads/ location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" { diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 30dfef5cc3..31629b224e 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -25,7 +25,7 @@ Import-Package: org.eclipse.jgit.api;version="[5.13.0,5.14.0)", org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)", org.eclipse.jgit.util;version="[5.13.0,5.14.0)", org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)", - org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", + org.hamcrest.core;bundle-version="[2.2.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.kohsuke.args4j;version="[2.33.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 1ac8faaa41..d5256c40c3 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -30,7 +30,7 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)", org.eclipse.jgit.transport;version="[5.13.0,5.14.0)", org.eclipse.jgit.transport.sshd;version="[5.13.0,5.14.0)", org.eclipse.jgit.util;version="[5.13.0,5.14.0)", + org.hamcrest;version="[2.2.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" -Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 276ba5d192..945ebb6a49 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", org.eclipse.jgit.lib;version="[5.13.0,5.14.0)", org.eclipse.jgit.transport;version="[5.13.0,5.14.0)", org.eclipse.jgit.util;version="[5.13.0,5.14.0)", + org.hamcrest;version="[2.2.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" -Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 2cc7681a44..8b50e010ce 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.compress.compressors.bzip2;version="[1.15.0,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)", org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)", - org.assertj.core.api;version="[3.14.0,4.0.0)", + org.assertj.core.api;version="[3.20.0,4.0.0)", org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)", org.eclipse.jgit.api;version="[5.13.0,5.14.0)", org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)", @@ -69,6 +69,8 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.eclipse.jgit.util;version="[5.13.0,5.14.0)", org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)", org.eclipse.jgit.util.sha1;version="[5.13.0,5.14.0)", + org.hamcrest;version="[2.2.0,3.0.0)", + org.hamcrest.collection;version="[2.2.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.function;version="[4.13.0,5.0.0)", @@ -82,5 +84,3 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.objenesis;version="[2.6.0,3.0.0)", org.slf4j;version="[1.7.0,2.0.0)", org.tukaani.xz;version="[1.6.0,2.0)" -Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", - org.hamcrest.library;bundle-version="[1.1.0,2.0.0)" diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 21236fb77c..d403c95ec1 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -60,9 +60,9 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-library</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> - <version>[1.1.0,2.0.0)</version> + <version>${hamcrest-version}</version> </dependency> <dependency> diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ObjectIdMatcher.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ObjectIdMatcher.java index c3df19a230..77e8afb2b9 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ObjectIdMatcher.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ObjectIdMatcher.java @@ -16,7 +16,6 @@ import java.util.stream.Collectors; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Sets; import org.hamcrest.Description; -import org.hamcrest.Factory; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; @@ -59,7 +58,6 @@ class ObjectIdMatcher extends TypeSafeMatcher<Collection<ObjectId>> { * @return true if examined and specified sets contains exactly the same * elements. */ - @Factory static Matcher<Collection<ObjectId>> hasOnlyObjectIds( String... oids) { return new ObjectIdMatcher(Sets.of(oids)); @@ -179,6 +179,8 @@ <maven-surefire-report-plugin-version>${maven-surefire-plugin-version}</maven-surefire-report-plugin-version> <maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version> <plexus-compiler-version>2.8.8</plexus-compiler-version> + <hamcrest-version>2.2</hamcrest-version> + <assertj-version>3.20.2</assertj-version> <!-- Properties to enable jacoco code coverage analysis --> <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> @@ -796,7 +798,7 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.14.0</version> + <version>${assertj-version}</version> </dependency> </dependencies> </dependencyManagement> |