This is an automated email from the ASF dual-hosted git repository. pinal pushed a commit to branch atlas-2.5 in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 4b013c7a5298ec9b9e1742e5bd6506ebf5b5dbb1 Author: Aditya Gupta <[email protected]> AuthorDate: Tue Feb 24 11:31:51 2026 +0530 ATLAS-5203: Upgrade Janusgraph version to 1.1.0 (#517) (cherry picked from commit 1f60de3f128a49b5c1209eb2c27b81c4291834ea) --- addons/impala-bridge/pom.xml | 8 ++------ .../apache/atlas/impala/hook/AtlasImpalaHookContextTest.java | 2 +- .../apache/atlas/impala/hook/ImpalaOperationParserTest.java | 2 +- pom.xml | 6 +++--- repository/pom.xml | 12 ++++++++++-- .../java/org/apache/atlas/query/TraversalComposerTest.java | 2 +- webapp/pom.xml | 6 ++++++ 7 files changed, 24 insertions(+), 14 deletions(-) diff --git a/addons/impala-bridge/pom.xml b/addons/impala-bridge/pom.xml index a50de5cc8..518cd858d 100644 --- a/addons/impala-bridge/pom.xml +++ b/addons/impala-bridge/pom.xml @@ -94,7 +94,8 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> + <version>4.11.0</version> </dependency> <!-- Logging --> <dependency> @@ -102,11 +103,6 @@ <artifactId>slf4j-api</artifactId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> diff --git a/addons/impala-bridge/src/test/java/org/apache/atlas/impala/hook/AtlasImpalaHookContextTest.java b/addons/impala-bridge/src/test/java/org/apache/atlas/impala/hook/AtlasImpalaHookContextTest.java index 386ff0108..19b21233e 100644 --- a/addons/impala-bridge/src/test/java/org/apache/atlas/impala/hook/AtlasImpalaHookContextTest.java +++ b/addons/impala-bridge/src/test/java/org/apache/atlas/impala/hook/AtlasImpalaHookContextTest.java @@ -25,7 +25,7 @@ import org.mockito.MockitoAnnotations; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.junit.Assert.assertEquals; +import static org.testng.Assert.assertEquals; import static org.mockito.Mockito.when; import static org.testng.Assert.assertThrows; diff --git a/addons/impala-bridge/src/test/java/org/apache/atlas/impala/hook/ImpalaOperationParserTest.java b/addons/impala-bridge/src/test/java/org/apache/atlas/impala/hook/ImpalaOperationParserTest.java index f1662f7c8..2eb25f023 100644 --- a/addons/impala-bridge/src/test/java/org/apache/atlas/impala/hook/ImpalaOperationParserTest.java +++ b/addons/impala-bridge/src/test/java/org/apache/atlas/impala/hook/ImpalaOperationParserTest.java @@ -19,7 +19,7 @@ package org.apache.atlas.impala.hook; import org.apache.atlas.impala.model.ImpalaOperationType; import org.testng.annotations.Test; -import static org.junit.Assert.assertEquals; +import static org.testng.Assert.assertEquals; public class ImpalaOperationParserTest { diff --git a/pom.xml b/pom.xml index e75555598..fff64cc6b 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ <jackson.version>2.12.7</jackson.version> <jacoco.version>0.8.13</jacoco.version> <janusgraph.cassandra.version>0.5.3</janusgraph.cassandra.version> - <janusgraph.version>1.0.0</janusgraph.version> + <janusgraph.version>1.1.0</janusgraph.version> <java.version.required>1.8</java.version.required> <javac.source.version>1.8</javac.source.version> <javac.target.version>1.8</javac.target.version> @@ -195,7 +195,7 @@ <surefire.forkCount>2C</surefire.forkCount> <surefire.version>3.0.0-M5</surefire.version> <testng.version>7.0.0</testng.version> - <tinkerpop.version>3.7.0</tinkerpop.version> + <tinkerpop.version>3.7.5</tinkerpop.version> <woodstox-core.version>5.0.3</woodstox-core.version> <zookeeper.version>3.9.2</zookeeper.version> </properties> @@ -1018,7 +1018,7 @@ <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> - <version>2.2.2</version> + <version>3.3.0</version> </dependency> <dependency> diff --git a/repository/pom.xml b/repository/pom.xml index a9b71c302..1cb8ff0e6 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -45,7 +45,7 @@ <dependency> <groupId>com.datastax.cassandra</groupId> <artifactId>cassandra-driver-core</artifactId> - <version>3.2.0</version> + <version>3.11.5</version> <exclusions> <exclusion> <groupId>ch.qos.logback</groupId> @@ -137,16 +137,24 @@ <dependency> <groupId>org.apache.cassandra</groupId> <artifactId>cassandra-all</artifactId> - <version>2.1.8</version> + <version>3.11.19</version> <exclusions> <exclusion> <groupId>ch.qos.logback</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-core</artifactId> + </exclusion> <exclusion> <groupId>io.netty</groupId> <artifactId>netty-handler</artifactId> </exclusion> + <exclusion> + <groupId>org.jctools</groupId> + <artifactId>jctools-core</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/repository/src/test/java/org/apache/atlas/query/TraversalComposerTest.java b/repository/src/test/java/org/apache/atlas/query/TraversalComposerTest.java index ae21f8756..677c74026 100644 --- a/repository/src/test/java/org/apache/atlas/query/TraversalComposerTest.java +++ b/repository/src/test/java/org/apache/atlas/query/TraversalComposerTest.java @@ -71,7 +71,7 @@ public class TraversalComposerTest extends BaseDSLComposer { "[JanusGraphStep([],[__typeName.eq(hive_column), hive_column.name.eq(test_limit)]), DedupGlobalStep(null,null), DedupGlobalStep(null,null), RangeGlobalStep(4,6)]"); verify("hive_db where owner != 'hdfs'", - "[JanusGraphStep([],[__typeName.eq(hive_db)]), JanusGraphMultiQueryStep, NoOpBarrierStep(2500), OrStep([[JanusGraphHasStep([hive_db.owner.neq(hdfs)])], [NotStep([JanusGraphPropertiesStep([hive_db.owner],property)])]]), DedupGlobalStep(null,null), RangeGlobalStep(0,25)]"); + "[JanusGraphStep([],[__typeName.eq(hive_db)]), JanusGraphMultiQueryStep, JanusGraphNoOpBarrierVertexOnlyStep(2500), OrStep([[JanusGraphHasStep([hive_db.owner.neq(hdfs)])], [NotStep([JanusGraphPropertiesStep([hive_db.owner],property)])]]), DedupGlobalStep(null,null), RangeGlobalStep(0,25)]"); } private void verify(String dsl, String expected) { diff --git a/webapp/pom.xml b/webapp/pom.xml index e9e52d21a..c7fffd6ca 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -303,6 +303,12 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minikdc</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> + </exclusions> </dependency> <!-- supports simple auth handler --> <dependency>
