From f02c390ee55e775a084f4145865915e63d3a3563 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Thu, 9 Nov 2017 15:53:14 +0000
Subject: [PATCH] Simplify commons-logging exclusions and remove redundant dep
 mgmnt

c719ab7a adding dependency management for a number of Apache Commons
projects to exclude commons-logging and resolve problems with
dependency convergence.

As Boot's dependencies have evolved, much of this dependency
management has become redundant. This commit removes it, and excludes
commons-logging in the single starter that still needs it instead.

Closes gh-7050
---
 .../spring-boot-dependencies/pom.xml          | 36 ++++---------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 3b0d02a2c2..56b3e306ba 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -36,11 +36,8 @@
 		<caffeine.version>2.6.0</caffeine.version>
 		<cassandra-driver.version>3.3.0</cassandra-driver.version>
 		<classmate.version>1.3.4</classmate.version>
-		<commons-beanutils.version>1.9.3</commons-beanutils.version>
-		<commons-collections.version>3.2.2</commons-collections.version>
 		<commons-codec.version>1.11</commons-codec.version>
 		<commons-dbcp2.version>2.1.1</commons-dbcp2.version>
-		<commons-digester.version>2.1</commons-digester.version>
 		<commons-lang3.version>3.6</commons-lang3.version>
 		<commons-pool.version>1.6</commons-pool.version>
 		<commons-pool2.version>2.4.3</commons-pool2.version>
@@ -741,38 +738,11 @@
 				<artifactId>HikariCP</artifactId>
 				<version>${hikaricp.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>commons-beanutils</groupId>
-				<artifactId>commons-beanutils</artifactId>
-				<version>${commons-beanutils.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>commons-logging</groupId>
-						<artifactId>commons-logging</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>commons-collections</groupId>
-				<artifactId>commons-collections</artifactId>
-				<version>${commons-collections.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>commons-codec</groupId>
 				<artifactId>commons-codec</artifactId>
 				<version>${commons-codec.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>commons-digester</groupId>
-				<artifactId>commons-digester</artifactId>
-				<version>${commons-digester.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>commons-logging</groupId>
-						<artifactId>commons-logging</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
 			<dependency>
 				<groupId>commons-pool</groupId>
 				<artifactId>commons-pool</artifactId>
@@ -1285,6 +1255,12 @@
 				<groupId>org.apache.activemq</groupId>
 				<artifactId>artemis-commons</artifactId>
 				<version>${artemis.version}</version>
+				<exclusions>
+					<exclusion>
+          				<groupId>commons-logging</groupId>
+          				<artifactId>commons-logging</artifactId>
+        				</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.activemq</groupId>