Skip to content

Commit 49c3085

Browse files
committed
Rename PRODUCTION_RUNTIME_CLASSPATH_NAME
Rename the now public constant for consistency with the JavaPlugin. See gh-26686
1 parent 1e0ae9d commit 49c3085

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ private TaskProvider<BootJar> configureBootJarTask(Project project) {
102102
Configuration developmentOnly = project.getConfigurations()
103103
.getByName(SpringBootPlugin.DEVELOPMENT_ONLY_CONFIGURATION_NAME);
104104
Configuration productionRuntimeClasspath = project.getConfigurations()
105-
.getByName(SpringBootPlugin.PRODUCTION_RUNTIME_CLASSPATH_NAME);
105+
.getByName(SpringBootPlugin.PRODUCTION_RUNTIME_CLASSPATH_CONFIGURATION_NAME);
106106
FileCollection classpath = mainSourceSet.getRuntimeClasspath()
107107
.minus((developmentOnly.minus(productionRuntimeClasspath))).filter(new JarTypeFileSpec());
108108
TaskProvider<ResolveMainClassName> resolveMainClassName = ResolveMainClassName
@@ -211,7 +211,7 @@ private void configureDevelopmentOnlyConfiguration(Project project) {
211211
Configuration runtimeClasspath = project.getConfigurations()
212212
.getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME);
213213
Configuration productionRuntimeClasspath = project.getConfigurations()
214-
.create(SpringBootPlugin.PRODUCTION_RUNTIME_CLASSPATH_NAME);
214+
.create(SpringBootPlugin.PRODUCTION_RUNTIME_CLASSPATH_CONFIGURATION_NAME);
215215
AttributeContainer attributes = productionRuntimeClasspath.getAttributes();
216216
ObjectFactory objectFactory = project.getObjects();
217217
attributes.attribute(Usage.USAGE_ATTRIBUTE, objectFactory.named(Usage.class, Usage.JAVA_RUNTIME));

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,8 @@ public class SpringBootPlugin implements Plugin<Project> {
7878

7979
/**
8080
* The name of the {@code productionRuntimeClasspath} configuration.
81-
* @since 2.4.7
8281
*/
83-
public static final String PRODUCTION_RUNTIME_CLASSPATH_NAME = "productionRuntimeClasspath";
82+
public static final String PRODUCTION_RUNTIME_CLASSPATH_CONFIGURATION_NAME = "productionRuntimeClasspath";
8483

8584
/**
8685
* The coordinates {@code (group:name:version)} of the

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/WarPluginAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private TaskProvider<BootWar> configureBootWarTask(Project project) {
7474
Configuration developmentOnly = project.getConfigurations()
7575
.getByName(SpringBootPlugin.DEVELOPMENT_ONLY_CONFIGURATION_NAME);
7676
Configuration productionRuntimeClasspath = project.getConfigurations()
77-
.getByName(SpringBootPlugin.PRODUCTION_RUNTIME_CLASSPATH_NAME);
77+
.getByName(SpringBootPlugin.PRODUCTION_RUNTIME_CLASSPATH_CONFIGURATION_NAME);
7878
FileCollection classpath = project.getConvention().getByType(SourceSetContainer.class)
7979
.getByName(SourceSet.MAIN_SOURCE_SET_NAME).getRuntimeClasspath()
8080
.minus(providedRuntimeConfiguration(project)).minus((developmentOnly.minus(productionRuntimeClasspath)))

0 commit comments

Comments
 (0)