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
commit 587bb9d69e91f7aa2de1ac427a161b5b3984c7a9
Merge: c6f88be 0bf3fc6
Author: Stephen Mallette <stepm...@amazon.com>
AuthorDate: Wed Dec 2 10:36:11 2020 -0500
Merge branch '3.4-dev'
gremlin-tools/gremlin-benchmark/pom.xml | 14 ++-
.../jsr223/GremlinGroovyScriptEngineBenchmark.java | 120 +++++++++++++++++++++
.../src/test/resources/log4j-silent.properties | 23 ++++
.../src/test/resources/log4j-test.properties | 21 ++++
4 files changed, 176 insertions(+), 2 deletions(-)
diff --cc gremlin-tools/gremlin-benchmark/pom.xml
index 4dbc742,bae619f..688f44f
--- a/gremlin-tools/gremlin-benchmark/pom.xml
+++ b/gremlin-tools/gremlin-benchmark/pom.xml
@@@ -78,7 -78,13 +83,12 @@@ limitations under the License
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
<plugins>
