This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new d2cee4d81b2f [SPARK-46411][BUILD][3.5][FOLLOWUP] Fix pom.xml file in
common/network-common module
d2cee4d81b2f is described below
commit d2cee4d81b2f75de008817409ca716364356c45c
Author: Dongjoon Hyun <dh...@apple.com>
AuthorDate: Fri Apr 5 10:46:41 2024 -0700
[SPARK-46411][BUILD][3.5][FOLLOWUP] Fix pom.xml file in
common/network-common module
### What changes were proposed in this pull request?
This PR aims to fix `common/network-common/pom.xml`.
### Why are the changes needed?
To fix the cherry-pick mistake.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Pass the CIs.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #45897 from dongjoon-hyun/SPARK-46411.
Authored-by: Dongjoon Hyun <dh...@apple.com>
Signed-off-by: Dongjoon Hyun <dh...@apple.com>
---
common/network-common/pom.xml | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml
index 3916cf16f1de..27a53b0f9f3b 100644
--- a/common/network-common/pom.xml
+++ b/common/network-common/pom.xml
@@ -147,19 +147,6 @@
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
-<<<<<<< HEAD
-=======
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk18on</artifactId>
- <scope>test</scope>
- </dependency>
->>>>>>> 9a75a1d69aa ([SPARK-46411][BUILD] Change to use
`bcprov/bcpkix-jdk18on` for UT)
<dependency>
<groupId>org.apache.spark</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
