Update orbit to I20210711110031

and update
- assertj to 3.20.2.v20210706-1104
- hamcrest to 2.2.0.v20210711-0821
  - classes which were in org.hamcrest.core 1.3 and org.hamcrest.library
    1.3 were all moved to org.hamcrest in 2.2
  - the annotation org.hamcrest.Factory was removed and is no longer
    needed
  - junit 4.13 requires hamcrest-core and hamcrest-library 1.3 therefore
    keep them in the target platform

CQ: 23501
Change-Id: Ife871c0343b611be9203aed7f86577e85bbf5c95

diff --git a/DEPENDENCIES b/DEPENDENCIES
index bd90df41463dab8b24ae24b55907d410d8c82adb..fe173bb5b2476e6bc710ebf75952b9c35881ef75 100644 (file)
--- 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

diff --git a/WORKSPACE b/WORKSPACE
index 5e28525ea815c5be8cd00ff0c1ca9cb6f5d022fa..b415c7af2c4313f9b7bf6f24ae1312e9d0f0aa46 100644 (file)
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -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"

diff --git a/lib/BUILD b/lib/BUILD
index 83709a305f6a4e2df0186ad10840ade8542f5831..cf08b945f84f6160fa2283abdc94e782a999c345 100644 (file)
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -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 aeac06ada11b882098752830d9460e73205a1530..63f0305ffe3e818bb303032d32922f8f3dfd0b1b 100644 (file)
--- 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 9b806292061c580e07fa898ff88d7cae8b7744e1..e5ac4fc162a08478bfc79169e7e964f39e3b774f 100644 (file)
--- 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 1aef1cd36c7973e8bb86c80b85325c726395f7fd..c012c9040227c5600ae1375c3b56fa0dc2e5e13f 100644 (file)
--- 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 d3c154d4202d845b43f99b49f0a431af16594f2e..0ecc883801c1173241dbe8b7cef952183f527745 100644 (file)
--- 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 3ab248e612bdd25e9737cbe85b45d6f88246c360..3b208aafe96532e4e03150dbf32c6ef389a0473e 100644 (file)
--- 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 35f2af02b047845a793242f017ada6362cda0acb..5a7bbad060bf1feeeb551d8ca2356a9d2dae739a 100644 (file)
--- 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 44a3c78c23a5bd2416e11cbd7f6177fe5ffaf90a..bbcb96234a59b6b5bb576d07017d87e9b4c856d5 100644 (file)
--- 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 19b121d39cb4b30d807e89e4a4ef4abf32a9029e..635ff49f1244099785dab8a845ab5073b54c548c 100644 (file)
--- 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 df8edf4092b7ba87daccef49f3e4a3d70e360c18..a967164897cb94e6739c121f4d46b80c54f669d5 100644 (file)
--- 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 ea5cfca14768af5cf94f8526ae2276a31b4ec0b1..b33916d59f3e44bc2c527c78c8bb9eba590740f1 100644 (file)
--- 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 9ec8d28a24baba4bdbce22c52259d88e36ff09d7..4e8fbe1d1800f5d6ab5c9aeafc7727c7cab01fb4 100644 (file)
--- 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 6bd6483e6daf8b08896c6d39139578121030768b..29e070d051b7c52d80914718db1a37643b96e2fd 100644 (file)
--- 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 04e472ce230c19a7b9418378d678c069ba2298fb..6325b597234995b1402ef7622417d17a45efc61b 100644 (file)
--- 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 6cff6b2924690ecc472dfcfb4c6ddd04017ac426..18b3d5cfcf68bb3c0893f1938ad1ca5cfbb03f43 100644 (file)
--- 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 a5ce93e42fd25d6d6ab549a8f3c0feb4929d3906..4cc1f21ae1478664e1c4de3c0e7fd945e9d7fdbd 100644 (file)
--- 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 68fc3cae10248298c51d0e28304e0f4170b1ba58..2140d943c0f847e1dd6ef953642b4aaccf7b15d4 100644 (file)
--- 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 765f3494979f7e6d4d1f99789c7c6d0b02fe38be..cca13da1c7c743ee3a65608e97ec34e86f11144d 100644 (file)
--- 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 312432644836d7aa5f75302b6c0858b189abd446..97588dba5a0ec1d35ea1722e673e0992cfab5b6e 100644 (file)
--- 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 123ab6944bef6dcda60bef59f4995ba0bc9dd18d..c36d2ef856e7f739db00688beaf876b2d92d0aa2 100644 (file)
--- 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 8f87c866ccf2cdc5bd786f1676549edd8fecaf2b..6f5cc8aa782da01b69b4f380c6df3f79dd01c6ea 100644 (file)
--- 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 cde727d3cb936baf1983a87741eb3137948b7c62..b91ed7c717af540eac0b833fde53802e47525c85 100644 (file)
--- 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 7ae2b1d30a527788db8a67ca2f40d9ebfe2acf00..911418195756733355c45bd62e20aeef9d84699b 100644 (file)
--- 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 cdd280dd7a0097975c8ffc9788dfe0c02cf2e8b6..d93bdf70b9b0be4745914b4c373f353f657375b1 100644 (file)
--- 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 6bac8370a59982408edf7a1b112f33f94f080e6a..4e6c59a012924f753fe5712d086d4f865d1441aa 100644 (file)
--- 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 ad706d8445afa93bfe07dd95a5e71d1fa416662c..0769e535761068cef052bcb0df1787738f90b7c9 100644 (file)
--- 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 3cc1ebc15372f8613104a52a0b1b4c9d52e05827..c0fa592a0ce880ade5191a8f2934139139cac855 100644 (file)
--- 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 46f9f67544157abe5b8fc7853b49ec892e39a3e8..11b7151dbf985765bac1da337b0f5603a10299a5 100644 (file)
--- 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 f4ffd40e669eb5bbb45782ae1ffa2be4de72c96a..aba2a259ad36d5f3c52c37219b21ff4164fdba0c 100644 (file)
--- 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 d55c62c9f17bf163219da4fecd1b8a7ee0496fa0..e23f4142ceb012215fcdeab84272948af11c993d 100644 (file)
--- 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 1e9d4f004a512abd9268a84f865950c863f71125..f35d6b8f44fc0c1789cad4f4c8141f28f4be13e2 100644 (file)
--- 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 b8540d0940c473d31355586eb6aa534b9d7cbfbf..098773f533b69d1f3f2749ae05e190c57a7e26ba 100644 (file)
--- 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 530aeb75d7447bb4b135ddebd874310e0b59f1df..4f10e7ded16d11fa27890a394f0702f367c45c7a 100644 (file)
--- 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 8ebcceec85a2ee6a0818bfb3b2e63114042f4272..79f21315ef612493d8403c81bf87b796e837a50a 100644 (file)
--- 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 f59dc2baae8b33b6a94e14efdfa6b4ed9e20b190..0970da67c9ee52c170722d431d9644bdb707f752 100644 (file)
--- 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 3164a7eb7f411c2ae5e80992200703a37e2ecca3..b98319a071295200f181cbe11ec5c0538e0da186 100644 (file)
--- 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 d228d3d187b3fd79365a33a4fbda8a5adf7ebb58..8d602b39f22bbc6297c94ffca5c7e2317f271bb1 100644 (file)
--- 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 2ec5bf8df8b02a253ffa6e0e0eb97e1f099d1759..640ced3214d70e5022cd926933f2075fb8348590 100644 (file)
--- 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 21af8b1d861a519cf61d31ffb0e93e5934f1c84c..2ec27c6f7547038b4ff9ac7d3b5868945febb64f 100644 (file)
--- 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/I20210711110031.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/I20210711110031.tpd
new file mode 100644 (file)
index 0000000..c041340
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/I20210711110031.tpd
@@ -0,0 +1,67 @@
+target "I20210711110031" with source configurePhase
+// see https://download.eclipse.org/tools/orbit/downloads/
+
+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]
+       com.jcraft.jsch.source [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
+       com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305]
+       com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305]
+       javaewah [1.1.12.v20210622-2206,1.1.12.v20210622-2206]
+       javaewah.source [1.1.12.v20210622-2206,1.1.12.v20210622-2206]
+       javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800]
+       javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800]
+       net.bytebuddy.byte-buddy [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
+       net.bytebuddy.byte-buddy-agent [1.9.0.v20181106-1534,1.9.0.v20181106-1534]
+       net.bytebuddy.byte-buddy-agent.source [1.9.0.v20181106-1534,1.9.0.v20181106-1534]
+       net.bytebuddy.byte-buddy.source [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
+       net.i2p.crypto.eddsa [0.3.0.v20181102-1323,0.3.0.v20181102-1323]
+       net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323]
+       org.apache.ant [1.10.10.v20210426-1926,1.10.10.v20210426-1926]
+       org.apache.ant.source [1.10.10.v20210426-1926,1.10.10.v20210426-1926]
+       org.apache.commons.codec [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
+       org.apache.commons.codec.source [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
+       org.apache.commons.compress [1.19.0.v20200106-2343,1.19.0.v20200106-2343]
+       org.apache.commons.compress.source [1.19.0.v20200106-2343,1.19.0.v20200106-2343]
+       org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
+       org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
+       org.apache.httpcomponents.httpclient [4.5.13.v20210128-2225,4.5.13.v20210128-2225]
+       org.apache.httpcomponents.httpclient.source [4.5.13.v20210128-2225,4.5.13.v20210128-2225]
+       org.apache.httpcomponents.httpcore [4.4.14.v20210128-2225,4.4.14.v20210128-2225]
+       org.apache.httpcomponents.httpcore.source [4.4.14.v20210128-2225,4.4.14.v20210128-2225]
+       org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
+       org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815]
+       org.apache.sshd.osgi [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
+       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.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 [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]
+       org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
+       org.junit [4.13.0.v20200204-1500,4.13.0.v20200204-1500]
+       org.junit.source [4.13.0.v20200204-1500,4.13.0.v20200204-1500]
+       org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
+       org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
+       org.mockito [2.23.0.v20200310-1642,2.23.0.v20200310-1642]
+       org.mockito.source [2.23.0.v20200310-1642,2.23.0.v20200310-1642]
+       org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
+       org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
+       org.slf4j.api [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
+       org.slf4j.api.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
+       org.slf4j.binding.log4j12 [1.7.30.v20201108-2042,1.7.30.v20201108-2042]
+       org.slf4j.binding.log4j12.source [1.7.30.v20201108-2042,1.7.30.v20201108-2042]
+       org.tukaani.xz [1.9.0.v20210624-1259,1.9.0.v20210624-1259]
+       org.tukaani.xz.source [1.9.0.v20210624-1259,1.9.0.v20210624-1259]
+}

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 ff007bc36d732183a394a88e6b923e300e606cab..83b5bb3fd29d9bff7012e2a3c6cae686f9092b32 100644 (file)
--- 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.packaging/org.eclipse.jgit.target/orbit/S20210705204906.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20210705204906.tpd
deleted file mode 100644 (file)
index 4cd68c8..0000000
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20210705204906.tpd
+++ /dev/null
@@ -1,66 +0,0 @@
-target "S20210705204906" with source configurePhase
-// see https://download.eclipse.org/tools/orbit/downloads/
-
-location "https://download.eclipse.org/tools/orbit/downloads/drops/S20210705204906/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]
-       com.jcraft.jsch.source [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
-       com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305]
-       com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305]
-       javaewah [1.1.12.v20210622-2206,1.1.12.v20210622-2206]
-       javaewah.source [1.1.12.v20210622-2206,1.1.12.v20210622-2206]
-       javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800]
-       javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800]
-       net.bytebuddy.byte-buddy [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
-       net.bytebuddy.byte-buddy-agent [1.9.0.v20181106-1534,1.9.0.v20181106-1534]
-       net.bytebuddy.byte-buddy-agent.source [1.9.0.v20181106-1534,1.9.0.v20181106-1534]
-       net.bytebuddy.byte-buddy.source [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
-       net.i2p.crypto.eddsa [0.3.0.v20181102-1323,0.3.0.v20181102-1323]
-       net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323]
-       org.apache.ant [1.10.10.v20210426-1926,1.10.10.v20210426-1926]
-       org.apache.ant.source [1.10.10.v20210426-1926,1.10.10.v20210426-1926]
-       org.apache.commons.codec [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
-       org.apache.commons.codec.source [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
-       org.apache.commons.compress [1.19.0.v20200106-2343,1.19.0.v20200106-2343]
-       org.apache.commons.compress.source [1.19.0.v20200106-2343,1.19.0.v20200106-2343]
-       org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
-       org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
-       org.apache.httpcomponents.httpclient [4.5.13.v20210128-2225,4.5.13.v20210128-2225]
-       org.apache.httpcomponents.httpclient.source [4.5.13.v20210128-2225,4.5.13.v20210128-2225]
-       org.apache.httpcomponents.httpcore [4.4.14.v20210128-2225,4.4.14.v20210128-2225]
-       org.apache.httpcomponents.httpcore.source [4.4.14.v20210128-2225,4.4.14.v20210128-2225]
-       org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
-       org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815]
-       org.apache.sshd.osgi [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
-       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.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.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]
-       org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
-       org.junit [4.13.0.v20200204-1500,4.13.0.v20200204-1500]
-       org.junit.source [4.13.0.v20200204-1500,4.13.0.v20200204-1500]
-       org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
-       org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
-       org.mockito [2.23.0.v20200310-1642,2.23.0.v20200310-1642]
-       org.mockito.source [2.23.0.v20200310-1642,2.23.0.v20200310-1642]
-       org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
-       org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
-       org.slf4j.api [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
-       org.slf4j.api.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
-       org.slf4j.binding.log4j12 [1.7.30.v20201108-2042,1.7.30.v20201108-2042]
-       org.slf4j.binding.log4j12.source [1.7.30.v20201108-2042,1.7.30.v20201108-2042]
-       org.tukaani.xz [1.9.0.v20210624-1259,1.9.0.v20210624-1259]
-       org.tukaani.xz.source [1.9.0.v20210624-1259,1.9.0.v20210624-1259]
-}

diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
index 30dfef5cc3ff808485722cef823469b45f36cb67..31629b224e7588bd3d6ca2e747a616175839290d 100644 (file)
--- 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 1ac8faaa41675f88034806966bf5322427d7052e..d5256c40c30bfc7a7f4cb27b1a5130d81b390b51 100644 (file)
--- 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 276ba5d192469b1366271be202f8682e20d5f894..945ebb6a490ce7b7f02ae941f723d8126f242a4d 100644 (file)
--- 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 2cc7681a445db1e575fb8b72f8e9685ddfc7c45a..8b50e010cedf0cddabf2bc7e7b133830ffb20497 100644 (file)
--- 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 21236fb77cc0f388a414ec2079771e02f137c5e3..d403c95ec10bbe24017a3773c51e8eb350e1c3c8 100644 (file)
--- 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 c3df19a230a74527d48c0b6034734fd046121ca7..77e8afb2b96d5822b4e8ad137833efeb954f2979 100644 (file)
--- 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));

diff --git a/pom.xml b/pom.xml
index 01b6434adeae88d6f150b643018792a35b5eae28..345b5849775907283303045c25b8b5800a60a420 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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>