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 2019/07/24 11:20:53 UTC
[tinkerpop] branch master updated (c698ea6 -> 009053a)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from c698ea6 Merge branch 'tp34'
new 22b393d Minor fix to test portion of pom after kirby bump CTR
new 1213d3f Merge branch 'tp33' into tp34
new 009053a Merge branch 'tp34'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
gremlin-server/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
[tinkerpop] 01/03: Minor fix to test portion of pom after kirby
bump CTR
Posted by sp...@apache.org.
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 22b393dd06a4d48e3c81be0d654c3f047b0dfb41
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Wed Jul 24 05:23:12 2019 -0400
Minor fix to test portion of pom after kirby bump CTR
---
gremlin-server/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 4ab6a15..319d5d5 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -229,6 +229,10 @@ limitations under the License.
<groupId>info.ganglia.gmetric4j</groupId>
<artifactId>gmetric4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- *** WARNING *** -->
[tinkerpop] 03/03: Merge branch 'tp34'
Posted by sp...@apache.org.
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 *** -->
[tinkerpop] 02/03: Merge branch 'tp33' into tp34
Posted by sp...@apache.org.
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 1213d3f8276da14ae3854ec16e46b0a2ab2e897e
Merge: 85301fb 22b393d
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Wed Jul 24 05:23:52 2019 -0400
Merge branch 'tp33' into tp34
gremlin-server/pom.xml | 4 ++++
1 file changed, 4 insertions(+)