This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch olap-bump in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 747e6e8879a49c985bf1441a229ed42ca0d09a4b Author: Stephen Mallette <stepm...@amazon.com> AuthorDate: Thu Jan 16 13:10:59 2025 -0500 Bump spark/hadoop to latest versions. --- gremlin-test/pom.xml | 11 ++++++++++ hadoop-gremlin/pom.xml | 11 +++++++++- pom.xml | 6 +++--- spark-gremlin/pom.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 76 insertions(+), 8 deletions(-) diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml index f31296d2ff..9ad2a6c4d6 100644 --- a/gremlin-test/pom.xml +++ b/gremlin-test/pom.xml @@ -88,6 +88,17 @@ limitations under the License. <groupId>org.apache.kerby</groupId> <artifactId>kerb-simplekdc</artifactId> <version>${kerby.version}</version> + <exclusions> + <exclusion> + <groupId>org.wildfly.common</groupId> + <artifactId>wildfly-common</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.wildfly.common</groupId> + <artifactId>wildfly-common</artifactId> + <version>1.5.4.Final</version> </dependency> </dependencies> <build> diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml index ad1957e929..86cb8136b2 100644 --- a/hadoop-gremlin/pom.xml +++ b/hadoop-gremlin/pom.xml @@ -51,6 +51,10 @@ limitations under the License. <artifactId>hadoop-client</artifactId> <version>${hadoop.version}</version> <exclusions> + <exclusion> + <groupId>org.jline</groupId> + <artifactId>jline</artifactId> + </exclusion> <exclusion> <groupId>ch.qos.reload4j</groupId> <artifactId>reload4j</artifactId> @@ -100,6 +104,11 @@ limitations under the License. </exclusions> </dependency> <!-- hadoop-client conflict resolution --> + <dependency> + <groupId>org.jline</groupId> + <artifactId>jline</artifactId> + <version>3.22.0</version> + </dependency> <dependency> <groupId>ch.qos.reload4j</groupId> <artifactId>reload4j</artifactId> @@ -128,7 +137,7 @@ limitations under the License. <dependency> <groupId>com.nimbusds</groupId> <artifactId>nimbus-jose-jwt</artifactId> - <version>9.8.1</version> + <version>9.30.1</version> </dependency> <dependency> <groupId>com.google.guava</groupId> diff --git a/pom.xml b/pom.xml index 6b676dbb44..a600a74d48 100644 --- a/pom.xml +++ b/pom.xml @@ -162,21 +162,21 @@ limitations under the License. <exp4j.version>0.4.8</exp4j.version> <groovy.version>4.0.23</groovy.version> <guice.version>4.2.3</guice.version> - <hadoop.version>3.3.3</hadoop.version> + <hadoop.version>3.4.1</hadoop.version> <hamcrest.version>2.2</hamcrest.version> <java.tuples.version>1.2</java.tuples.version> <javadoc-plugin.version>3.3.1</javadoc-plugin.version> <javapoet.version>1.13.0</javapoet.version> <jbcrypt.version>0.4</jbcrypt.version> <junit.version>4.13.1</junit.version> - <kerby.version>2.0.1</kerby.version> + <kerby.version>2.0.3</kerby.version> <logback.version>1.2.13</logback.version> <metrics.version>3.0.2</metrics.version> <mockito.version>3.10.0</mockito.version> <netty.version>4.1.101.Final</netty.version> <slf4j.version>1.7.25</slf4j.version> <snakeyaml.version>2.0</snakeyaml.version> - <spark.version>3.3.2</spark.version> + <spark.version>3.5.4</spark.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml index b5751b8a8c..348116dc9c 100644 --- a/spark-gremlin/pom.xml +++ b/spark-gremlin/pom.xml @@ -47,6 +47,11 @@ limitations under the License. <artifactId>hadoop-gremlin</artifactId> <version>${project.version}</version> <exclusions> + <!-- prefer gremlin-test/spark meterics --> + <exclusion> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-core</artifactId> + </exclusion> <!-- prefer gremlin-test/spark kerby --> <exclusion> <groupId>org.apache.kerby</groupId> @@ -91,6 +96,26 @@ limitations under the License. <groupId>org.slf4j</groupId> <artifactId>slf4j-reload4j</artifactId> </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-epoll</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-kqueue</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + </exclusion> </exclusions> </dependency> <!-- SPARK --> @@ -171,13 +196,36 @@ limitations under the License. <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> </exclusion> + <!-- prefer TinkerPop's netty --> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-epoll</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-kqueue</artifactId> + </exclusion> </exclusions> </dependency> <!-- resolve spark-gremlin conflicts --> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-core</artifactId> + <version>4.2.19</version> + </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> - <version>4.2.0</version> + <version>5.2.0</version> <exclusions> <exclusion> <groupId>org.apache.zookeeper</groupId> @@ -227,17 +275,17 @@ limitations under the License. <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.13.5</version> + <version>2.15.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.13.5</version> + <version>2.15.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.13.5</version> + <version>2.15.4</version> </dependency> <!-- TEST --> <dependency>