You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2016/02/11 16:18:03 UTC
[1/3] incubator-tinkerpop git commit: Revert "attempt to fix Travis
integration"
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/travis e40a4d66a -> 315ab4c44
Revert "attempt to fix Travis integration"
This reverts commit b61c363dea8eea613b22bcbd552ebc62bbafc7b2.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/63030bd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/63030bd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/63030bd1
Branch: refs/heads/travis
Commit: 63030bd1436feccb909455e12bd57d9daf862111
Parents: e40a4d6
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Feb 11 16:15:29 2016 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Feb 11 16:15:29 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/63030bd1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 14037b0..955cef5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,7 +319,7 @@ limitations under the License.
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
<configuration>
- <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory} -Xmx2048m -XX:MaxPermSize=256m
+ <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory}
</argLine>
<excludes>
<exclude>**/*IntegrateTest.java</exclude>
[3/3] incubator-tinkerpop git commit: Revert "removed test method
that calls System.exit(0)"
Posted by dk...@apache.org.
Revert "removed test method that calls System.exit(0)"
This reverts commit aba16260049e899a00f50cdf96b5132dc68f52f2.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/315ab4c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/315ab4c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/315ab4c4
Branch: refs/heads/travis
Commit: 315ab4c443bd4a7afe6bfc94da3dc89d77c04968
Parents: e8f5bcc
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Feb 11 16:17:36 2016 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Feb 11 16:17:36 2016 +0100
----------------------------------------------------------------------
.../tinkerpop/gremlin/server/GremlinServerIntegrateTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/315ab4c4/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index f7e52a2..df515bd 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -143,7 +143,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
return settings;
}
-/*
+
@Test
public void shouldUseSimpleSandbox() throws Exception {
final Cluster cluster = Cluster.open();
@@ -161,7 +161,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
cluster.close();
}
}
-*/
+
@Test
public void shouldStartWithDefaultSettings() {
// just quickly validate that results are returning given defaults. no graphs are config'd with defaults
[2/3] incubator-tinkerpop git commit: Revert "removed test method
that calls System.exit(0)"
Posted by dk...@apache.org.
Revert "removed test method that calls System.exit(0)"
This reverts commit 4d98a355f5054e497e6aca4d3cd9c12d9a4f72eb.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e8f5bcc5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e8f5bcc5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e8f5bcc5
Branch: refs/heads/travis
Commit: e8f5bcc59ad187c585c439208caf99e73106eb19
Parents: 63030bd
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Feb 11 16:17:23 2016 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Feb 11 16:17:23 2016 +0100
----------------------------------------------------------------------
.../groovy/jsr223/GremlinGroovyScriptEngineFileSandboxTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e8f5bcc5/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFileSandboxTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFileSandboxTest.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFileSandboxTest.java
index 96c228c..89aba64 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFileSandboxTest.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFileSandboxTest.java
@@ -74,7 +74,7 @@ public class GremlinGroovyScriptEngineFileSandboxTest extends AbstractGremlinTes
assertThat(Arrays.equals("test".getBytes(), (byte[]) engine.eval("'test'.bytes")), is(true));
}
}
-/*
+
@Test
public void shouldPreventMaliciousStuffWithSystemButAllowSomeMethodsOnSystem() throws Exception {
final CompilerCustomizerProvider standardSandbox = new CompileStaticCustomizerProvider(FileSandboxExtension.class.getName());
@@ -89,7 +89,7 @@ public class GremlinGroovyScriptEngineFileSandboxTest extends AbstractGremlinTes
assertThat(ex.getCause().getMessage(), containsString("Not authorized to call this method"));
}
}
-*/
+
@Test
public void shouldPreventMaliciousStuffWithFile() throws Exception {
final CompilerCustomizerProvider standardSandbox = new CompileStaticCustomizerProvider(FileSandboxExtension.class.getName());