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>tags/v5.7.0.202002241735-m3
@@ -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( |
@@ -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)" |
@@ -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)" |
@@ -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, |
@@ -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, |
@@ -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)" |
@@ -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" |
@@ -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"/> |
@@ -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 |
@@ -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"/> |
@@ -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 |
@@ -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"/> |
@@ -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 |
@@ -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"/> |
@@ -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 |
@@ -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"/> |
@@ -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 |
@@ -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"/> |
@@ -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 |
@@ -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"/> |
@@ -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 |
@@ -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"/> |
@@ -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 |
@@ -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"/> |
@@ -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 |
@@ -1,7 +1,7 @@ | |||
target "I20200115225246" with source configurePhase | |||
target "I20200120214610" with source configurePhase | |||
// see http://download.eclipse.org/tools/orbit/downloads/ | |||
location "https://download.eclipse.org/tools/orbit/downloads/drops/I20200115225246/repository" { | |||
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] | |||
@@ -47,8 +47,8 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/I202001152252 | |||
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.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] |
@@ -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)" |
@@ -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)" |
@@ -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)", |
@@ -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() { | |||
} | |||
} |
@@ -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; | |||
@@ -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; |
@@ -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; |
@@ -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> |