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/10/10 16:28:47 UTC
[tinkerpop] 01/04: Partial revert of #1200 for a jackson version
bump
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 7ac09b555fd9efa8eb5633d255df5b422ebb2fae
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Thu Oct 10 12:20:03 2019 -0400
Partial revert of #1200 for a jackson version bump
Left the part that updated our shaded version but reverted parts that tried to update upstream libraries that haven't been upgraded themselves yet. Was causing problems with doc generation...not sure why CTR
---
CHANGELOG.asciidoc | 3 ---
neo4j-gremlin/pom.xml | 4 ++--
spark-gremlin/pom.xml | 22 +++-------------------
3 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 943813d..1349e6c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -31,9 +31,6 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Fixed Java DSL annotation for generation of `addE()` which was formerly calling the wrong step.
* Deprecated `scriptEvaluationTimeout` in favor of the more generic `evaluationTimeout`.
* 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`.
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index 5bc4abb..1c5ad4e 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -153,13 +153,13 @@ limitations under the License.
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.11.12</version>
+ <version>2.11.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
- <version>2.11.12</version>
+ <version>2.11.8</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 85df177..0e7b0e1 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -38,12 +38,6 @@
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
@@ -244,18 +238,13 @@
<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 -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.11.12</version>
+ <version>2.11.8</version>
</dependency>
<dependency>
<groupId>org.scala-lang.modules</groupId>
@@ -271,7 +260,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.10</version>
+ <version>2.6.5</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -281,7 +270,7 @@
<dependency>
<groupId>com.thoughtworks.paranamer</groupId>
<artifactId>paranamer</artifactId>
- <version>2.8</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
@@ -303,11 +292,6 @@
<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>