From 8034ae6e37301fd3e09df2c8b09ba885872a59e2 Mon Sep 17 00:00:00 2001
From: Ken Dombeck <kdombeck@gmail.com>
Date: Thu, 29 Sep 2016 11:39:45 -0500
Subject: [PATCH 1/2] Prevent spring-session from pulling in commons-logging

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

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 1c4638335e..7132bd99a0 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -2258,6 +2258,12 @@
 				<groupId>org.springframework.session</groupId>
 				<artifactId>spring-session</artifactId>
 				<version>${spring-session.version}</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>commons-logging</artifactId>
+						<groupId>commons-logging</groupId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.session</groupId>

From cf4142dbc0f4e67ea2f350065de0d406c932180d Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Thu, 29 Sep 2016 21:08:15 +0100
Subject: [PATCH 2/2] Prevent htmlunit from pulling in commons-logging

Update dependency management to exclude commons-logging and add
an enforcer rule to spring-boot-samples to try and prevent unwanted
commons-logging dependencies from sneaking back in again.

Closes gh-7067
---
 spring-boot-dependencies/pom.xml |  6 ++++++
 spring-boot-samples/pom.xml      | 23 +++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 7132bd99a0..1c6924ed5f 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -1048,6 +1048,12 @@
 				<groupId>net.sourceforge.htmlunit</groupId>
 				<artifactId>htmlunit</artifactId>
 				<version>${htmlunit.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>net.sourceforge.jtds</groupId>
diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml
index cc354cab13..2047d88ad3 100644
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -151,6 +151,29 @@
 					</systemPropertyVariables>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>enforce-rules</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<bannedDependencies>
+									<excludes>
+										<exclude>commons-logging:*:*</exclude>
+									</excludes>
+									<searchTransitive>true</searchTransitive>
+								</bannedDependencies>
+							</rules>
+							<fail>true</fail>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>