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 2016/03/18 20:26:29 UTC

[1/6] incubator-tinkerpop git commit: Update hadoop to 2.7.2

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/tp31 08ed04b81 -> 6c4dc6f14


Update hadoop to 2.7.2

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

Branch: refs/heads/tp31
Commit: 76fe3004025847b9de9e5fd209aff936a6947821
Parents: da5abb0
Author: Hendy Irawan <he...@hendyirawan.com>
Authored: Tue Mar 15 20:14:33 2016 +0700
Committer: Hendy Irawan <he...@hendyirawan.com>
Committed: Tue Mar 15 20:14:33 2016 +0700

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/76fe3004/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index acef6c6..99194f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@ limitations under the License.
         <skipIntegrationTests>true</skipIntegrationTests>
         <skipPerformanceTests>true</skipPerformanceTests>
         <slf4j.version>1.7.12</slf4j.version>
-        <hadoop.version>2.7.1</hadoop.version>
+        <hadoop.version>2.7.2</hadoop.version>
         <java.tuples.version>1.2</java.tuples.version>
         <javadoc-plugin.version>2.10.1</javadoc-plugin.version>
 


[3/6] incubator-tinkerpop git commit: Use netty 3.7.1.Final

Posted by ok...@apache.org.
Use netty 3.7.1.Final


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

Branch: refs/heads/tp31
Commit: eb382a2d0dfbdc6bf3af543e0777eeda4eba816a
Parents: 18c0ae3
Author: Hendy Irawan <ce...@gmail.com>
Authored: Tue Mar 15 21:05:46 2016 +0700
Committer: Hendy Irawan <ce...@gmail.com>
Committed: Tue Mar 15 21:05:46 2016 +0700

----------------------------------------------------------------------
 hadoop-gremlin/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/eb382a2d/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 694ec83..2ddcb15 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -48,6 +48,12 @@ limitations under the License.
             <version>${hadoop.version}</version>
             <exclusions>
                 <exclusion>
+					<!-- see: https://github.com/apache/hadoop/pull/84 -->
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty</artifactId>
+                </exclusion>
+
+                <exclusion>
                     <groupId>log4j</groupId>
                     <artifactId>log4j</artifactId>
                 </exclusion>


[2/6] incubator-tinkerpop git commit: Use netty 3.7.1.Final

Posted by ok...@apache.org.
Use netty 3.7.1.Final


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

Branch: refs/heads/tp31
Commit: 18c0ae3855bc09265b67b77e943f4d468ac13202
Parents: 76fe300
Author: Hendy Irawan <ce...@gmail.com>
Authored: Tue Mar 15 20:56:33 2016 +0700
Committer: Hendy Irawan <ce...@gmail.com>
Committed: Tue Mar 15 20:56:33 2016 +0700

----------------------------------------------------------------------
 hadoop-gremlin/pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/18c0ae38/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 2221d76..694ec83 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -37,6 +37,12 @@ limitations under the License.
             <version>${project.version}</version>
         </dependency>
         <dependency>
+			<!-- see: https://github.com/apache/hadoop/pull/84 -->
+            <groupId>io.netty</groupId>
+            <artifactId>netty</artifactId>
+            <version>3.7.1.Final</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client</artifactId>
             <version>${hadoop.version}</version>
@@ -161,7 +167,7 @@ limitations under the License.
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.1
+                            <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.2
                             </Gremlin-Plugin-Dependencies>
                         </manifestEntries>
                     </archive>


[4/6] incubator-tinkerpop git commit: Make hadoop-gremlin and giraph-gremlin pass enforcer

Posted by ok...@apache.org.
Make hadoop-gremlin and giraph-gremlin pass enforcer


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

Branch: refs/heads/tp31
Commit: 915466039ff1bca2d773e7d56c8bbebf243a9d65
Parents: eb382a2
Author: Hendy Irawan <ce...@gmail.com>
Authored: Tue Mar 15 21:31:11 2016 +0700
Committer: Hendy Irawan <ce...@gmail.com>
Committed: Tue Mar 15 21:31:11 2016 +0700

----------------------------------------------------------------------
 giraph-gremlin/pom.xml | 10 ++++++++++
 hadoop-gremlin/pom.xml | 22 ++++++++++------------
 2 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/91546603/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 727e1cb..347bd0d 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -25,6 +25,16 @@ limitations under the License.
     </parent>
     <artifactId>giraph-gremlin</artifactId>
     <name>Apache TinkerPop :: Giraph Gremlin</name>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<!-- see: https://github.com/apache/hadoop/pull/84 -->
