From 0aa0cba3f75a6c6259ab905ca1e792b76af6f825 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Tue, 20 Oct 2020 13:09:59 +0100
Subject: [PATCH] Fix content filters when excludeProjectDependencies() is used

Fixes gh-23763
---
 .../boot/gradle/tasks/bundling/LayeredSpec.java            | 2 +-
 .../BootJarIntegrationTests-multiModuleCustomLayers.gradle | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LayeredSpec.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LayeredSpec.java
index e5bfe5f1a7..01ed17d9ef 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LayeredSpec.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LayeredSpec.java
@@ -369,7 +369,7 @@ public class LayeredSpec {
 			List<ContentFilter<Library>> excludeFilters = getExcludes().stream().map(filterFactory)
 					.collect(Collectors.toList());
 			if (this.excludeProjectDependencies) {
-				excludeFilters = new ArrayList<>(includeFilters);
+				excludeFilters = new ArrayList<>(excludeFilters);
 				excludeFilters.add(Library::isLocal);
 			}
 			return new IncludeExcludeContentSelector<>(layer, includeFilters, excludeFilters);
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleCustomLayers.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleCustomLayers.gradle
index 56213e2369..29cc5a3687 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleCustomLayers.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleCustomLayers.gradle
@@ -19,11 +19,12 @@ bootJar {
 			intoLayer("app")
 		}
 		dependencies {
-			intoLayer("subproject-dependencies") {
-				includeProjectDependencies()
-			}
 			intoLayer("snapshot-dependencies") {
 				include "*:*:*SNAPSHOT"
+				excludeProjectDependencies()
+			}
+			intoLayer("subproject-dependencies") {
+				includeProjectDependencies()
 			}
 			intoLayer("commons-dependencies") {
 				include "org.apache.commons:*"