Skip to content

A
atlas
Commit 314f4937 by Sarath Subramanian
Options

ATLAS-3378: Update JanusGraph to 0.4.0

parent 8792f162
Showing with 40 additions and 7 deletions
addons/falcon-bridge/pom.xml
...@@ -269,6 +269,10 @@ ...@@ -269,6 +269,10 @@
<key>embedded.solr.directory</key> <key>embedded.solr.directory</key>
<value>${project.build.directory}</value> <value>${project.build.directory}</value>
</systemProperty> </systemProperty>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name>
<value>5000</value>
</systemProperty>
</systemProperties> </systemProperties>
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
......
addons/hbase-bridge/pom.xml
...@@ -435,6 +435,10 @@ ...@@ -435,6 +435,10 @@
<key>embedded.solr.directory</key> <key>embedded.solr.directory</key>
<value>${project.build.directory}</value> <value>${project.build.directory}</value>
</systemProperty> </systemProperty>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name>
<value>5000</value>
</systemProperty>
</systemProperties> </systemProperties>
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
......
addons/hive-bridge/pom.xml
...@@ -409,6 +409,10 @@ ...@@ -409,6 +409,10 @@
<key>embedded.solr.directory</key> <key>embedded.solr.directory</key>
<value>${project.build.directory}</value> <value>${project.build.directory}</value>
</systemProperty> </systemProperty>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name>
<value>5000</value>
</systemProperty>
</systemProperties> </systemProperties>
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
......
addons/impala-bridge/pom.xml
...@@ -440,6 +440,10 @@ ...@@ -440,6 +440,10 @@
<key>embedded.solr.directory</key> <key>embedded.solr.directory</key>
<value>${project.build.directory}</value> <value>${project.build.directory}</value>
</systemProperty> </systemProperty>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name>
<value>5000</value>
</systemProperty>
</systemProperties> </systemProperties>
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
......
addons/kafka-bridge/pom.xml
...@@ -287,6 +287,10 @@ ...@@ -287,6 +287,10 @@
<key>embedded.solr.directory</key> <key>embedded.solr.directory</key>
<value>${project.build.directory}</value> <value>${project.build.directory}</value>
</systemProperty> </systemProperty>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name>
<value>5000</value>
</systemProperty>
</systemProperties> </systemProperties>
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
......
addons/sqoop-bridge/pom.xml
...@@ -338,6 +338,10 @@ ...@@ -338,6 +338,10 @@
<key>embedded.solr.directory</key> <key>embedded.solr.directory</key>
<value>${project.build.directory}</value> <value>${project.build.directory}</value>
</systemProperty> </systemProperty>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name>
<value>5000</value>
</systemProperty>
</systemProperties> </systemProperties>
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
......
addons/storm-bridge/pom.xml
...@@ -450,6 +450,10 @@ ...@@ -450,6 +450,10 @@
<key>embedded.solr.directory</key> <key>embedded.solr.directory</key>
<value>${project.build.directory}</value> <value>${project.build.directory}</value>
</systemProperty> </systemProperty>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name>
<value>5000</value>
</systemProperty>
</systemProperties> </systemProperties>
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>31001</stopPort> <stopPort>31001</stopPort>
......
graphdb/api/pom.xml
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<dependency> <dependency>
<groupId>org.apache.tinkerpop</groupId> <groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId> <artifactId>gremlin-core</artifactId>
<version>3.3.3</version> <version>${tinkerpop.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
graphdb/janus/pom.xml
...@@ -34,9 +34,7 @@ ...@@ -34,9 +34,7 @@
Some dependencies, like slf4j are excluded from the jar because they are included in Atlas --> Some dependencies, like slf4j are excluded from the jar because they are included in Atlas -->
<properties> <properties>
<tinkerpop.version>3.3.3</tinkerpop.version>
<checkstyle.failOnViolation>false</checkstyle.failOnViolation> <checkstyle.failOnViolation>false</checkstyle.failOnViolation>
<lucene-solr.version>7.3.0</lucene-solr.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -236,7 +234,7 @@ ...@@ -236,7 +234,7 @@
<classifier>tests</classifier> <classifier>tests</classifier>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId> <artifactId>mockito-all</artifactId>
......
graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraph.java
...@@ -343,7 +343,7 @@ public class AtlasJanusGraph implements AtlasGraph<AtlasJanusVertex, AtlasJanusE ...@@ -343,7 +343,7 @@ public class AtlasJanusGraph implements AtlasGraph<AtlasJanusVertex, AtlasJanusE
public void releaseGremlinScriptEngine(ScriptEngine scriptEngine) { public void releaseGremlinScriptEngine(ScriptEngine scriptEngine) {
if (scriptEngine instanceof GremlinGroovyScriptEngine) { if (scriptEngine instanceof GremlinGroovyScriptEngine) {
try { try {
((GremlinGroovyScriptEngine) scriptEngine).close(); ((GremlinGroovyScriptEngine) scriptEngine).reset();
} catch (Exception e) { } catch (Exception e) {
// ignore // ignore
} }
......
pom.xml
...@@ -657,7 +657,10 @@ ...@@ -657,7 +657,10 @@
<jersey.version>1.19</jersey.version> <jersey.version>1.19</jersey.version>
<jsr.version>1.1</jsr.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> <hadoop.version>3.1.1</hadoop.version>
<hbase.version>2.0.2</hbase.version> <hbase.version>2.0.2</hbase.version>
<solr.version>7.5.0</solr.version> <solr.version>7.5.0</solr.version>
......
webapp/pom.xml
...@@ -689,7 +689,11 @@ ...@@ -689,7 +689,11 @@
</systemProperty> </systemProperty>
<systemProperty> <systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name> <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> </systemProperty>
</systemProperties> </systemProperties>
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment