tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [2/3] tinkerpop git commit: Merge branch 'TINKERPOP-1884' into TINKERPOP-1884-tp33
Date Sat, 03 Mar 2018 15:49:44 GMT
Merge branch 'TINKERPOP-1884' into TINKERPOP-1884-tp33


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

Branch: refs/heads/TINKERPOP-1884-tp33
Commit: 09bb99056e853a96b7ba173ef6f66c56d3f9de34
Parents: 27cc574 eefc4db
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Sat Mar 3 10:48:48 2018 -0500
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Sat Mar 3 10:48:48 2018 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc | 1 +
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/09bb9905/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index db8e41b,90e8215..1c7a04b
--- a/pom.xml
+++ b/pom.xml
@@@ -146,10 -147,10 +146,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.53.Final</netty.version>
+         <netty.version>4.0.56.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>


Mime
View raw message