+				<groupId>io.netty</groupId>
+				<artifactId>netty</artifactId>
+				<version>3.7.1.Final</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/91546603/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 2ddcb15..ee18ca9 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -25,6 +25,16 @@ limitations under the License.
     </parent>
     <artifactId>hadoop-gremlin</artifactId>
     <name>Apache TinkerPop :: Hadoop Gremlin</name>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<!-- see: https://github.com/apache/hadoop/pull/84 -->
+				<groupId>io.netty</groupId>
+				<artifactId>netty</artifactId>
+				<version>3.7.1.Final</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>
@@ -37,23 +47,11 @@ limitations under the License.
             <version>${project.version}</version>
         </dependency>
         <dependency>
-			<!-- see: https://github.com/apache/hadoop/pull/84 -->
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-            <version>3.7.1.Final</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client</artifactId>
             <version>${hadoop.version}</version>
             <exclusions>
                 <exclusion>
-					<!-- see: https://github.com/apache/hadoop/pull/84 -->
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty</artifactId>
-                </exclusion>
-
-                <exclusion>
                     <groupId>log4j</groupId>
                     <artifactId>log4j</artifactId>
                 </exclusion>


[6/6] incubator-tinkerpop git commit: updated CHANGELOG and docs to reflect Hadoop 2.7.2 support. Giraph and Spark pom.xml manifest needed updating.

Posted by ok...@apache.org.
updated CHANGELOG and docs to reflect Hadoop 2.7.2 support. Giraph and Spark pom.xml manifest needed updating.


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

Branch: refs/heads/tp31
Commit: 6c4dc6f1459601c0d8a6307e175d167ef6af3e5b
Parents: fe197c1
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Mar 18 13:07:42 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Mar 18 13:07:42 2016 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                                 | 1 +
 docs/src/reference/implementations-hadoop.asciidoc | 2 +-
 giraph-gremlin/pom.xml                             | 2 +-
 spark-gremlin/pom.xml                              | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6c4dc6f1/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ea53882..1733330 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
 TinkerPop 3.1.2 (NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* Bumped to Apache Hadoop 2.7.2.
 * Fixed a bug in `gremlin-driver` where a really fast call to get a `Future` to wait for a result might not register an error raised from the server.
 * Fixed a severe bug where `LP_O_OB_P_S_SE_SL_Traverser` was not registered with `GryoMapper`.
 * The future from `GremlinExecutor.eval()` is completed after the entire evaluation lifecyle is completed.

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6c4dc6f1/docs/src/reference/implementations-hadoop.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/implementations-hadoop.asciidoc b/docs/src/reference/implementations-hadoop.asciidoc
index 59c7412..54ed776 100644
--- a/docs/src/reference/implementations-hadoop.asciidoc
+++ b/docs/src/reference/implementations-hadoop.asciidoc
@@ -34,7 +34,7 @@ using both TinkerPop3's OLTP and OLAP graph computing models.
 
 IMPORTANT: This section assumes that the user has a Hadoop 2.x cluster functioning. For more information on getting
 started with Hadoop, please see the
-link:http://hadoop.apache.org/docs/r2.7.1/hadoop-project-dist/hadoop-common/SingleCluster.html[Single Node Setup]
+link:http://hadoop.apache.org/docs/r2.7.2/hadoop-project-dist/hadoop-common/SingleCluster.html[Single Node Setup]
 tutorial. Moreover, if using `GiraphGraphComputer` or `SparkGraphComputer` it is advisable that the reader also
 familiarize their self with Giraph (link:http://giraph.apache.org/quick_start.html[Getting Started]) and Spark
 (link:http://spark.apache.org/docs/latest/quick-start.html[Quick Start]).

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6c4dc6f1/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 347bd0d..190f5c8 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -248,7 +248,7 @@ limitations under the License.
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.1
+                            <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.2
                             </Gremlin-Plugin-Dependencies>
                         </manifestEntries>
                     </archive>

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6c4dc6f1/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 6e4ab17..e671d69 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -382,7 +382,7 @@
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.1
+                            <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.2
                             </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>


[5/6] incubator-tinkerpop git commit: Merge remote-tracking branch 'ceefour/patch-3' into tp31

Posted by ok...@apache.org.
Merge remote-tracking branch 'ceefour/patch-3' into tp31


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

Branch: refs/heads/tp31
Commit: fe197c18beccdb7b533fd76288f84a20815535c6
Parents: 08ed04b 9154660
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Mar 18 12:24:34 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Mar 18 12:24:34 2016 -0600

----------------------------------------------------------------------
 giraph-gremlin/pom.xml | 10 ++++++++++
 hadoop-gremlin/pom.xml | 12 +++++++++++-
 pom.xml                |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------