You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by jo...@apache.org on 2022/11/04 22:17:18 UTC

[impala] 02/02: IMPALA-11667: (Addendum) Remove explicit include of spring-core

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

commit 543399c4715eb1f555bece691b63541630415198
Author: Michael Smith <mi...@cloudera.com>
AuthorDate: Wed Oct 19 09:04:29 2022 -0700

    IMPALA-11667: (Addendum) Remove explicit include of spring-core
    
    Removes the specific exclude of spring-core from pac4j in favor of
    setting versions in dependencyManagement. Continues to exclude other
    springframework libraries (spring-orm from opensaml-storage-impl).
    
    Change-Id: Ifc9b46b45ed24e5e924db88ef792c1a68a906394
    Reviewed-on: http://gerrit.cloudera.org:8080/19153
    Reviewed-by: Joe McDonnell <jo...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 fe/pom.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/fe/pom.xml b/fe/pom.xml
index b4c5f0d80..ddfdd868e 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -555,16 +555,11 @@ under the License.
           <groupId>xalan</groupId>
           <artifactId>xalan</artifactId>
         </exclusion>
+        <!-- Exclude spring components except spring-core -->
         <exclusion>
           <groupId>org.springframework</groupId>
-          <artifactId>*</artifactId>
+          <artifactId>spring-orm</artifactId>
         </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <exclusions>
         <!-- IMPALA-11673: spring-jcl conflicts with commons-logging -->
         <exclusion>
           <groupId>org.springframework</groupId>