Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2018-11-21 18:44:08 -0500
committerGerrit Code Review @ Eclipse.org2018-11-21 18:44:08 -0500
commitb16b49081a8aeb839470f5feef60fa8e8c3b086d (patch)
treef9dbb6191a6eb02f4e1ca3125ea5452fad65d23c
parent8dd018f3ca65a80d3bfee590d62f325565904b87 (diff)
parent237465be54418110099cf5e047e988fea9d3aec6 (diff)
downloadegit-b16b49081a8aeb839470f5feef60fa8e8c3b086d.tar.gz
egit-b16b49081a8aeb839470f5feef60fa8e8c3b086d.tar.xz
egit-b16b49081a8aeb839470f5feef60fa8e8c3b086d.zip
Merge "Update mockito to 2.13.0"
-rw-r--r--org.eclipse.egit.core.test/META-INF/MANIFEST.MF10
-rw-r--r--org.eclipse.egit.target/egit-4.10-staging.target16
-rw-r--r--org.eclipse.egit.target/egit-4.5.target16
-rw-r--r--org.eclipse.egit.target/egit-4.6.target16
-rw-r--r--org.eclipse.egit.target/egit-4.7.target16
-rw-r--r--org.eclipse.egit.target/egit-4.8.target16
-rw-r--r--org.eclipse.egit.target/egit-4.9.target16
-rw-r--r--org.eclipse.egit.target/orbit/I20181102163257-2018-12.tpd12
-rw-r--r--org.eclipse.egit.ui.test/META-INF/MANIFEST.MF7
9 files changed, 79 insertions, 46 deletions
diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
index b42b9cc9a..6a37bf679 100644
--- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
@@ -15,7 +15,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.hamcrest;bundle-version="[1.1.0,2.0.0)",
org.junit;bundle-version="[4.3.0,5.0.0)",
org.eclipse.egit.core.junit;bundle-version="[5.2.0,5.3.0)"
-Import-Package: org.eclipse.egit.core;version="[5.2.0,5.3.0)",
+Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)",
+ net.bytebuddy.agent;version="[1.7.9,2.0.0)",
+ org.eclipse.egit.core;version="[5.2.0,5.3.0)",
org.eclipse.egit.core.op;version="[5.2.0,5.3.0)",
org.eclipse.egit.core.project;version="[5.2.0,5.3.0)",
org.eclipse.jgit.api.errors;version="[5.2.0,5.3.0)",
@@ -25,7 +27,7 @@ Import-Package: org.eclipse.egit.core;version="[5.2.0,5.3.0)",
org.eclipse.jgit.treewalk;version="[5.2.0,5.3.0)",
org.eclipse.jgit.treewalk.filter;version="[5.2.0,5.3.0)",
org.eclipse.jgit.util;version="[5.2.0,5.3.0)",
- org.mockito;version="[1.8.0,1.10.0)",
- org.mockito.runners;version="[1.8.0,1.10.0)",
- org.mockito.stubbing;version="[1.8.0,1.10.0)"
+ org.mockito;version="[2.13.0,3.0.0)",
+ org.mockito.runners;version="[2.13.0,3.0.0)",
+ org.mockito.stubbing;version="[2.13.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.eclipse.egit.target/egit-4.10-staging.target b/org.eclipse.egit.target/egit-4.10-staging.target
index f3d674da7..204836062 100644
--- a/org.eclipse.egit.target/egit-4.10-staging.target
+++ b/org.eclipse.egit.target/egit-4.10-staging.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="egit-4.10-staging" sequenceNumber="1541179949">
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="egit-4.10-staging" sequenceNumber="1542817010">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
@@ -69,10 +69,14 @@
<unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.junit.source" version="4.12.0.v201504281640"/>
- <unit id="org.mockito" version="1.8.4.v201303031500"/>
- <unit id="org.mockito.source" version="1.8.4.v201303031500"/>
- <unit id="org.objenesis" version="1.0.0.v201505121915"/>
- <unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
+ <unit id="org.mockito" version="2.13.0.v20180426-1843"/>
+ <unit id="org.mockito.source" version="2.13.0.v20180426-1843"/>
+ <unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy.source" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.7.9.v20180420-1519"/>
+ <unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
+ <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
diff --git a/org.eclipse.egit.target/egit-4.5.target b/org.eclipse.egit.target/egit-4.5.target
index 891adaf44..09e00299e 100644
--- a/org.eclipse.egit.target/egit-4.5.target
+++ b/org.eclipse.egit.target/egit-4.5.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="egit-4.5" sequenceNumber="1541179774">
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="egit-4.5" sequenceNumber="1542816990">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
@@ -69,10 +69,14 @@
<unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.junit.source" version="4.12.0.v201504281640"/>
- <unit id="org.mockito" version="1.8.4.v201303031500"/>
- <unit id="org.mockito.source" version="1.8.4.v201303031500"/>
- <unit id="org.objenesis" version="1.0.0.v201505121915"/>
- <unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
+ <unit id="org.mockito" version="2.13.0.v20180426-1843"/>
+ <unit id="org.mockito.source" version="2.13.0.v20180426-1843"/>
+ <unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy.source" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.7.9.v20180420-1519"/>
+ <unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
+ <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
diff --git a/org.eclipse.egit.target/egit-4.6.target b/org.eclipse.egit.target/egit-4.6.target
index 2a07d1626..2b963fc9d 100644
--- a/org.eclipse.egit.target/egit-4.6.target
+++ b/org.eclipse.egit.target/egit-4.6.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="egit-4.6" sequenceNumber="1541179810">
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="egit-4.6" sequenceNumber="1542816978">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
@@ -69,10 +69,14 @@
<unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.junit.source" version="4.12.0.v201504281640"/>
- <unit id="org.mockito" version="1.8.4.v201303031500"/>
- <unit id="org.mockito.source" version="1.8.4.v201303031500"/>
- <unit id="org.objenesis" version="1.0.0.v201505121915"/>
- <unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
+ <unit id="org.mockito" version="2.13.0.v20180426-1843"/>
+ <unit id="org.mockito.source" version="2.13.0.v20180426-1843"/>
+ <unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy.source" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.7.9.v20180420-1519"/>
+ <unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
+ <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
diff --git a/org.eclipse.egit.target/egit-4.7.target b/org.eclipse.egit.target/egit-4.7.target
index 7808e84ff..c8094a6cc 100644
--- a/org.eclipse.egit.target/egit-4.7.target
+++ b/org.eclipse.egit.target/egit-4.7.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="egit-4.7" sequenceNumber="1541179835">
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="egit-4.7" sequenceNumber="1542816960">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
@@ -69,10 +69,14 @@
<unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.junit.source" version="4.12.0.v201504281640"/>
- <unit id="org.mockito" version="1.8.4.v201303031500"/>
- <unit id="org.mockito.source" version="1.8.4.v201303031500"/>
- <unit id="org.objenesis" version="1.0.0.v201505121915"/>
- <unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
+ <unit id="org.mockito" version="2.13.0.v20180426-1843"/>
+ <unit id="org.mockito.source" version="2.13.0.v20180426-1843"/>
+ <unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy.source" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.7.9.v20180420-1519"/>
+ <unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
+ <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
diff --git a/org.eclipse.egit.target/egit-4.8.target b/org.eclipse.egit.target/egit-4.8.target
index d64c0656b..fff7c29c0 100644
--- a/org.eclipse.egit.target/egit-4.8.target
+++ b/org.eclipse.egit.target/egit-4.8.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="egit-4.8" sequenceNumber="1541179886">
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="egit-4.8" sequenceNumber="1542816946">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
@@ -69,10 +69,14 @@
<unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.junit.source" version="4.12.0.v201504281640"/>
- <unit id="org.mockito" version="1.8.4.v201303031500"/>
- <unit id="org.mockito.source" version="1.8.4.v201303031500"/>
- <unit id="org.objenesis" version="1.0.0.v201505121915"/>
- <unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
+ <unit id="org.mockito" version="2.13.0.v20180426-1843"/>
+ <unit id="org.mockito.source" version="2.13.0.v20180426-1843"/>
+ <unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy.source" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.7.9.v20180420-1519"/>
+ <unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
+ <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
diff --git a/org.eclipse.egit.target/egit-4.9.target b/org.eclipse.egit.target/egit-4.9.target
index 888ec1e69..bc7ede468 100644
--- a/org.eclipse.egit.target/egit-4.9.target
+++ b/org.eclipse.egit.target/egit-4.9.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="egit-4.9" sequenceNumber="1541179922">
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="egit-4.9" sequenceNumber="1542816930">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
@@ -69,10 +69,14 @@
<unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.junit.source" version="4.12.0.v201504281640"/>
- <unit id="org.mockito" version="1.8.4.v201303031500"/>
- <unit id="org.mockito.source" version="1.8.4.v201303031500"/>
- <unit id="org.objenesis" version="1.0.0.v201505121915"/>
- <unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
+ <unit id="org.mockito" version="2.13.0.v20180426-1843"/>
+ <unit id="org.mockito.source" version="2.13.0.v20180426-1843"/>
+ <unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy.source" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/>
+ <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.7.9.v20180420-1519"/>
+ <unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
+ <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
diff --git a/org.eclipse.egit.target/orbit/I20181102163257-2018-12.tpd b/org.eclipse.egit.target/orbit/I20181102163257-2018-12.tpd
index afe6ae511..87e513890 100644
--- a/org.eclipse.egit.target/orbit/I20181102163257-2018-12.tpd
+++ b/org.eclipse.egit.target/orbit/I20181102163257-2018-12.tpd
@@ -42,10 +42,14 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/I2018110216325
org.hamcrest.text.source [1.1.0.v20090501071000,1.1.0.v20090501071000]
org.junit [4.12.0.v201504281640,4.12.0.v201504281640]
org.junit.source [4.12.0.v201504281640,4.12.0.v201504281640]
- org.mockito [1.8.4.v201303031500,1.8.4.v201303031500]
- org.mockito.source [1.8.4.v201303031500,1.8.4.v201303031500]
- org.objenesis [1.0.0.v201505121915,1.0.0.v201505121915]
- org.objenesis.source [1.0.0.v201505121915,1.0.0.v201505121915]
+ org.mockito [2.13.0.v20180426-1843,2.13.0.v20180426-1843]
+ org.mockito.source [2.13.0.v20180426-1843,2.13.0.v20180426-1843]
+ net.bytebuddy.byte-buddy [1.7.9.v20180420-1519,1.7.9.v20180420-1519]
+ net.bytebuddy.byte-buddy.source [1.7.9.v20180420-1519,1.7.9.v20180420-1519]
+ net.bytebuddy.byte-buddy-agent [1.7.9.v20180420-1519,1.7.9.v20180420-1519]
+ net.bytebuddy.byte-buddy-agent.source [1.7.9.v20180420-1519,1.7.9.v20180420-1519]
+ 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]
diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
index 14375225b..070810b07 100644
--- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
@@ -14,10 +14,10 @@ Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)",
org.eclipse.search;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
org.hamcrest;bundle-version="[1.1.0,2.0.0)",
- org.mockito;bundle-version="[1.8.0,1.10.0)",
org.eclipse.jdt.launching;bundle-version="[3.8.0,4.0.0)",
org.eclipse.egit.core.junit;bundle-version="[5.2.0,5.3.0)"
-Import-Package: org.eclipse.core.net.proxy;bundle-version="[1.1.0,2.0.0)",
+Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)",
+ org.eclipse.core.net.proxy;bundle-version="[1.1.0,2.0.0)",
org.eclipse.egit.gitflow;version="[5.2.0,5.3.0)",
org.eclipse.egit.gitflow.op;version="[5.2.0,5.3.0)",
org.eclipse.egit.gitflow.ui;version="[5.2.0,5.3.0)",
@@ -49,4 +49,7 @@ Import-Package: org.eclipse.core.net.proxy;bundle-version="[1.1.0,2.0.0)",
org.junit;version="[4.7.0,5.0.0)",
org.junit.rules;version="[4.7.0,5.0.0)",
org.junit.runner;version="[4.7.0,5.0.0)",
+ org.mockito;version="[2.13.0,3.0.0)",
+ org.mockito.runners;version="[2.13.0,3.0.0)",
+ org.mockito.stubbing;version="[2.13.0,3.0.0)",
org.osgi.framework;version="[1.4.0,2.0.0)"

Back to the top