tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ok...@apache.org
Subject [13/14] tinkerpop git commit: Merge branch 'tp32'
Date Wed, 01 Nov 2017 18:07:53 GMT
Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d603d11d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d603d11d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d603d11d

Branch: refs/heads/master
Commit: d603d11d57d6b71cea3bc45b1bdab17a0f52adc3
Parents: f243669 a451ca5
Author: Marko A. Rodriguez <okrammarko@gmail.com>
Authored: Wed Nov 1 12:06:19 2017 -0600
Committer: Marko A. Rodriguez <okrammarko@gmail.com>
Committed: Wed Nov 1 12:06:19 2017 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                        |   2 +
 docs/preprocessor/preprocess-file.sh      |   2 +-
 docs/src/recipes/index.asciidoc           |   2 +
 docs/src/recipes/olap-spark-yarn.asciidoc | 157 +++++++++++++++++++++++++
 pom.xml                                   |   1 +
 spark-gremlin/pom.xml                     |   7 +-
 6 files changed, 167 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d603d11d/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d603d11d/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index a31951e,5a93109..7fd4168
--- a/pom.xml
+++ b/pom.xml
@@@ -148,6 -149,7 +148,7 @@@ limitations under the License
          <netty.version>4.0.50.Final</netty.version>
          <slf4j.version>1.7.21</slf4j.version>
          <snakeyaml.version>1.15</snakeyaml.version>
 -        <spark.version>1.6.1</spark.version>
++        <spark.version>2.2.0</spark.version>
  
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d603d11d/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --cc spark-gremlin/pom.xml
index ee81096,77a455b..e70d27d
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@@ -107,8 -103,8 +107,8 @@@
          <!-- SPARK -->
          <dependency>
              <groupId>org.apache.spark</groupId>
 -            <artifactId>spark-core_2.10</artifactId>
 +            <artifactId>spark-core_2.11</artifactId>
-             <version>2.2.0</version>
+             <version>${spark.version}</version>
              <exclusions>
                  <!-- self conflicts -->
                  <exclusion>
@@@ -441,7 -382,8 +441,8 @@@
                  <configuration>
                      <archive>
                          <manifestEntries>
-                             <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:${hadoop.version}
+                             <Gremlin-Plugin-Dependencies>
 -                                org.apache.hadoop:hadoop-client:${hadoop.version};org.apache.hadoop:hadoop-yarn-server-web-proxy:${hadoop.version};org.apache.spark:spark-yarn_2.10:${spark.version}
++                                org.apache.hadoop:hadoop-client:${hadoop.version};org.apache.hadoop:hadoop-yarn-server-web-proxy:${hadoop.version};org.apache.spark:spark-yarn_2.11:${spark.version}
                              </Gremlin-Plugin-Dependencies>
                              <!-- deletes the servlet-api jar from the path after install
- causes conflicts -->
                              <Gremlin-Plugin-Paths>servlet-api-2.5.jar=</Gremlin-Plugin-Paths>
@@@ -452,4 -394,4 +453,4 @@@
              </plugin>
          </plugins>
      </build>
--</project>
++</project>


Mime
View raw message