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 009053a6dc50244b9712810977ea0549d54b375a
Merge: c698ea6 1213d3f
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Wed Jul 24 06:02:47 2019 -0400

    Merge branch 'tp34'

 gremlin-server/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --cc gremlin-server/pom.xml
index 21205a3,8ee0091..cb5231d
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@@ -234,57 -226,13 +234,61 @@@ limitations under the License
                              <artifactId>slf4j-api</artifactId>
                          </exclusion>
                          <exclusion>
 -                            <groupId>info.ganglia.gmetric4j</groupId>
 -                            <artifactId>gmetric4j</artifactId>
 +                            <groupId>org.slf4j</groupId>
 +                            <artifactId>slf4j-nop</artifactId>
 +                        </exclusion>
 +                        <exclusion>
 +                            <groupId>org.apache.lucene</groupId>
 +                            <artifactId>lucene-core</artifactId>
 +                        </exclusion>
 +                        <exclusion>
 +                            <groupId>io.dropwizard.metrics</groupId>
 +                            <artifactId>metrics-core</artifactId>
 +                        </exclusion>
 +                        <exclusion>
 +                            <groupId>io.netty</groupId>
 +                            <artifactId>netty-all</artifactId>
 +                        </exclusion>
 +                    </exclusions>
 +                </dependency>
 +                <dependency>
 +                    <groupId>org.scala-lang</groupId>
 +                    <artifactId>scala-library</artifactId>
 +                    <version>2.11.8</version>
 +                    <scope>test</scope>
 +                </dependency>
 +                <dependency>
 +                    <groupId>org.scala-lang</groupId>
 +                    <artifactId>scala-reflect</artifactId>
 +                    <version>2.11.8</version>
 +                    <scope>test</scope>
 +                </dependency>
 +                <dependency>
 +                    <groupId>org.apache.lucene</groupId>
 +                    <artifactId>lucene-core</artifactId>
 +                    <version>5.5.0</version>
 +                    <scope>test</scope>
 +                </dependency>
 +                <dependency>
 +                    <groupId>io.dropwizard.metrics</groupId>
 +                    <artifactId>metrics-core</artifactId>
 +                    <version>4.0.2</version>
 +                    <scope>test</scope>
 +                </dependency>
 +                <dependency>
 +                    <groupId>org.neo4j</groupId>
 +                    <artifactId>neo4j-kernel</artifactId>
 +                    <version>3.4.11</version>
 +                    <scope>test</scope>
 +                    <exclusions>
 +                        <exclusion>
 +                            <groupId>io.netty</groupId>
 +                            <artifactId>netty-all</artifactId>
                          </exclusion>
+                         <exclusion>
+                             <groupId>org.ow2.asm</groupId>
+                             <artifactId>asm</artifactId>
+                         </exclusion>
                      </exclusions>
                  </dependency>
                  <!-- *** WARNING *** -->

Reply via email to