Skip to content

Commit b7f36ee

Browse files
ATLAS-5203: Upgrade Janusgraph version to 1.1.0
1 parent 14246fe commit b7f36ee

3 files changed

Lines changed: 28 additions & 6 deletions

File tree

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
<jackson.version>2.12.7</jackson.version>
134134
<jacoco.version>0.8.13</jacoco.version>
135135
<janusgraph.cassandra.version>0.5.3</janusgraph.cassandra.version>
136-
<janusgraph.version>1.0.0</janusgraph.version>
136+
<janusgraph.version>1.1.0</janusgraph.version>
137137
<java.version.required>1.8</java.version.required>
138138
<javac.source.version>1.8</javac.source.version>
139139
<javac.target.version>1.8</javac.target.version>
@@ -195,7 +195,7 @@
195195
<surefire.forkCount>2C</surefire.forkCount>
196196
<surefire.version>3.0.0-M5</surefire.version>
197197
<testng.version>7.0.0</testng.version>
198-
<tinkerpop.version>3.7.0</tinkerpop.version>
198+
<tinkerpop.version>3.7.3</tinkerpop.version>
199199
<woodstox-core.version>5.0.3</woodstox-core.version>
200200
<zookeeper.version>3.9.2</zookeeper.version>
201201
</properties>
@@ -1018,7 +1018,7 @@
10181018
<dependency>
10191019
<groupId>cglib</groupId>
10201020
<artifactId>cglib</artifactId>
1021-
<version>2.2.2</version>
1021+
<version>3.3.0</version>
10221022
</dependency>
10231023

10241024
<dependency>

repository/pom.xml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>com.datastax.cassandra</groupId>
4747
<artifactId>cassandra-driver-core</artifactId>
48-
<version>3.2.0</version>
48+
<version>3.11.5</version>
4949
<exclusions>
5050
<exclusion>
5151
<groupId>ch.qos.logback</groupId>
@@ -59,6 +59,10 @@
5959
<groupId>io.netty</groupId>
6060
<artifactId>netty-handler</artifactId>
6161
</exclusion>
62+
<exclusion>
63+
<groupId>org.jctools</groupId>
64+
<artifactId>jctools-core</artifactId>
65+
</exclusion>
6266
</exclusions>
6367
</dependency>
6468

@@ -118,6 +122,12 @@
118122
<dependency>
119123
<groupId>org.apache.atlas</groupId>
120124
<artifactId>atlas-notification</artifactId>
125+
<exclusions>
126+
<exclusion>
127+
<groupId>com.yammer.metrics</groupId>
128+
<artifactId>metrics-core</artifactId>
129+
</exclusion>
130+
</exclusions>
121131
</dependency>
122132
<dependency>
123133
<groupId>org.apache.atlas</groupId>
@@ -137,7 +147,7 @@
137147
<dependency>
138148
<groupId>org.apache.cassandra</groupId>
139149
<artifactId>cassandra-all</artifactId>
140-
<version>2.1.8</version>
150+
<version>3.11.19</version>
141151
<exclusions>
142152
<exclusion>
143153
<groupId>ch.qos.logback</groupId>
@@ -147,6 +157,10 @@
147157
<groupId>io.netty</groupId>
148158
<artifactId>netty-handler</artifactId>
149159
</exclusion>
160+
<exclusion>
161+
<groupId>org.jctools</groupId>
162+
<artifactId>jctools-core</artifactId>
163+
</exclusion>
150164
</exclusions>
151165
</dependency>
152166

@@ -342,6 +356,13 @@
342356
</property>
343357
</activation>
344358
<dependencies>
359+
360+
<dependency>
361+
<groupId>io.dropwizard.metrics</groupId>
362+
<artifactId>metrics-core</artifactId>
363+
<version>4.1.5</version>
364+
<scope>test</scope>
365+
</dependency>
345366
<dependency>
346367
<groupId>org.apache.atlas</groupId>
347368
<artifactId>atlas-testtools</artifactId>

test-tools/src/main/java/org/apache/atlas/runner/LocalSolrRunner.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.commons.io.FileUtils;
2424
import org.apache.commons.io.IOUtils;
2525
import org.apache.commons.lang3.ArrayUtils;
26+
import org.apache.solr.client.solrj.embedded.JettyConfig;
2627
import org.apache.solr.cloud.MiniSolrCloudCluster;
2728
import org.slf4j.Logger;
2829
import org.slf4j.LoggerFactory;
@@ -70,7 +71,7 @@ public static void start() throws Exception {
7071
temp.mkdirs();
7172
temp.deleteOnExit();
7273

73-
miniSolrCloudCluster = new MiniSolrCloudCluster(1, null, temp.toPath(), readSolrXml(), null, null);
74+
miniSolrCloudCluster = new MiniSolrCloudCluster(1, temp.toPath(), readSolrXml(), JettyConfig.builder().build());
7475

7576
LOG.info("Started local solr server at: {}", getZookeeperUrls());
7677

0 commit comments

Comments
 (0)