This is an automated email from the ASF dual-hosted git repository.
sarath pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new cffa20f ATLAS-3378: Update JanusGraph to 0.4.0
cffa20f is described below
commit cffa20f573a6717286fc33dbbff2a8e77c588d02
Author: Sarath Subramanian <[email protected]>
AuthorDate: Fri Sep 13 15:38:15 2019 -0700
ATLAS-3378: Update JanusGraph to 0.4.0
(cherry picked from commit 314f49372d913532e29d8a3ec0494bb1f2f2d2fc)
---
addons/falcon-bridge/pom.xml | 4 ++++
addons/hbase-bridge/pom.xml | 4 ++++
addons/hive-bridge/pom.xml | 4 ++++
addons/impala-bridge/pom.xml | 4 ++++
addons/kafka-bridge/pom.xml | 4 ++++
addons/sqoop-bridge/pom.xml | 4 ++++
addons/storm-bridge/pom.xml | 4 ++++
graphdb/api/pom.xml | 2 +-
graphdb/janus/pom.xml | 4 +---
.../org/apache/atlas/repository/graphdb/janus/AtlasJanusGraph.java | 2 +-
pom.xml | 5 ++++-
webapp/pom.xml | 6 +++++-
12 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml
index 3c9512f..18c9c03 100644
--- a/addons/falcon-bridge/pom.xml
+++ b/addons/falcon-bridge/pom.xml
@@ -269,6 +269,10 @@
<key>embedded.solr.directory</key>
<value>${project.build.directory}</value>
</systemProperty>
+ <systemProperty>
+ <name>org.eclipse.jetty.annotations.maxWait</name>
+ <value>5000</value>
+ </systemProperty>
</systemProperties>
<stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort>
diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml
index d2d0162..959f500 100644
--- a/addons/hbase-bridge/pom.xml
+++ b/addons/hbase-bridge/pom.xml
@@ -435,6 +435,10 @@
<key>embedded.solr.directory</key>
<value>${project.build.directory}</value>
</systemProperty>
+ <systemProperty>
+ <name>org.eclipse.jetty.annotations.maxWait</name>
+ <value>5000</value>
+ </systemProperty>
</systemProperties>
<stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort>
diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml
index b01e57b..76c13ac 100755
--- a/addons/hive-bridge/pom.xml
+++ b/addons/hive-bridge/pom.xml
@@ -409,6 +409,10 @@
<key>embedded.solr.directory</key>
<value>${project.build.directory}</value>
</systemProperty>
+ <systemProperty>
+ <name>org.eclipse.jetty.annotations.maxWait</name>
+ <value>5000</value>
+ </systemProperty>
</systemProperties>
<stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort>
diff --git a/addons/impala-bridge/pom.xml b/addons/impala-bridge/pom.xml
index ba9e461..2d63a20 100644
--- a/addons/impala-bridge/pom.xml
+++ b/addons/impala-bridge/pom.xml
@@ -440,6 +440,10 @@
<key>embedded.solr.directory</key>
<value>${project.build.directory}</value>
</systemProperty>
+ <systemProperty>
+ <name>org.eclipse.jetty.annotations.maxWait</name>
+ <value>5000</value>
+ </systemProperty>
</systemProperties>
<stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort>
diff --git a/addons/kafka-bridge/pom.xml b/addons/kafka-bridge/pom.xml
index c54c140..11232c0 100644
--- a/addons/kafka-bridge/pom.xml
+++ b/addons/kafka-bridge/pom.xml
@@ -287,6 +287,10 @@
<key>embedded.solr.directory</key>
<value>${project.build.directory}</value>
</systemProperty>
+ <systemProperty>
+ <name>org.eclipse.jetty.annotations.maxWait</name>
+ <value>5000</value>
+ </systemProperty>
</systemProperties>
<stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort>
diff --git a/addons/sqoop-bridge/pom.xml b/addons/sqoop-bridge/pom.xml
index 1fbe603..50b46f5 100644
--- a/addons/sqoop-bridge/pom.xml
+++ b/addons/sqoop-bridge/pom.xml
@@ -338,6 +338,10 @@
<key>embedded.solr.directory</key>
<value>${project.build.directory}</value>
</systemProperty>
+ <systemProperty>
+ <name>org.eclipse.jetty.annotations.maxWait</name>
+ <value>5000</value>
+ </systemProperty>
</systemProperties>
<stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort>
diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml
index 10a8b13..4d2e5dc 100644
--- a/addons/storm-bridge/pom.xml
+++ b/addons/storm-bridge/pom.xml
@@ -450,6 +450,10 @@
<key>embedded.solr.directory</key>
<value>${project.build.directory}</value>
</systemProperty>
+ <systemProperty>
+ <name>org.eclipse.jetty.annotations.maxWait</name>
+ <value>5000</value>
+ </systemProperty>
</systemProperties>
<stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort>
diff --git a/graphdb/api/pom.xml b/graphdb/api/pom.xml
index 7745c27..3c81d2b 100644
--- a/graphdb/api/pom.xml
+++ b/graphdb/api/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
- <version>3.3.3</version>
+ <version>${tinkerpop.version}</version>
</dependency>
</dependencies>
diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml
index 44255ce..c0b6858 100644
--- a/graphdb/janus/pom.xml
+++ b/graphdb/janus/pom.xml
@@ -34,9 +34,7 @@
Some dependencies, like slf4j are excluded from the jar because they
are included in Atlas -->
<properties>
- <tinkerpop.version>3.3.3</tinkerpop.version>
<checkstyle.failOnViolation>false</checkstyle.failOnViolation>
- <lucene-solr.version>7.3.0</lucene-solr.version>
</properties>
<dependencies>
@@ -236,7 +234,7 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
diff --git
a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraph.java
b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraph.java
index 4d581ec..bbc7630 100644
---
a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraph.java
+++
b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraph.java
@@ -343,7 +343,7 @@ public class AtlasJanusGraph implements
AtlasGraph<AtlasJanusVertex, AtlasJanusE
public void releaseGremlinScriptEngine(ScriptEngine scriptEngine) {
if (scriptEngine instanceof GremlinGroovyScriptEngine) {
try {
- ((GremlinGroovyScriptEngine) scriptEngine).close();
+ ((GremlinGroovyScriptEngine) scriptEngine).reset();
} catch (Exception e) {
// ignore
}
diff --git a/pom.xml b/pom.xml
index cca88fe..0030cf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -657,7 +657,10 @@
<jersey.version>1.19</jersey.version>
<jsr.version>1.1</jsr.version>
- <janus.version>0.3.1</janus.version>
+ <janus.version>0.4.0</janus.version>
+ <tinkerpop.version>3.4.1</tinkerpop.version>
+ <lucene-solr.version>7.3.0</lucene-solr.version>
+
<hadoop.version>3.1.1</hadoop.version>
<hbase.version>2.0.2</hbase.version>
<solr.version>7.5.0</solr.version>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 7b40c22..96cfe5a 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -689,7 +689,11 @@
</systemProperty>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name>
- <value>3000</value>
+ <value>5000</value>
+ </systemProperty>
+ <systemProperty>
+ <name>org.eclipse.jetty.annotations.maxWait</name>
+ <value>5000</value>
</systemProperty>
</systemProperties>
<stopKey>atlas-stop</stopKey>
