You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/09/09 18:33:17 UTC
[33/33] incubator-tinkerpop git commit: fixed self-conflict issues in
Apache Spark (again).
fixed self-conflict issues in Apache Spark (again).
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/00963d16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/00963d16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/00963d16
Branch: refs/heads/hadoop_split
Commit: 00963d16d9d7b1cc15e12a02999603a93e699e4b
Parents: d33a849 8986156
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Sep 9 10:33:04 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Sep 9 10:33:04 2015 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
CONTRIBUTING.asciidoc | 28 +-
RELEASE.asciidoc | 16 +-
docs/preprocessor/preprocess.sh | 8 +
docs/src/the-traversal.asciidoc | 4 +-
.../traversal/dsl/graph/GraphTraversal.java | 37 ++-
.../process/traversal/step/filter/DropStep.java | 5 +-
.../traversal/step/map/PropertyMapStep.java | 8 +
.../process/traversal/step/util/Parameters.java | 25 ++
.../strategy/decoration/PartitionStrategy.java | 280 ++++++++++++++++++-
.../tinkerpop/gremlin/structure/Element.java | 5 +
.../traversal/step/util/ParametersTest.java | 95 +++++++
.../PartitionStrategyTraverseTest.java | 72 +++--
.../gremlin/driver/AuthProperties.java | 34 ++-
.../tinkerpop/gremlin/driver/Cluster.java | 46 +++
.../tinkerpop/gremlin/driver/Handler.java | 2 +-
.../step/branch/GroovyRepeatTest.groovy | 2 +-
.../step/map/GroovyAddVertexTest.groovy | 20 +-
.../step/sideEffect/GroovyStoreTest.groovy | 2 +-
.../server/GremlinDriverIntegrateTest.java | 11 +-
.../traversal/step/map/AddVertexTest.java | 72 +++++
.../decoration/EventStrategyProcessTest.java | 4 +-
.../PartitionStrategyProcessTest.java | 217 ++++++++++++++
.../tinkerpop/gremlin/structure/EdgeTest.java | 38 ---
.../gremlin/structure/VertexPropertyTest.java | 38 ---
.../tinkerpop/gremlin/structure/VertexTest.java | 45 ---
.../structure/ExceptionCoverageTest.java | 5 +-
.../gremlin/neo4j/structure/Neo4jEdge.java | 14 +-
.../gremlin/neo4j/structure/Neo4jElement.java | 1 -
.../gremlin/neo4j/structure/Neo4jVertex.java | 6 -
.../neo4j/structure/Neo4jVertexProperty.java | 5 -
.../structure/trait/MultiMetaNeo4jTrait.java | 18 +-
spark-gremlin/pom.xml | 57 +++-
.../step/sideEffect/TinkerGraphStep.java | 7 +-
.../tinkergraph/structure/TinkerEdge.java | 6 +-
.../tinkergraph/structure/TinkerElement.java | 3 +
.../tinkergraph/structure/TinkerVertex.java | 10 +-
.../structure/TinkerVertexProperty.java | 2 +-
.../tinkergraph/structure/TinkerGraphTest.java | 37 +++
39 files changed, 1037 insertions(+), 249 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/00963d16/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --cc spark-gremlin/pom.xml
index af23904,0000000..d49f1d4
mode 100644,000000..100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@@ -1,306 -1,0 +1,337 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>tinkerpop</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>spark-gremlin</artifactId>
+ <name>Apache TinkerPop :: Spark Gremlin</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-core</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-groovy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>hadoop-gremlin</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- SPARK GRAPH COMPUTER -->
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.10</artifactId>
+ <version>1.5.0</version>
+ <exclusions>
+ <!-- self conflicts -->
+ <exclusion>
++ <groupId>org.scala-lang</groupId>
++ <artifactId>scala-library</artifactId>
++ </exclusion>
++ <exclusion>
++ <groupId>org.scala-lang</groupId>
++ <artifactId>scala-reflect</artifactId>
++ </exclusion>
++ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-reflect</artifactId>
- </exclusion>
- <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ <exclusion>
++ <groupId>commons-lang</groupId>
++ <artifactId>commons-lang</artifactId>
++ </exclusion>
++ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
++ <exclusion>
++ <groupId>org.xerial.snappy</groupId>
++ <artifactId>snappy-java</artifactId>
++ </exclusion>
++ <exclusion>
++ <groupId>org.apache.curator</groupId>
++ <artifactId>curator-framework</artifactId>
++ </exclusion>
++ <exclusion>
++ <groupId>com.thoughtworks.paranamer</groupId>
++ <artifactId>paranamer</artifactId>
++ </exclusion>
+ <!-- gremlin-core conflicts -->
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ivy</groupId>
+ <artifactId>ivy</artifactId>
+ </exclusion>
+ <!-- gremlin-groovy conflicts -->
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ <!-- hadoop conflicts -->
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ </exclusion>
+ <!-- lgpl conflicts -->
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- consistent dependencies -->
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
- <version>2.10.3</version>
++ <version>2.10.5</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.4.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.4.4</version>
+ </dependency>
- <!-- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>2.4.4</version>
++ <dependency>
++ <groupId>commons-lang</groupId>
++ <artifactId>commons-lang</artifactId>
++ <version>2.6</version>
++ </dependency>
++ <dependency>
++ <groupId>org.xerial.snappy</groupId>
++ <artifactId>snappy-java</artifactId>
++ <version>1.1.1.7</version>
++ </dependency>
++ <!--<dependency>
++ <groupId>org.apache.curator</groupId>
++ <artifactId>curator-framework</artifactId>
++ <version>2.4.0</version>
+ </dependency>-->
++ <dependency>
++ <groupId>com.thoughtworks.paranamer</groupId>
++ <artifactId>paranamer</artifactId>
++ <version>2.6</version>
++ </dependency>
+ <!-- TEST -->
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-test</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-groovy-test</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>tinkergraph-gremlin</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <directory>${basedir}/target</directory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test/resources</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>build-detached-assemblies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <attach>false</attach>
+ <descriptors>
+ <descriptor>src/assembly/standalone.xml</descriptor>
+ <descriptor>src/assembly/hadoop-job.xml</descriptor>
+ </descriptors>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>addSources</goal>
+ <goal>addTestSources</goal>
+ <goal>generateStubs</goal>
+ <goal>compile</goal>
+ <goal>testGenerateStubs</goal>
+ <goal>testCompile</goal>
+ <goal>removeStubs</goal>
+ <goal>removeTestStubs</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <invokeDynamic>true</invokeDynamic>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <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=;servlet-api-2.5-20081211.jar=
+ </Gremlin-Plugin-Paths>
+ <Gremlin-Lib-Paths>servlet-api-2.5-6.1.14.jar=;servlet-api-2.5-20081211.jar=
+ </Gremlin-Lib-Paths>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- log4j.configuration>log4j-core.properties</log4j.configuration> -->
+ <!--<argLine>-Xmx2048M</argLine>-->
+ <excludes>
+ <exclude>**/*IntegrateTest.java</exclude>
+ <exclude>**/*PerformanceTest.java</exclude>
+ <!-- this is technically a member of the integration test suite -->
+ <exclude>**/HadoopGremlinPluginTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>