CTR - Fix failing build by fixing dependencies
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/ServerSerializers.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/ServerSerializers.java
index 6f5b6d3..09b7599 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/ServerSerializers.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/ServerSerializers.java
@@ -19,12 +19,8 @@
package org.apache.tinkerpop.gremlin.server.handler;
import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-<<<<<<< HEAD
import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0;
-=======
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0;
->>>>>>> 3.4-dev
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -34,13 +30,8 @@
private ServerSerializers() {}
/**
-<<<<<<< HEAD
* Default binary serializer used by the server when the serializer requested does not match what is on the server.
* This defaults to GraphBinary 1.0.
-=======
- * Default serializer used by the server when the serializer requested does not match what is on the server.
- * Using GraphSON 1.0 on 3.3.5 because that's what it has long been set to in previous versions.
->>>>>>> 3.4-dev
*/
static final MessageSerializer DEFAULT_BINARY_SERIALIZER = new GraphBinaryMessageSerializerV1();
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
index d69bbca..128e202 100644
--- a/gremlin-shaded/pom.xml
+++ b/gremlin-shaded/pom.xml
@@ -43,7 +43,6 @@
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
- <version>2.1</version>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 01f74d3..ebc4723 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
<slf4j.version>1.7.25</slf4j.version>
<snakeyaml.version>1.27</snakeyaml.version>
<spark.version>3.0.0</spark.version>
- <powermock.version>1.6.4</powermock.version>
+ <powermock.version>1.7.4</powermock.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -732,6 +732,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.version}</version>
