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 2015/06/21 02:01:15 UTC
[1/2] incubator-tinkerpop git commit: excluded another servlet-api
jar file. Without the exclusion, Spark jobs fail in a distributed environment.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master e7e7424e3 -> 57fb43737
excluded another servlet-api jar file. Without the exclusion, Spark jobs fail in a distributed environment.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/60b8bf14
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/60b8bf14
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/60b8bf14
Branch: refs/heads/master
Commit: 60b8bf14b259e92a2b76edb945a55135f333d6e5
Parents: e7e7424
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Sun Jun 21 01:09:43 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Sun Jun 21 01:09:43 2015 +0200
----------------------------------------------------------------------
hadoop-gremlin/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/60b8bf14/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 680814c..531a374 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -278,9 +278,9 @@ limitations under the License.
<Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-core:1.2.1
</Gremlin-Plugin-Dependencies>
<!-- deletes the servlet-api jar from the path after install - causes conflicts -->
- <Gremlin-Plugin-Paths>servlet-api-2.5-6.1.14.jar=
+ <Gremlin-Plugin-Paths>servlet-api-2.5-6.1.14.jar=;servlet-api-2.5-20081211.jar=
</Gremlin-Plugin-Paths>
- <Gremlin-Lib-Paths>servlet-api-2.5-6.1.14.jar=
+ <Gremlin-Lib-Paths>servlet-api-2.5-6.1.14.jar=;servlet-api-2.5-20081211.jar=
</Gremlin-Lib-Paths>
</manifestEntries>
</archive>
[2/2] incubator-tinkerpop git commit: fixed another test that uses
empty ConjunctionSteps
Posted by dk...@apache.org.
fixed another test that uses empty ConjunctionSteps
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/57fb4373
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/57fb4373
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/57fb4373
Branch: refs/heads/master
Commit: 57fb43737bad3e16d415af744570fc18ae38d302
Parents: 60b8bf1
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Sun Jun 21 01:10:55 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Sun Jun 21 01:10:55 2015 +0200
----------------------------------------------------------------------
.../gremlin/process/traversal/step/filter/WhereTest.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/57fb4373/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
index 022b6b4..7f4afab 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
@@ -31,11 +31,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.apache.tinkerpop.gremlin.process.traversal.P.*;
@@ -288,7 +284,7 @@ public abstract class WhereTest extends AbstractGremlinProcessTest {
public void g_V_whereXoutXcreatedX_and_outXknowsX_or_inXknowsXX_selectXaX_byXnameX() {
Traversal<Vertex, String> traversal = get_g_V_whereXoutXcreatedX_and_outXknowsX_or_inXknowsXX_valuesXnameX();
printTraversalForm(traversal);
- checkResults(Arrays.asList("marko", "josh"), traversal);
+ checkResults(Arrays.asList("marko", "vadas", "josh"), traversal);
}
@Test