Skip to content
This repository has been archived by the owner on Mar 23, 2022. It is now read-only.

Upgrade to new dependency mockito-testng #77

Merged
merged 7 commits into from
Oct 10, 2018
Merged

Upgrade to new dependency mockito-testng #77

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a8b60e
Upgrade to new dependency mockito-testng
skabashnyuk Aug 1, 2018
c0e9640
Exclude transitive artifacts
skabashnyuk Aug 6, 2018
f6bb1d9
Merge branch 'master' of github.com:eclipse/che-parent into che10617
mkuznyetsov Sep 24, 2018
e21874f
Update mockito testng version
mkuznyetsov Sep 24, 2018
0f105b5
Merge branch 'master' of github.com:eclipse/che-parent into che10617
mkuznyetsov Oct 3, 2018
b2b43b0
Merge branch 'master' of github.com:eclipse/che-parent into che10617
mkuznyetsov Oct 8, 2018
2867b59
Update Mockito TestNG version
mkuznyetsov Oct 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@
<junit.version>4.11</junit.version>
<io.jsonwebtoken.jjwt.version>0.9.0</io.jsonwebtoken.jjwt.version>
<org.apache.maven.plugin-testing-harness.version>3.3.0</org.apache.maven.plugin-testing-harness.version>
<org.mockito.version>2.10.0</org.mockito.version>
<org.mockitong.version>0.5</org.mockitong.version>
<org.mockito.version>2.21.0</org.mockito.version>
<org.mockito.mockito-testng.version>0.1.1</org.mockito.mockito-testng.version>
<org.testng.version>6.8.21</org.testng.version>
<com.beust.jcommander.version>1.27</com.beust.jcommander.version>
<com.tngtech.java>1.9.3</com.tngtech.java>
Expand Down Expand Up @@ -1114,14 +1114,18 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.mockitong</groupId>
<artifactId>mockitong</artifactId>
<version>${org.mockitong.version}</version>
<groupId>org.mockito</groupId>
<artifactId>mockito-testng</artifactId>
<version>${org.mockito.mockito-testng.version}</version>
<exclusions>
<exclusion>
<artifactId>mockito-all</artifactId>
<artifactId>mockito-core</artifactId>
<groupId>org.mockito</groupId>
</exclusion>
<exclusion>
<artifactId>testng</artifactId>
<groupId>org.testng</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down