Skip to content

Commit

Permalink
Bump spark/hadoop to latest versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
@spmallette
spmallette committed Jan 29, 2025
1 parent 1e1f3cf commit 25b5cf1
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 8 deletions.
11 changes: 11 additions & 0 deletions gremlin-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 10 additions & 1 deletion hadoop-gremlin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
<awssdk.version>2.29.3</awssdk.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
56 changes: 52 additions & 4 deletions spark-gremlin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 25b5cf1

Please sign in to comment.