Update to Orbit I20200120214610 and JUnit to 4.13

Since version 4.13 JUnit has an assertThrows method. Remove the
implementation in MoreAsserts and use the one from JUnit.

CQ: 21439
Change-Id: I086baa94aa3069cebe87c4cbf91ed1534523c6cb
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/WORKSPACE b/WORKSPACE
index 0209d6d8895b667b03e1770fe49f84128a7c15e0..8c3c27f75bd6f22ff261804420fb4d95fd417ac9 100644 (file)
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -155,8 +155,8 @@ maven_jar(
 
 maven_jar(
     name = "junit",
-    artifact = "junit:junit:4.12",
-    sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec",
+    artifact = "junit:junit:4.13",
+    sha1 = "e49ccba652b735c93bd6e6f59760d8254cf597dd",
 )
 
 maven_jar(

diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index a8e76b254adad614186bbd1776f77381b6922a14..95a6da374de11e5704689b4c43b6f92cf4033d6c 100644 (file)
--- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
@@ -14,4 +14,4 @@ Import-Package: org.apache.tools.ant,
  org.eclipse.jgit.lib;version="[5.7.0,5.8.0)",
  org.eclipse.jgit.util;version="[5.7.0,5.8.0)",
  org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.12,5.0.0)"
+ org.junit;version="[4.13,5.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 d4ea158864d3a7e7ee240cf09813335d40e362f7..ad9413f504c11c7989de25395fcc96e531f16e92 100644 (file)
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -49,8 +49,8 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
  org.eclipse.jgit.util;version="[5.7.0,5.8.0)",
  org.hamcrest;version="[1.1.0,2.0.0)",
  org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.12,5.0.0)",
- org.junit.rules;version="[4.12,5.0.0)",
- org.junit.runner;version="[4.12,5.0.0)",
- org.junit.runners;version="[4.12,5.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.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index 5c889f6df8fc606dce0c3b10dde147dc47fdb04b..a622488cd17ed9e0c45cda643076a3aff61e59f3 100644 (file)
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -30,7 +30,7 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
  org.eclipse.jgit.revwalk;version="[5.7.0,5.8.0)",
  org.eclipse.jgit.transport;version="[5.7.0,5.8.0)",
  org.eclipse.jgit.transport.resolver;version="[5.7.0,5.8.0)",
- org.junit;version="[4.12,5.0.0)"
+ org.junit;version="[4.13,5.0.0)"
 Export-Package: org.eclipse.jgit.junit.http;version="5.7.0";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.junit,

diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
index 871e329155c1b69df35eef532a6446f8c0a78528..531f3be23cc54fb8c05773486e66c236846ffdb7 100644 (file)
--- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
@@ -25,11 +25,11 @@ Import-Package: org.eclipse.jgit.annotations;version="[5.7.0,5.8.0)",
  org.eclipse.jgit.util;version="[5.7.0,5.8.0)",
  org.eclipse.jgit.util.io;version="[5.7.0,5.8.0)",
  org.eclipse.jgit.util.time;version="[5.7.0,5.8.0)",
- org.junit;version="[4.12,5.0.0)",
- org.junit.rules;version="[4.12,5.0.0)",
- org.junit.runner;version="[4.12,5.0.0)",
- org.junit.runners;version="[4.12,5.0.0)",
- org.junit.runners.model;version="[4.12,5.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)",
+ org.junit.runners.model;version="[4.13,5.0.0)",
  org.slf4j;version="[1.7.0,2.0.0)"
 Export-Package: org.eclipse.jgit.junit;version="5.7.0";
   uses:="org.eclipse.jgit.dircache,

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 c4d3c90f00a015036f4b74f6deacfd3dafb3657d..ac7ee5f5c9d057456cc0a951a4c42a47e1ae8c68 100644 (file)
--- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
@@ -47,7 +47,7 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
  org.eclipse.jgit.treewalk.filter;version="[5.7.0,5.8.0)",
  org.eclipse.jgit.util;version="[5.7.0,5.8.0)",
  org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.12,5.0.0)",
- org.junit.rules;version="[4.12,5.0.0)",
- org.junit.runner;version="[4.12,5.0.0)",
- org.junit.runners;version="[4.12,5.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)"

diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
index e3fcf70ce2d668c136e68da19b4da567290165b8..2682ba6b8088459b3d803c245250c3dc8e10db9b 100644 (file)
--- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.7.0,5.8.0)",
  org.eclipse.jgit.treewalk.filter;version="[5.7.0,5.8.0)",
  org.eclipse.jgit.util;version="[5.7.0,5.8.0)",
  org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.12,5.0.0)",
- org.junit.runner;version="[4.12,5.0.0)",
- org.junit.runners;version="[4.12,5.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.lfs.test;version="5.7.0";x-friends:="org.eclipse.jgit.lfs.server.test"

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 09a21ee2bfffaacdc6e69a12d15eefcbf519c7a7..27c1bf641775cefcb119644edf8b75fb812082ed 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="1579135011">
+<target name="jgit-4.10" sequenceNumber="1579624098">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
@@ -68,8 +68,8 @@
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
       <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.junit.source" version="4.12.0.v201504281640"/>
+      <unit id="org.junit" version="4.13.0.v20200120-1926"/>
+      <unit id="org.junit.source" version="4.13.0.v20200120-1926"/>
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="2.23.0.v20190527-1420"/>
@@ -82,7 +82,7 @@
       <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
       <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
       <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200115225246/repository"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200120214610/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 4770e17564b6cab32c400c2c6431855d742379db..2a0a6060cc03e45086f2caa3c610a72a9daff042 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/I20200115225246.tpd"
+include "orbit/I20200120214610.tpd"
 
 location "http://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 e7ef174a1c08f6e7cf8bcaf4e92b2cabceb091ef..d1046cd4172a83b30e531aa36f918bab1886abb1 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="1579135256">
+<target name="jgit-4.11" sequenceNumber="1579624098">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
@@ -68,8 +68,8 @@
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
       <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.junit.source" version="4.12.0.v201504281640"/>
+      <unit id="org.junit" version="4.13.0.v20200120-1926"/>
+      <unit id="org.junit.source" version="4.13.0.v20200120-1926"/>
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="2.23.0.v20190527-1420"/>
@@ -82,7 +82,7 @@
       <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
       <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
       <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200115225246/repository"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200120214610/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 bee3069390c1c070c44f0e6442587ccb9b559e1e..5ca669b519d6fc3c561dc7ae070bdcb6474cc071 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/I20200115225246.tpd"
+include "orbit/I20200120214610.tpd"
 
 location "http://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 dc3930606e93eb87b216b5a0cec315c31bd9bb8b..a2aa362ba77bf903bddf78c8a9abe08aba34c61c 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="1579135257">
+<target name="jgit-4.12" sequenceNumber="1579624098">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
@@ -68,8 +68,8 @@
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
       <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.junit.source" version="4.12.0.v201504281640"/>
+      <unit id="org.junit" version="4.13.0.v20200120-1926"/>
+      <unit id="org.junit.source" version="4.13.0.v20200120-1926"/>
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="2.23.0.v20190527-1420"/>
@@ -82,7 +82,7 @@
       <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
       <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
       <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200115225246/repository"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200120214610/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 6bf4c29b474b16db155c8271f52ea300dbf447fd..8f9736bc9911a15458ec0bb67eda6fa64e8486fa 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/I20200115225246.tpd"
+include "orbit/I20200120214610.tpd"
 
 location "http://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 d6c091d998cc6ed0a4fee5f63413210736123c1d..72f1f0b8545bbcc91995834314678ade698a3414 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="1579135256">
+<target name="jgit-4.13" sequenceNumber="1579624098">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
@@ -68,8 +68,8 @@
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
       <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.junit.source" version="4.12.0.v201504281640"/>
+      <unit id="org.junit" version="4.13.0.v20200120-1926"/>
+      <unit id="org.junit.source" version="4.13.0.v20200120-1926"/>
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="2.23.0.v20190527-1420"/>
@@ -82,7 +82,7 @@
       <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
       <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
       <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200115225246/repository"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200120214610/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 a17a624ea1e39a3ac2f43bdd47c62d99acebdecf..e785aa0f998e4d3f9c676ce218d99852a2ae0670 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/I20200115225246.tpd"
