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 2017/06/01 09:44:46 UTC
[11/15] tinkerpop git commit: Merge branch 'tp31' into tp32
Merge branch 'tp31' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fd398c70
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd398c70
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fd398c70
Branch: refs/heads/TINKERPOP-1681
Commit: fd398c70e586fd974b1a71d67600aac7f6b3c1ab
Parents: d4b9c30 7a08077
Author: Robert Dale <ro...@gmail.com>
Authored: Wed May 31 15:56:41 2017 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Wed May 31 15:56:41 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd398c70/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd398c70/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 9d6192d,a22490c..c67eec0
--- a/pom.xml
+++ b/pom.xml
@@@ -134,18 -127,9 +134,18 @@@ limitations under the License
</scm>
<properties>
<commons.configuration.version>1.10</commons.configuration.version>
+ <commons.lang.version>2.6</commons.lang.version>
+ <commons.lang3.version>3.3.1</commons.lang3.version>
- <groovy.version>2.4.9</groovy.version>
+ <groovy.version>2.4.11</groovy.version>
- <junit.version>4.12</junit.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>
+ <jcabi.version>1.1</jcabi.version>
<metrics.version>3.0.2</metrics.version>
+ <netty.version>4.0.42.Final</netty.version>
+ <slf4j.version>1.7.21</slf4j.version>
+ <snakeyaml.version>1.15</snakeyaml.version>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<skipIntegrationTests>true</skipIntegrationTests>