You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ap...@apache.org on 2018/05/16 05:11:39 UTC
atlas git commit: ATLAS-2671: Dependency upgrades
Repository: atlas
Updated Branches:
refs/heads/master 66f8ae160 -> f65aeceeb
ATLAS-2671: Dependency upgrades
Jackson, Lucene, Spring, Tinkerpop 3.3.3
Change-Id: If8972b9ec79aaed300c85eeba213b1dc40577814
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/f65aecee
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/f65aecee
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/f65aecee
Branch: refs/heads/master
Commit: f65aeceeb97156ff9e26f1352a6da4100845cb7a
Parents: 66f8ae1
Author: apoorvnaik <ap...@apache.org>
Authored: Thu May 10 08:05:31 2018 -0700
Committer: apoorvnaik <ap...@apache.org>
Committed: Tue May 15 22:09:51 2018 -0700
----------------------------------------------------------------------
graphdb/janus/pom.xml | 29 +++++++++++++++++++-
.../janus/migration/AtlasGraphSONReader.java | 3 +-
.../graphdb/janus/migration/BaseUtils.java | 3 +-
pom.xml | 6 ++--
4 files changed, 35 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/f65aecee/graphdb/janus/pom.xml
----------------------------------------------------------------------
diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml
index 016a09c..2658bfd 100644
--- a/graphdb/janus/pom.xml
+++ b/graphdb/janus/pom.xml
@@ -34,9 +34,10 @@
Some dependencies, like slf4j are excluded from the jar because they are included in Atlas -->
<properties>
- <tinkerpop.version>3.2.6</tinkerpop.version>
+ <tinkerpop.version>3.3.3</tinkerpop.version>
<janus.version>0.2.0</janus.version>
<checkstyle.failOnViolation>false</checkstyle.failOnViolation>
+ <lucene-solr.version>7.3.0</lucene-solr.version>
</properties>
<dependencies>
@@ -173,6 +174,32 @@
<artifactId>solr-solrj</artifactId>
<version>7.0.0</version>
</dependency>
+ <!-- CVE Overrides for Lucene -->
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${lucene-solr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ <version>${lucene-solr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>${lucene-solr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-spatial</artifactId>
+ <version>${lucene-solr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-spatial-extras</artifactId>
+ <version>${lucene-solr.version}</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
http://git-wip-us.apache.org/repos/asf/atlas/blob/f65aecee/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/AtlasGraphSONReader.java
----------------------------------------------------------------------
diff --git a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/AtlasGraphSONReader.java b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/AtlasGraphSONReader.java
index aa0b637..ae119b0 100644
--- a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/AtlasGraphSONReader.java
+++ b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/AtlasGraphSONReader.java
@@ -25,6 +25,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
import org.apache.tinkerpop.shaded.jackson.core.JsonFactory;
import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
@@ -257,7 +258,7 @@ public final class AtlasGraphSONReader {
}
final GraphSONMapper.Builder builder = GraphSONMapper.build();
- final GraphSONMapper mapper = builder.embedTypes(false).create();
+ final GraphSONMapper mapper = builder.typeInfo(TypeInfo.NO_TYPES).create();
return new AtlasGraphSONReader(mapper.createMapper(), relationshipCache, graph, bulkLoadGraph,
propertiesToPostProcess, numWorkers, batchSize, suppliedStartIndex);
http://git-wip-us.apache.org/repos/asf/atlas/blob/f65aecee/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/BaseUtils.java
----------------------------------------------------------------------
diff --git a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/BaseUtils.java b/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/BaseUtils.java
index de43e0f..e863d9f 100644
--- a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/BaseUtils.java
+++ b/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/BaseUtils.java
@@ -22,6 +22,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
@@ -66,7 +67,7 @@ public class BaseUtils {
private JsonNode getEntityNode(String json) throws IOException {
GraphSONMapper.Builder builder = GraphSONMapper.build();
- final ObjectMapper mapper = builder.embedTypes(false).create().createMapper();
+ final ObjectMapper mapper = builder.typeInfo(TypeInfo.NO_TYPES).create().createMapper();
return mapper.readTree(json);
}
http://git-wip-us.apache.org/repos/asf/atlas/blob/f65aecee/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3469a39..1498d1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -554,8 +554,8 @@
<gson.version>2.5</gson.version>
<fastutil.version>6.5.16</fastutil.version>
<guice.version>4.1.0</guice.version>
- <spring.version>4.3.8.RELEASE</spring.version>
- <spring.security.version>4.2.4.RELEASE</spring.security.version>
+ <spring.version>4.3.17.RELEASE</spring.version>
+ <spring.security.version>4.2.6.RELEASE</spring.security.version>
<javax.servlet.version>3.1.0</javax.servlet.version>
<guava.version>19.0</guava.version>
@@ -564,7 +564,7 @@
<!-- Needed for hooks -->
<aopalliance.version>1.0</aopalliance.version>
- <jackson.version>2.9.2</jackson.version>
+ <jackson.version>2.9.5</jackson.version>
<commons-conf.version>1.10</commons-conf.version>
<commons-conf2.version>2.2</commons-conf2.version>