You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2020/11/27 14:09:13 UTC
[tinkerpop] branch master updated: Fixed build problems after
inclusion of powermock from merge from 3.4-dev
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/master by this push:
new 8ea559e Fixed build problems after inclusion of powermock from merge from 3.4-dev
8ea559e is described below
commit 8ea559e13e8e877a85c02d73178a675f31ac42b0
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri Nov 27 09:08:06 2020 -0500
Fixed build problems after inclusion of powermock from merge from 3.4-dev
---
gremlin-driver/pom.xml | 2 +-
pom.xml | 28 +++++++++++++++++++++++++---
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index c73c6fe..fce6d33 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -102,7 +102,7 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
+ <artifactId>powermock-api-mockito2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index ebc4723..2710c2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@ limitations under the License.
<slf4j.version>1.7.25</slf4j.version>
<snakeyaml.version>1.27</snakeyaml.version>
<spark.version>3.0.0</spark.version>
- <powermock.version>1.7.4</powermock.version>
+ <powermock.version>2.0.9</powermock.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -723,7 +723,7 @@ limitations under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>3.2.4</version>
+ <version>3.3.3</version>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
@@ -741,12 +741,34 @@ limitations under the License.
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
+ <exclusions>
+ <!-- conflict with mockito - excluding from the mockito side doesn't work -->
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
+ <artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
+ <exclusions>
+ <!-- conflict with mockito - excluding from the mockito side doesn't work -->
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>