This is an automated email from the ASF dual-hosted git repository.
zhouky pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new 6d7c5c08a [CELEBORN-906][BUILD] Aligning dependencies between SBT and
Maven
6d7c5c08a is described below
commit 6d7c5c08ae6c94d08bed7cfa83e3a9476b570d80
Author: Fu Chen <[email protected]>
AuthorDate: Sat Aug 26 16:06:47 2023 +0800
[CELEBORN-906][BUILD] Aligning dependencies between SBT and Maven
### What changes were proposed in this pull request?
As title
### Why are the changes needed?
This PR ensures dependency alignment between SBT and Maven, based on the
audit results implemented in
https://github.com/apache/incubator-celeborn/pull/1797
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Pass GA and Review
Closes #1831 from cfmcgrady/align-deps-2.
Authored-by: Fu Chen <[email protected]>
Signed-off-by: zky.zhoukeyong <[email protected]>
---
pom.xml | 40 ++++++----------------------------------
project/CelebornBuild.scala | 10 ++++++++--
2 files changed, 14 insertions(+), 36 deletions(-)
diff --git a/pom.xml b/pom.xml
index a86880529..786517fef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -268,6 +268,12 @@
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
@@ -286,16 +292,6 @@
<version>${spark.version}</version>
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.databind.version}</version>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -889,26 +885,12 @@
<module>tests/spark-it</module>
</modules>
<properties>
- <jackson.version>2.6.7</jackson.version>
- <jackson.databind.version>2.6.7.3</jackson.databind.version>
<lz4-java.version>1.4.0</lz4-java.version>
<scala.version>2.11.12</scala.version>
<scala.binary.version>2.11</scala.binary.version>
<spark.version>2.4.8</spark.version>
<zstd-jni.version>1.4.4-3</zstd-jni.version>
</properties>
- <dependencies>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.databind.version}</version>
- </dependency>
- </dependencies>
</profile>
<profile>
@@ -920,8 +902,6 @@
<module>tests/spark-it</module>
</modules>
<properties>
- <jackson.version>2.10.0</jackson.version>
- <jackson.databind.version>2.10.0</jackson.databind.version>
<lz4-java.version>1.7.1</lz4-java.version>
<scala.version>2.12.10</scala.version>
<scala.binary.version>2.12</scala.binary.version>
@@ -940,8 +920,6 @@
<module>tests/spark-it</module>
</modules>
<properties>
- <jackson.version>2.10.0</jackson.version>
- <jackson.databind.version>2.10.0</jackson.databind.version>
<lz4-java.version>1.7.1</lz4-java.version>
<scala.version>2.12.10</scala.version>
<scala.binary.version>2.12</scala.binary.version>
@@ -960,8 +938,6 @@
<module>tests/spark-it</module>
</modules>
<properties>
- <jackson.version>2.12.3</jackson.version>
- <jackson.databind.version>2.12.3</jackson.databind.version>
<lz4-java.version>1.7.1</lz4-java.version>
<scala.version>2.12.15</scala.version>
<scala.binary.version>2.12</scala.binary.version>
@@ -979,8 +955,6 @@
<module>tests/spark-it</module>
</modules>
<properties>
- <jackson.version>2.13.4</jackson.version>
- <jackson.databind.version>2.13.4.2</jackson.databind.version>
<lz4-java.version>1.8.0</lz4-java.version>
<scala.version>2.12.15</scala.version>
<scala.binary.version>2.12</scala.binary.version>
@@ -998,8 +972,6 @@
<module>tests/spark-it</module>
</modules>
<properties>
- <jackson.version>2.14.2</jackson.version>
- <jackson.databind.version>2.14.2</jackson.databind.version>
<lz4-java.version>1.8.0</lz4-java.version>
<scala.version>2.12.17</scala.version>
<scala.binary.version>2.12</scala.binary.version>
diff --git a/project/CelebornBuild.scala b/project/CelebornBuild.scala
index e6ab134c3..f63dfc745 100644
--- a/project/CelebornBuild.scala
+++ b/project/CelebornBuild.scala
@@ -62,7 +62,8 @@ object Dependencies {
val protocVersion = "3.19.2"
val protoVersion = "3.19.2"
- val commonsCrypto = "org.apache.commons" % "commons-crypto" %
commonsCryptoVersion
+ val commonsCrypto = "org.apache.commons" % "commons-crypto" %
commonsCryptoVersion excludeAll(
+ ExclusionRule("net.java.dev.jna", "jna"))
val commonsIo = "commons-io" % "commons-io" % commonsIoVersion
val commonsLang3 = "org.apache.commons" % "commons-lang3" %
commonsLang3Version
val findbugsJsr305 = "com.google.code.findbugs" % "jsr305" % findbugsVersion
@@ -72,7 +73,8 @@ object Dependencies {
val ioDropwizardMetricsCore = "io.dropwizard.metrics" % "metrics-core" %
metricsVersion
val ioDropwizardMetricsGraphite = "io.dropwizard.metrics" %
"metrics-graphite" % metricsVersion
val ioDropwizardMetricsJvm = "io.dropwizard.metrics" % "metrics-jvm" %
metricsVersion
- val ioNetty = "io.netty" % "netty-all" % nettyVersion
+ val ioNetty = "io.netty" % "netty-all" % nettyVersion excludeAll(
+ ExclusionRule("io.netty", "netty-handler-ssl-ocsp"))
val javaxServletApi = "javax.servlet" % "javax.servlet-api" %
javaxServletVersion
val leveldbJniAll = "org.fusesource.leveldbjni" % "leveldbjni-all" %
leveldbJniVersion
val log4j12Api = "org.apache.logging.log4j" % "log4j-1.2-api" % log4j2Version
@@ -133,6 +135,10 @@ object CelebornCommonSettings {
// -target cannot be passed as a parameter to javadoc. See
https://github.com/sbt/sbt/issues/355
Compile / compile / javacOptions ++= Seq("-target", "1.8"),
+
+ dependencyOverrides := Seq(
+ Dependencies.findbugsJsr305,
+ Dependencies.slf4jApi),
// Make sure any tests in any project that uses Spark is configured for
running well locally
Test / javaOptions ++= Seq(
