You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/09/30 10:49:26 UTC
[tinkerpop] branch master updated (c4247ca -> 2c3564e)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from c4247ca Merge branch 'tp34'
add aa955d5 Upgraded jackson-databind to 2.9.10 due to CVE-14379, CVE-2019-14540, CVE-2019-16335. Adjusted Dependency convergence errors due to the upgrade of jackson-databind. Aligned jackson-annotations to 2.9.10. Aligned jackson-module-scala_2.11 to 2.9.10. Bumped scala-library and scala-reflect to 2.11.12 due to the upgrade of jackson-module-scala_2.11.
new e8e217a Merge branch 'pr-1200' into tp33
new 2de0632 Merge branch 'tp33' into tp34
new 2c3564e Merge branch 'tp34'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 5 ++++-
gremlin-shaded/pom.xml | 2 +-
neo4j-gremlin/pom.xml | 4 ++--
spark-gremlin/pom.xml | 16 +++++++++++++---
4 files changed, 20 insertions(+), 7 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 2c3564e4640bb123b9274b6e3683bea6d444b4d0
Merge: c4247ca 2de0632
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Sep 30 06:49:10 2019 -0400
Merge branch 'tp34'
CHANGELOG.asciidoc | 5 ++++-
gremlin-shaded/pom.xml | 2 +-
neo4j-gremlin/pom.xml | 4 ++--
spark-gremlin/pom.xml | 16 +++++++++++++---
4 files changed, 20 insertions(+), 7 deletions(-)
diff --cc neo4j-gremlin/pom.xml
index ceecedc,0becdea..9cb372c
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@@ -163,15 -151,9 +163,15 @@@ limitations under the License
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.11.8</version>
+ <version>2.11.12</version>
<scope>test</scope>
</dependency>
<dependency>
[tinkerpop] 02/03: Merge branch 'tp33' into tp34
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 2de0632892f32524ba1a0dac11efcef49bdd7fb2
Merge: fe1cfcd e8e217a
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Sep 30 06:49:05 2019 -0400
Merge branch 'tp33' into tp34
CHANGELOG.asciidoc | 5 ++++-
gremlin-shaded/pom.xml | 2 +-
neo4j-gremlin/pom.xml | 4 ++--
spark-gremlin/pom.xml | 16 +++++++++++++---
4 files changed, 20 insertions(+), 7 deletions(-)
[tinkerpop] 01/03: Merge branch 'pr-1200' into tp33
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit e8e217a9629b765b1f36e9ce6c4c8bc3f90fcfb2
Merge: 06d7dd8 aa955d5
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Sep 30 06:47:22 2019 -0400
Merge branch 'pr-1200' into tp33
CHANGELOG.asciidoc | 5 ++++-
giraph-gremlin/pom.xml | 2 +-
gremlin-shaded/pom.xml | 2 +-
neo4j-gremlin/pom.xml | 4 ++--
spark-gremlin/pom.xml | 16 +++++++++++++---
5 files changed, 21 insertions(+), 8 deletions(-)
diff --cc CHANGELOG.asciidoc
index 05b31bd,9fbd0fc..e2f9fa4
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -29,11 -29,10 +29,14 @@@ image::https://raw.githubusercontent.co
* Fixed `TraversalExplanation` deserialization in GraphSON 2 and 3 which was not supported before in Java.
* Added support for custom request headers in Python.
* Deprecated `scriptEvaluationTimeout` in favor of the more generic `evaluationTimeout`.
- * Bumped jackson databind 2.9.9.3.
+ * Bumped jackson-databind to 2.9.10 due to CVE-2019-14379, CVE-2019-14540, CVE-2019-16335.
+ * Bumped jackson-annotations to 2.9.10 to align the version of jackson-databind.
+ * Bumped jackson-module-scala_2.11 to 2.9.10 to align the version of jackson-databind.
+ * Bumped scala-library and scala-reflect to 2.11.12 due to the upgrade of jackson-module-scala_2.11.
+* Added `ReservedKeysVerificationStrategy` to allow warnings or exceptions when certain keys are used for properties.
+* Added the `AbstractWarningVerificationStrategy` base class for "warning" style `VerificationStrategy` implementations.
+* Refactored `EdgeLabelVerificationStrategy` to use `AbstractWarningVerificationStrategy`.
+* Added `EdgeLabelVerificationStrategy` to Python.
* Fixed Java driver authentication problems when calling the driver from multiple threads.
* Modified Java driver to use IP address rather than hostname to create connections.
* Fixed potential for `NullPointerException` with empty identifiers in `GraphStep`.
diff --cc spark-gremlin/pom.xml
index 4a6a371,908c6d3..85df177
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@@ -239,11 -239,11 +239,16 @@@
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</exclusion>
+ <!-- avro conflicts -->
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ <!-- jackson-core conflicts -->
+ <exclusion>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-scala_2.11</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- consistent dependencies -->
@@@ -294,10 -294,10 +299,15 @@@
<version>3.9.9.Final</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.19</version>
+ </dependency>
++ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-scala_2.11</artifactId>
+ <version>2.9.10</version>
+ </dependency>
<!-- TEST -->
<dependency>
<groupId>org.apache.tinkerpop</groupId>