+include "orbit/I20200120214610.tpd"
 
 location "http://download.eclipse.org/releases/2019-09/" {
        org.eclipse.osgi lazy

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14-staging.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14-staging.target
index c168bcc1ebb3159cc224bc1eb0d2a98c6715b599..e91c4747ced232f7a681c9afc31f2f8549fdc2a4 100644 (file)
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14-staging.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14-staging.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-staging" sequenceNumber="1579135254">
+<target name="jgit-4.14-staging" sequenceNumber="1579624098">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
@@ -68,8 +68,8 @@
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
       <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.junit.source" version="4.12.0.v201504281640"/>
+      <unit id="org.junit" version="4.13.0.v20200120-1926"/>
+      <unit id="org.junit.source" version="4.13.0.v20200120-1926"/>
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="2.23.0.v20190527-1420"/>
@@ -82,7 +82,7 @@
       <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
       <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
       <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200115225246/repository"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200120214610/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-staging.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14-staging.tpd
index 18bcbff9a5cbe40fd9fc3b5a0ee85073b24239ab..c3b73764eb1688d67263b4864e92d991792d4575 100644 (file)
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14-staging.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14-staging.tpd
@@ -1,7 +1,7 @@
 target "jgit-4.14-staging" with source configurePhase
 
 include "projects/jetty-9.4.x.tpd"
-include "orbit/I20200115225246.tpd"
+include "orbit/I20200120214610.tpd"
 
 location "http://download.eclipse.org/staging/2019-12/" {
        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 efb0910e47001050a386b44f91ae25bdc16064b0..661085dada61110d33d7221343c1f121491bf9d5 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="1579135268">
+<target name="jgit-4.6" sequenceNumber="1579624098">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
@@ -68,8 +68,8 @@
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
       <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.junit.source" version="4.12.0.v201504281640"/>
+      <unit id="org.junit" version="4.13.0.v20200120-1926"/>
+      <unit id="org.junit.source" version="4.13.0.v20200120-1926"/>
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="2.23.0.v20190527-1420"/>
@@ -82,7 +82,7 @@
       <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
       <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
       <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200115225246/repository"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200120214610/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 11ea74ea0f7116cf883bd78602b51368b3dd1db1..a90855bea4ad53546523bea23aa2cd49801ada4d 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/I20200115225246.tpd"
+include "orbit/I20200120214610.tpd"
 
 location "http://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 9508aed8eedb0d4879e78b5d7c0643dd61fec000..3cfe837b953c4ca18da946832a0c55f4e2e1835e 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="1579135260">
+<target name="jgit-4.7" sequenceNumber="1579624098">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
@@ -68,8 +68,8 @@
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
       <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.junit.source" version="4.12.0.v201504281640"/>
+      <unit id="org.junit" version="4.13.0.v20200120-1926"/>
+      <unit id="org.junit.source" version="4.13.0.v20200120-1926"/>
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="2.23.0.v20190527-1420"/>
@@ -82,7 +82,7 @@
       <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
       <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
       <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200115225246/repository"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200120214610/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 6b745b5da689019e2506846e5c9bcfe5d89b17fe..8da14627c4de9d30165cd737bcda46406b5318bd 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/I20200115225246.tpd"
+include "orbit/I20200120214610.tpd"
 
 location "http://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 8da1c503e64fde07f15e1a21870849c9b5316fb3..28911154519a6a03906d78d63715094a0787cf79 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="1579135256">
+<target name="jgit-4.8" sequenceNumber="1579624098">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
@@ -68,8 +68,8 @@
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
       <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.junit.source" version="4.12.0.v201504281640"/>
+      <unit id="org.junit" version="4.13.0.v20200120-1926"/>
+      <unit id="org.junit.source" version="4.13.0.v20200120-1926"/>
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="2.23.0.v20190527-1420"/>
@@ -82,7 +82,7 @@
       <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
       <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
       <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200115225246/repository"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200120214610/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 5630fbc193120f77a585c9c5c1195a6cebc14f79..65146f8feaca8c2e324d2bf14bb0cdc7f8585ccc 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/I20200115225246.tpd"
+include "orbit/I20200120214610.tpd"
 
 location "http://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 9340c2a843ce2a0591d8b48e4ef81fb2c4b02414..c6ee0a1650e533b7771211c0f28df287891e57d2 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="1579135257">
+<target name="jgit-4.9" sequenceNumber="1579624098">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
@@ -68,8 +68,8 @@
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
       <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.junit.source" version="4.12.0.v201504281640"/>
+      <unit id="org.junit" version="4.13.0.v20200120-1926"/>
+      <unit id="org.junit.source" version="4.13.0.v20200120-1926"/>
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="2.23.0.v20190527-1420"/>
@@ -82,7 +82,7 @@
       <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
       <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
       <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200115225246/repository"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200120214610/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 38619652a80f97212d0e2726c2998ab9e0e8d7dc..63b2948c844b1d7ff5c73bee79d9d05035ae1ceb 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/I20200115225246.tpd"
+include "orbit/I20200120214610.tpd"
 
 location "http://download.eclipse.org/releases/2018-09/" {
        org.eclipse.osgi lazy

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/I20200115225246.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/I20200115225246.tpd
deleted file mode 100644 (file)
index c43455e..0000000
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/I20200115225246.tpd
+++ /dev/null
@@ -1,65 +0,0 @@
-target "I20200115225246" with source configurePhase
-// see http://download.eclipse.org/tools/orbit/downloads/
-
-location "https://download.eclipse.org/tools/orbit/downloads/drops/I20200115225246/repository" {
-       com.google.gson [2.8.2.v20180104-1110,2.8.2.v20180104-1110]
-       com.google.gson.source [2.8.2.v20180104-1110,2.8.2.v20180104-1110]
-       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.7.v20200107-0831,1.1.7.v20200107-0831]
-       javaewah.source [1.1.7.v20200107-0831,1.1.7.v20200107-0831]
-       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.7.v20190926-0324,1.10.7.v20190926-0324]
-       org.apache.ant.source [1.10.7.v20190926-0324,1.10.7.v20190926-0324]
-       org.apache.commons.codec [1.13.0.v20200108-0001,1.13.0.v20200108-0001]
-       org.apache.commons.codec.source [1.13.0.v20200108-0001,1.13.0.v20200108-0001]
-       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.10.v20200114-1512,4.5.10.v20200114-1512]
-       org.apache.httpcomponents.httpclient.source [4.5.10.v20200114-1512,4.5.10.v20200114-1512]
-       org.apache.httpcomponents.httpcore [4.4.12.v20200108-1212,4.4.12.v20200108-1212]
-       org.apache.httpcomponents.httpcore.source [4.4.12.v20200108-1212,4.4.12.v20200108-1212]
-       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.2.0.v20190425-2127,2.2.0.v20190425-2127]
-       org.apache.sshd.osgi.source [2.2.0.v20190425-2127,2.2.0.v20190425-2127]
-       org.apache.sshd.sftp [2.2.0.v20190425-2127,2.2.0.v20190425-2127]
-       org.apache.sshd.sftp.source [2.2.0.v20190425-2127,2.2.0.v20190425-2127]
-       org.bouncycastle.bcpg [1.64.0.v20191109-0815,1.64.0.v20191109-0815]
-       org.bouncycastle.bcpg.source [1.64.0.v20191109-0815,1.64.0.v20191109-0815]
-       org.bouncycastle.bcpkix [1.64.0.v20191109-0815,1.64.0.v20191109-0815]
-       org.bouncycastle.bcpkix.source [1.64.0.v20191109-0815,1.64.0.v20191109-0815]
-       org.bouncycastle.bcprov [1.64.0.v20191109-0815,1.64.0.v20191109-0815]
-       org.bouncycastle.bcprov.source [1.64.0.v20191109-0815,1.64.0.v20191109-0815]
-       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.12.0.v201504281640,4.12.0.v201504281640]
-       org.junit.source [4.12.0.v201504281640,4.12.0.v201504281640]
-       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.v20190527-1420,2.23.0.v20190527-1420]
-       org.mockito.source [2.23.0.v20190527-1420,2.23.0.v20190527-1420]
-       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.2.v20121108-1250,1.7.2.v20121108-1250]
-       org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
-       org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
-       org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
-       org.tukaani.xz [1.8.0.v20180207-1613,1.8.0.v20180207-1613]
-       org.tukaani.xz.source [1.8.0.v20180207-1613,1.8.0.v20180207-1613]
-}
-

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/I20200120214610.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/I20200120214610.tpd
new file mode 100644 (file)
index 0000000..3cf7d4c
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/I20200120214610.tpd
@@ -0,0 +1,65 @@
+target "I20200120214610" with source configurePhase
+// see http://download.eclipse.org/tools/orbit/downloads/
+
+location "https://download.eclipse.org/tools/orbit/downloads/drops/I20200120214610/repository" {
+       com.google.gson [2.8.2.v20180104-1110,2.8.2.v20180104-1110]
+       com.google.gson.source [2.8.2.v20180104-1110,2.8.2.v20180104-1110]
+       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.7.v20200107-0831,1.1.7.v20200107-0831]
+       javaewah.source [1.1.7.v20200107-0831,1.1.7.v20200107-0831]
+       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.7.v20190926-0324,1.10.7.v20190926-0324]
+       org.apache.ant.source [1.10.7.v20190926-0324,1.10.7.v20190926-0324]
+       org.apache.commons.codec [1.13.0.v20200108-0001,1.13.0.v20200108-0001]
+       org.apache.commons.codec.source [1.13.0.v20200108-0001,1.13.0.v20200108-0001]
+       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.10.v20200114-1512,4.5.10.v20200114-1512]
+       org.apache.httpcomponents.httpclient.source [4.5.10.v20200114-1512,4.5.10.v20200114-1512]
+       org.apache.httpcomponents.httpcore [4.4.12.v20200108-1212,4.4.12.v20200108-1212]
+       org.apache.httpcomponents.httpcore.source [4.4.12.v20200108-1212,4.4.12.v20200108-1212]
+       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.2.0.v20190425-2127,2.2.0.v20190425-2127]
+       org.apache.sshd.osgi.source [2.2.0.v20190425-2127,2.2.0.v20190425-2127]
+       org.apache.sshd.sftp [2.2.0.v20190425-2127,2.2.0.v20190425-2127]
+       org.apache.sshd.sftp.source [2.2.0.v20190425-2127,2.2.0.v20190425-2127]
+       org.bouncycastle.bcpg [1.64.0.v20191109-0815,1.64.0.v20191109-0815]
+       org.bouncycastle.bcpg.source [1.64.0.v20191109-0815,1.64.0.v20191109-0815]
+       org.bouncycastle.bcpkix [1.64.0.v20191109-0815,1.64.0.v20191109-0815]
+       org.bouncycastle.bcpkix.source [1.64.0.v20191109-0815,1.64.0.v20191109-0815]
+       org.bouncycastle.bcprov [1.64.0.v20191109-0815,1.64.0.v20191109-0815]
+       org.bouncycastle.bcprov.source [1.64.0.v20191109-0815,1.64.0.v20191109-0815]
+       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.v20200120-1926,4.13.0.v20200120-1926]
+       org.junit.source [4.13.0.v20200120-1926,4.13.0.v20200120-1926]
+       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.v20190527-1420,2.23.0.v20190527-1420]
+       org.mockito.source [2.23.0.v20190527-1420,2.23.0.v20190527-1420]
+       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.2.v20121108-1250,1.7.2.v20121108-1250]
+       org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
+       org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
+       org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
+       org.tukaani.xz [1.8.0.v20180207-1613,1.8.0.v20180207-1613]
+       org.tukaani.xz.source [1.8.0.v20180207-1613,1.8.0.v20180207-1613]
+}
+

diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
index b48c1e5ff21bc27a91ba7bbf8de9dd6f3110f802..a7a11b4048d62f1baa5abf0c6cb5b92ba158f122 100644 (file)
--- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Import-Package: org.eclipse.jgit.api;version="[5.7.0,5.8.0)",
  org.eclipse.jgit.util;version="[5.7.0,5.8.0)",
  org.eclipse.jgit.util.io;version="[5.7.0,5.8.0)",
  org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
- org.junit;version="[4.12,5.0.0)",
- org.junit.rules;version="[4.12,5.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)"
 Require-Bundle: org.tukaani.xz;bundle-version="[1.3.0,2.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 8fd1756440655f3f51d7b3dc52fe60a57ccaea0f..5bf2563aa773f1d00a5ab64c5ec3aa30d6e30bd6 100644 (file)
--- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
@@ -24,6 +24,6 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.2.0,2.3.0)",
  org.eclipse.jgit.transport.ssh;version="[5.7.0,5.8.0)",
  org.eclipse.jgit.transport.sshd;version="[5.7.0,5.8.0)",
  org.eclipse.jgit.util;version="[5.7.0,5.8.0)",
- org.junit;version="[4.12,5.0.0)",
- org.junit.experimental.theories;version="[4.12,5.0.0)",
- org.junit.runner;version="[4.12,5.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)"

diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index d8f6bcfe283e28ebbf63c59b27d15d478cf3d27c..509ef0b05c232b2bb36e452afd821ebc66934a85 100644 (file)
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -70,11 +70,11 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
  org.eclipse.jgit.util;version="[5.7.0,5.8.0)",
  org.eclipse.jgit.util.io;version="[5.7.0,5.8.0)",
  org.eclipse.jgit.util.sha1;version="[5.7.0,5.8.0)",
- org.junit;version="[4.12,5.0.0)",
- org.junit.experimental.theories;version="[4.12,5.0.0)",
- org.junit.rules;version="[4.12,5.0.0)",
- org.junit.runner;version="[4.12,5.0.0)",
- org.junit.runners;version="[4.12,5.0.0)",
+ org.junit;version="[4.13,5.0.0)",
+ org.junit.experimental.theories;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)",
  org.mockito;version="[2.23.0,3.0.0)",
  org.mockito.invocation;version="[2.23.0,3.0.0)",
  org.mockito.junit;version="[2.23.0,3.0.0)",

diff --git a/org.eclipse.jgit.test/src/org/eclipse/jgit/lib/MoreAsserts.java b/org.eclipse.jgit.test/src/org/eclipse/jgit/lib/MoreAsserts.java
deleted file mode 100644 (file)
index cd0a6f1..0000000
--- a/org.eclipse.jgit.test/src/org/eclipse/jgit/lib/MoreAsserts.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2019, Google LLC and others
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0 which is available at
- * https://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-package org.eclipse.jgit.lib;
-
-/** Assertion methods. */
-public class MoreAsserts {
-       /**
-        * Simple version of assertThrows that will be introduced in JUnit 4.13.
-        *
-        * @param expected
-        *            Expected throwable class
-        * @param r
-        *            Runnable that is expected to throw an exception.
-        * @return The thrown exception.
-        */
-       public static <T extends Throwable> T assertThrows(Class<T> expected,
-                       ThrowingRunnable r) {
-               try {
-                       r.run();
-               } catch (Throwable actual) {
-                       if (expected.isAssignableFrom(actual.getClass())) {
-                               @SuppressWarnings("unchecked")
-                               T toReturn = (T) actual;
-                               return toReturn;
-                       }
-                       throw new AssertionError("Expected " + expected.getSimpleName()
-                                       + ", but got " + actual.getClass().getSimpleName(), actual);
-               }
-               throw new AssertionError(
-                               "Expected " + expected.getSimpleName() + " to be thrown");
-       }
-
-       public interface ThrowingRunnable {
-               void run() throws Throwable;
-       }
-
-       private MoreAsserts() {
-       }
-}

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java
index f73dfedaec441d9dfddd5fa2366ee113cabb2cf6..65c48ad895755f05414996bd31c7e84ce52b693c 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java
@@ -13,7 +13,6 @@ package org.eclipse.jgit.internal.storage.reftable;
 import static org.eclipse.jgit.lib.Constants.HEAD;
 import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH;
 import static org.eclipse.jgit.lib.Constants.R_HEADS;
