Projects
Mega:24.03
tycho
_service:tar_scm:0003-Port-to-latest-versio-of-...
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:tar_scm:0003-Port-to-latest-versio-of-Mockito.patch of Package tycho
From c130487d9900e198564b0559da28937616c06208 Mon Sep 17 00:00:00 2001 Date: Tue, 19 Feb 2019 11:11:10 +0000 Subject: [PATCH 6/6] Port to latest versio of Mockito Change-Id: Ie0f6189cc66a8f13d952fa6e9d5c7bf1d39535b5 --- pom.xml | 2 +- .../RepositoryArtifactProviderTest.java | 4 ++-- tycho-bundles/pom.xml | 6 ------ .../tycho-bundles-target.target | 21 +++++++------------ 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 2b34d93..5ddc9eb 100644 --- a/pom.xml +++ b/pom.xml @@ -244,7 +244,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.8.4</version> + <version>2.23.0</version> <scope>test</scope> </dependency> <dependency> diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/p2base/artifact/repository/RepositoryArtifactProviderTest.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/p2base/artifact/repository/RepositoryArtifactProviderTest.java index bd897e2..fc5231b 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/p2base/artifact/repository/RepositoryArtifactProviderTest.java +++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/p2base/artifact/repository/RepositoryArtifactProviderTest.java @@ -26,8 +26,8 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.argThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tycho-bundles/pom.xml b/tycho-bundles/pom.xml index abc0795..5c45e60 100644 --- a/tycho-bundles/pom.xml +++ b/tycho-bundles/pom.xml @@ -81,12 +81,6 @@ <id>org.eclipse.osgi.compatibility.state</id> <versionRange>0.0.0</versionRange> </requirement> - <!-- 403196 give p2 resolver a hint so that package imports of org.mockito can be resolved --> - <requirement> - <type>eclipse-plugin</type> - <id>org.hamcrest</id> - <versionRange>0.0.0</versionRange> - </requirement> </extraRequirements> </dependency-resolution> </configuration> diff --git a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target index b3e58ea..33956d8 100644 --- a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target +++ b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="29"> +<?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="30"> <locations> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/> @@ -19,19 +19,14 @@ <repository location="http://download.eclipse.org/releases/photon/201806271001/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> -<unit id="org.mockito" version="1.8.4.v201303031500"/> -<unit id="org.objenesis" version="1.0.0.v201105211943"/> -<unit id="org.hamcrest" version="1.1.0.v20090501071000"/> -<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/> -<unit id="org.hamcrest.integration" version="1.1.0.v201303031500"/> -<unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/> -<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/> +<unit id="org.mockito" version="2.23.0.v20181106-1534"/> +<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/> +<unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/> +<unit id="org.objenesis" version="2.6.0.v20180420-1519"/> +<unit id="org.junit" version="4.12.0.v201504281640"/> +<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.apache.commons.io" version="2.2.0.v201405211200"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/> -</location> -<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> -<unit id="org.junit" version="3.8.2.v3_8_2_v20100427-1100"/> -<repository location="http://download.eclipse.org/releases/indigo/201202240900"/> +<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository/"/> </location> </locations> </target> -- 2.20.1
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2