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/4762e508 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4762e508 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4762e508 Branch: refs/heads/master Commit: 4762e508acfded143f77fe7df7818d8745f1ebed Parents: c32fcfe 7fe2ec7 Author: Robert Dale <robd...@gmail.com> Authored: Thu Nov 2 14:27:56 2017 -0400 Committer: Robert Dale <robd...@gmail.com> Committed: Thu Nov 2 14:27:56 2017 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + gremlin-console/src/main/static/NOTICE | 2 +- gremlin-server/src/main/static/NOTICE | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4762e508/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4762e508/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 7fd4168,94951cc..cc0fcf5 --- a/pom.xml +++ b/pom.xml @@@ -145,10 -146,10 +145,10 @@@ limitations under the License <javadoc-plugin.version>2.10.4</javadoc-plugin.version> <jcabi.version>1.1</jcabi.version> <metrics.version>3.0.2</metrics.version> - <netty.version>4.0.50.Final</netty.version> + <netty.version>4.0.52.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>