-import static org.eclipse.jgit.lib.MoreAsserts.assertThrows;
 import static org.eclipse.jgit.lib.Ref.Storage.NEW;
 import static org.eclipse.jgit.lib.Ref.Storage.PACKED;
 import static org.hamcrest.CoreMatchers.containsString;
@@ -23,6 +22,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java
index 2c9712c996518fa569ad48e8823b6523973ecaa3..d113eabd89f5e4a436524deb9242f46dc6e90661 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java
@@ -9,10 +9,10 @@
  */
 package org.eclipse.jgit.transport;
 
-import static org.eclipse.jgit.lib.MoreAsserts.assertThrows;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Collections;

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java
index 108e5edb78f9ece67f2c8b74d71209a770323066..052cb14bf5ee41e9dba879d5e36f5cbd7fe83513 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java
@@ -1,6 +1,5 @@
 package org.eclipse.jgit.transport;
 
-import static org.eclipse.jgit.lib.MoreAsserts.assertThrows;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.hasItems;
@@ -10,6 +9,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;

diff --git a/pom.xml b/pom.xml
index 2e16b37f9c6308c05454f51ad43e5ae50cd45fe2..6cf7b3592a3c4ea789692026644cdfdcc9ddab56 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,7 @@
     <jsch-version>0.1.55</jsch-version>
     <jzlib-version>1.1.1</jzlib-version>
     <javaewah-version>1.1.7</javaewah-version>
-    <junit-version>4.12</junit-version>
+    <junit-version>4.13</junit-version>
     <test-fork-count>1C</test-fork-count>
     <args4j-version>2.33</args4j-version>
     <commons-compress-version>1.19</commons-compress-version>