root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '3.3.x' 

Closes gh-41961
This commit is contained in:
Stéphane Nicoll 2024-08-20 11:58:05 +02:00
parent 14f6de0e54 d07eee4af3
commit 5c76189583
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java
View File

@ -55,6 +55,7 @@ import org.gradle.api.artifacts.result.ResolvedArtifactResult;
import org.gradle.api.attributes.DocsType; import org.gradle.api.attributes.DocsType;
import org.gradle.api.attributes.Usage; import org.gradle.api.attributes.Usage;
import org.gradle.api.component.AdhocComponentWithVariants; import org.gradle.api.component.AdhocComponentWithVariants;
import org.gradle.api.component.ConfigurationVariantDetails;
import org.gradle.api.component.SoftwareComponent; import org.gradle.api.component.SoftwareComponent;
import org.gradle.api.file.CopySpec; import org.gradle.api.file.CopySpec;
import org.gradle.api.file.DirectoryProperty; import org.gradle.api.file.DirectoryProperty;
@ -132,7 +133,7 @@ public class MavenPluginPlugin implements Plugin<Project> {
if (component instanceof AdhocComponentWithVariants componentWithVariants) { if (component instanceof AdhocComponentWithVariants componentWithVariants) {
componentWithVariants.addVariantsFromConfiguration( componentWithVariants.addVariantsFromConfiguration(
project.getConfigurations().getByName(OptionalDependenciesPlugin.OPTIONAL_CONFIGURATION_NAME), project.getConfigurations().getByName(OptionalDependenciesPlugin.OPTIONAL_CONFIGURATION_NAME),
(variant) -> variant.mapToOptional()); ConfigurationVariantDetails::mapToOptional);
} }
}); });
MavenPublication publication = (MavenPublication) project.getExtensions() MavenPublication publication = (MavenPublication) project.getExtensions()

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View File

@ -227,7 +227,7 @@ public class FlywayAutoConfiguration {
*/ */
private void configureProperties(FluentConfiguration configuration, FlywayProperties properties) { private void configureProperties(FluentConfiguration configuration, FlywayProperties properties) {
// NOTE: Using method references in the mapper methods can break // NOTE: Using method references in the mapper methods can break
// back-compatibilty (see gh-38164) // back-compatibility (see gh-38164)
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull(); PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
String[] locations = new LocationResolver(configuration.getDataSource()) String[] locations = new LocationResolver(configuration.getDataSource())
.resolveLocations(properties.getLocations()) .resolveLocations(properties.getLocations())