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/05/09 14:39:19 UTC

[1/5] incubator-tinkerpop git commit: Bump SLF4J to 1.7.21 to fix memory leak.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 7f80815fc -> efe33ebe6


Bump SLF4J to 1.7.21 to fix memory leak.


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

Branch: refs/heads/master
Commit: f7439ca3141d31a6efb136675b6561e232bb8c9a
Parents: c653c13
Author: Mathias Bogaert <ma...@gmail.com>
Authored: Fri May 6 00:35:48 2016 +0100
Committer: Mathias Bogaert <ma...@gmail.com>
Committed: Fri May 6 00:35:48 2016 +0100

----------------------------------------------------------------------
 gremlin-console/src/main/static/LICENSE | 8 ++++----
 gremlin-server/src/main/static/LICENSE  | 8 ++++----
 pom.xml                                 | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f7439ca3/gremlin-console/src/main/static/LICENSE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/static/LICENSE b/gremlin-console/src/main/static/LICENSE
index 1dbc073..4a621fc 100644
--- a/gremlin-console/src/main/static/LICENSE
+++ b/gremlin-console/src/main/static/LICENSE
@@ -223,9 +223,9 @@ MIT Licenses
 
 The Apache TinkerPop project bundles the following components under the MIT License:
 
-     JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.12 - http://www.slf4j.org) - for details, see licenses/slf4j
-     SLF4J API Module (org.slf4j:slf4j-api:1.7.12 - http://www.slf4j.org) - for details, see licenses/slf4j
-     SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.12 - http://www.slf4j.org) - for details, see licenses/slf4j
+     JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.21 - http://www.slf4j.org) - for details, see licenses/slf4j
+     SLF4J API Module (org.slf4j:slf4j-api:1.7.21 - http://www.slf4j.org) - for details, see licenses/slf4j
+     SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.21 - http://www.slf4j.org) - for details, see licenses/slf4j
      Foundation stylesheet for CodeRay (http://foundation.zurb.com) - for details, see licenses/foundation
      normalize.css 2.1.2 (http://necolas.github.io/normalize.css/) - for details, see licenses/normalize
 
@@ -235,4 +235,4 @@ Other Licenses
 
 The Apache TinkerPop project bundles the following components under the ISC License:
 
-     jBCrypt (com.github.jeremyh:jBCrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details, see licenses/jbcrypt
\ No newline at end of file
+     jBCrypt (com.github.jeremyh:jBCrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details, see licenses/jbcrypt

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f7439ca3/gremlin-server/src/main/static/LICENSE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/static/LICENSE b/gremlin-server/src/main/static/LICENSE
index ebd2d78..e0dccc3 100644
--- a/gremlin-server/src/main/static/LICENSE
+++ b/gremlin-server/src/main/static/LICENSE
@@ -223,9 +223,9 @@ MIT Licenses
 
 The Apache TinkerPop project bundles the following components under the MIT License:
 
-     JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.12 - http://www.slf4j.org) - for details, see deps/slf4j
-     SLF4J API Module (org.slf4j:slf4j-api:1.7.12 - http://www.slf4j.org) - for details, see deps/slf4j
-     SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.12 - http://www.slf4j.org) - for details, see deps/slf4j
+     JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.21 - http://www.slf4j.org) - for details, see deps/slf4j
+     SLF4J API Module (org.slf4j:slf4j-api:1.7.21 - http://www.slf4j.org) - for details, see deps/slf4j
+     SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.21 - http://www.slf4j.org) - for details, see deps/slf4j
      Foundation stylesheet for CodeRay (http://foundation.zurb.com) - for details, see deps/foundation
      normalize.css 2.1.2 (http://necolas.github.io/normalize.css/) - for details, see deps/normalize
 
@@ -239,4 +239,4 @@ The Apache TinkerPop project bundles the following components under the BSD/MIT
 
 The Apache TinkerPop project bundles the following components under the ISC License:
 
-     jBCrypt (com.github.jeremyh:jBCrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details, see licenses/jbcrypt
\ No newline at end of file
+     jBCrypt (com.github.jeremyh:jBCrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details, see licenses/jbcrypt

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f7439ca3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fa9bf7a..077f08b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@ limitations under the License.
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <skipIntegrationTests>true</skipIntegrationTests>
         <skipPerformanceTests>true</skipPerformanceTests>
-        <slf4j.version>1.7.19</slf4j.version>
+        <slf4j.version>1.7.21</slf4j.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>


[2/5] incubator-tinkerpop git commit: Merge branch 'tp31' of https://github.com/analytically/incubator-tinkerpop into tp31

Posted by ok...@apache.org.
Merge branch 'tp31' of https://github.com/analytically/incubator-tinkerpop 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/7513e212
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/7513e212
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/7513e212

Branch: refs/heads/master
Commit: 7513e212aef458c82474616351bfd402807df33d
Parents: 25c94c8 f7439ca
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 6 16:54:36 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 6 16:54:36 2016 -0400

----------------------------------------------------------------------
 gremlin-console/src/main/static/LICENSE | 8 ++++----
 gremlin-server/src/main/static/LICENSE  | 8 ++++----
 pom.xml                                 | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------



[3/5] incubator-tinkerpop git commit: Update changelog.

Posted by ok...@apache.org.
Update changelog.


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

Branch: refs/heads/master
Commit: f422c9fc8b57073f889a6e87082f7f267d17757c
Parents: 7513e21
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 6 16:56:38 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 6 16:56:38 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f422c9fc/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 88820b3..19917a6 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
 TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* Bumped SLF4J to 1.7.21 as previous versions suffered from a memory leak.
 * Renamed `AndTest.get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name` to `get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name` to match the traversal being tested.
 * Fixed a self-loop bug in `StarGraph`.
 * Added configuration option for disabling `:remote` timeout with `:remote config timeout none`.


[4/5] incubator-tinkerpop git commit: updated CHANGELOG and fixed Neo4jGraphStepStrategy bug. CTR.

Posted by ok...@apache.org.
updated CHANGELOG and fixed Neo4jGraphStepStrategy bug. CTR.


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

Branch: refs/heads/master
Commit: ea4a98865df9f0e86503581949c0dc0fe915a476
Parents: f422c9f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon May 9 08:37:08 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon May 9 08:37:08 2016 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                                                 | 1 +
 .../traversal/strategy/optimization/Neo4jGraphStepStrategy.java    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea4a9886/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 19917a6..41e74be 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * Bumped SLF4J to 1.7.21 as previous versions suffered from a memory leak.
+* Fixed a bug in `Neo4jGraphStepStrategy` where it wasn't defined properly as a `ProviderOptimizationStrategy`.
 * Renamed `AndTest.get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name` to `get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name` to match the traversal being tested.
 * Fixed a self-loop bug in `StarGraph`.
 * Added configuration option for disabling `:remote` timeout with `:remote config timeout none`.

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea4a9886/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/strategy/optimization/Neo4jGraphStepStrategy.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/strategy/optimization/Neo4jGraphStepStrategy.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/strategy/optimization/Neo4jGraphStepStrategy.java
index 2ec4deb..7a6216f 100644
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/strategy/optimization/Neo4jGraphStepStrategy.java
+++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/strategy/optimization/Neo4jGraphStepStrategy.java
@@ -31,7 +31,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
  * @author Pieter Martin
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
-public final class Neo4jGraphStepStrategy extends AbstractTraversalStrategy<TraversalStrategy.ProviderOptimizationStrategy> {
+public final class Neo4jGraphStepStrategy extends AbstractTraversalStrategy<TraversalStrategy.ProviderOptimizationStrategy> implements TraversalStrategy.ProviderOptimizationStrategy {
 
     private static final Neo4jGraphStepStrategy INSTANCE = new Neo4jGraphStepStrategy();
 


[5/5] incubator-tinkerpop git commit: updated CHANGELOG.

Posted by ok...@apache.org.
updated CHANGELOG.


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

Branch: refs/heads/master
Commit: efe33ebe685d51233832fc9229da2e039d4e1494
Parents: 7f80815 ea4a988
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon May 9 08:39:10 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon May 9 08:39:10 2016 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


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