This is an automated email from the ASF dual-hosted git repository.

joemcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git


The following commit(s) were added to refs/heads/master by this push:
     new 0935c382e IMPALA-11673: Exclude spring-jcl from the Java build
0935c382e is described below

commit 0935c382e37644e193512494ac7a906b5d4e2e13
Author: Joe McDonnell <[email protected]>
AuthorDate: Tue Oct 18 10:20:01 2022 -0700

    IMPALA-11673: Exclude spring-jcl from the Java build
    
    spring-core has a dependency on spring-jcl, which is
    a jar that implements the same classes as commons-logging.
    Having both on the classpath can lead to conflicts and
    errors. Since commons-logging is already on the classpath
    via other dependencies, this excludes spring-jcl and adds
    it to the list of banned dependencies.
    
    Testing:
     - Ran core job
     - Verified spring-jcl is not present
    
    Change-Id: Ifeb741788662ec1b46303154b40109a4eef67005
    Reviewed-on: http://gerrit.cloudera.org:8080/19154
    Reviewed-by: Michael Smith <[email protected]>
    Reviewed-by: Wenzhe Zhou <[email protected]>
    Tested-by: Impala Public Jenkins <[email protected]>
---
 fe/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/fe/pom.xml b/fe/pom.xml
index 2cc39e6be..0c42bb45c 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -527,6 +527,13 @@ under the License.
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
+      <exclusions>
+        <!-- IMPALA-11673: spring-jcl conflicts with commons-logging -->
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-jcl</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 
@@ -791,6 +798,8 @@ under the License.
                     <exclude>org.glassfish.jersey.core:jersey-servlet</exclude>
                     <!-- IMPALA-9708: Sentry is removed. -->
                     <exclude>org.apache.sentry:*</exclude>
+                    <!-- IMPALA-11673: Ensure spring-jcl is not present. -->
+                    <exclude>org.springframework:spring-jcl</exclude>
                     <!-- Assert that we only use artifacts from only the 
specified
                          version of these components. -->
                     <exclude>org.apache.hadoop:*</exclude>

Reply via email to