You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2021/01/07 19:37:42 UTC
[atlas] branch branch-2.0 updated: ATLAS-4017: upgraded Solr
version to 8.6.3
This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 97f392b ATLAS-4017: upgraded Solr version to 8.6.3
97f392b is described below
commit 97f392b0bf076a063806d8ba4d16fa11b94df9bd
Author: chaitali borole <ch...@cloudera.com>
AuthorDate: Thu Jan 7 16:16:12 2021 +0530
ATLAS-4017: upgraded Solr version to 8.6.3
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
(cherry picked from commit f0bb4e94ca620919db8acd887fab5485d495b6f4)
---
addons/hbase-bridge/pom.xml | 4 ----
addons/hbase-testing-util/pom.xml | 12 ++++++++++++
graphdb/janus-hbase2/pom.xml | 4 ++++
graphdb/janus/pom.xml | 5 -----
pom.xml | 15 ++++++++-------
repository/pom.xml | 6 ++++++
test-tools/pom.xml | 4 ++--
test-tools/src/main/resources/solr/solr.xml | 3 +++
8 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml
index 4d9779f..1d7c478 100644
--- a/addons/hbase-bridge/pom.xml
+++ b/addons/hbase-bridge/pom.xml
@@ -51,10 +51,6 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
</exclusion>
- <exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>*</artifactId>
- </exclusion>
</exclusions>
</dependency>
diff --git a/addons/hbase-testing-util/pom.xml b/addons/hbase-testing-util/pom.xml
index ddfd7ad..fa359db 100644
--- a/addons/hbase-testing-util/pom.xml
+++ b/addons/hbase-testing-util/pom.xml
@@ -92,6 +92,18 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
</dependency>
<dependency>
diff --git a/graphdb/janus-hbase2/pom.xml b/graphdb/janus-hbase2/pom.xml
index 83765c8..067871e 100644
--- a/graphdb/janus-hbase2/pom.xml
+++ b/graphdb/janus-hbase2/pom.xml
@@ -41,6 +41,10 @@
<artifactId>*</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.noggit</groupId>
+ <artifactId>noggit</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-shaded</artifactId>
</exclusion>
diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml
index 4c10dab..c9a853f 100644
--- a/graphdb/janus/pom.xml
+++ b/graphdb/janus/pom.xml
@@ -223,11 +223,6 @@
</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>
diff --git a/pom.xml b/pom.xml
index 1eebf98..d560659 100644
--- a/pom.xml
+++ b/pom.xml
@@ -673,6 +673,7 @@
<checkstyle.failOnViolation>false</checkstyle.failOnViolation>
<codehaus.woodstox.stax2-api.version>3.1.4</codehaus.woodstox.stax2-api.version>
<commons-cli.version>1.4</commons-cli.version>
+ <commons-codec.version>1.14</commons-codec.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-collections4.version>4.4</commons-collections4.version>
<commons-conf.version>1.10</commons-conf.version>
@@ -698,7 +699,7 @@
<guice.version>4.1.0</guice.version>
<hadoop.hdfs-client.version>${hadoop.version}</hadoop.hdfs-client.version>
<hadoop.version>3.1.1</hadoop.version>
- <hbase.version>2.0.2</hbase.version>
+ <hbase.version>2.3.3</hbase.version>
<hive.version>3.1.0</hive.version>
<hppc.version>0.8.1</hppc.version>
<httpcomponents-httpclient.version>4.5.13</httpcomponents-httpclient.version>
@@ -721,8 +722,8 @@
<kafka.version>2.0.0</kafka.version>
<keycloak.version>6.0.1</keycloak.version>
<log4j.version>1.2.17</log4j.version>
- <log4j2.version>2.13.2</log4j2.version>
- <lucene-solr.version>7.7.2</lucene-solr.version>
+ <log4j2.version>2.13.3</log4j2.version>
+ <lucene-solr.version>8.6.3</lucene-solr.version>
<maven-site-plugin.version>3.7</maven-site-plugin.version>
<MaxPermGen>512m</MaxPermGen>
<node-for-v2.version>v12.16.0</node-for-v2.version>
@@ -745,19 +746,19 @@
<skipTests>false</skipTests>
<skipUTs>false</skipUTs>
<slf4j.version>1.7.30</slf4j.version>
- <solr-test-framework.version>7.7.2</solr-test-framework.version>
- <solr.version>7.7.2</solr.version>
+ <solr-test-framework.version>8.6.3</solr-test-framework.version>
+ <solr.version>8.6.3</solr.version>
<spray.version>1.3.1</spray.version>
<spring.security.version>4.2.17.RELEASE</spring.security.version>
<spring.version>4.3.29.RELEASE</spring.version>
<sqoop.version>1.4.6.2.3.99.0-195</sqoop.version>
- <storm.version>1.2.0</storm.version>
+ <storm.version>2.1.0</storm.version>
<surefire.forkCount>2C</surefire.forkCount>
<surefire.version>2.18.1</surefire.version>
<testng.version>6.9.4</testng.version>
<tinkerpop.version>3.4.8</tinkerpop.version>
<woodstox-core.version>5.0.3</woodstox-core.version>
- <zookeeper.version>3.4.6</zookeeper.version>
+ <zookeeper.version>3.5.7</zookeeper.version>
</properties>
<modules>
diff --git a/repository/pom.xml b/repository/pom.xml
index 924c15c..9bbab36 100755
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -70,6 +70,12 @@
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
diff --git a/test-tools/pom.xml b/test-tools/pom.xml
index 7de0f3b..50ee675 100644
--- a/test-tools/pom.xml
+++ b/test-tools/pom.xml
@@ -57,8 +57,8 @@
<artifactId>caffeine</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-core</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/test-tools/src/main/resources/solr/solr.xml b/test-tools/src/main/resources/solr/solr.xml
index 041f005..e25f09c 100644
--- a/test-tools/src/main/resources/solr/solr.xml
+++ b/test-tools/src/main/resources/solr/solr.xml
@@ -36,12 +36,15 @@
<bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
<int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:15000}</int>
<int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:120000}</int>
+ <str name="zkCredentialsProvider">${zkCredentialsProvider:org.apache.solr.common.cloud.DefaultZkCredentialsProvider}</str>
+ <str name="zkACLProvider">${zkACLProvider:org.apache.solr.common.cloud.DefaultZkACLProvider}</str>
</solrcloud>
<shardHandlerFactory name="shardHandlerFactory"
class="HttpShardHandlerFactory">
<int name="socketTimeout">${socketTimeout:120000}</int>
<int name="connTimeout">${connTimeout:15000}</int>
+ <str name="shardsWhitelist">${solr.shardsWhitelist:}</str>
</shardHandlerFactory>
</solr>