Skip to content

Commit

Permalink
Merge pull request spring-projects#41957 from PiyalAhmed
Browse files Browse the repository at this point in the history
* pr/41957:
  Polish

Closes spring-projectsgh-41957
  • Loading branch information
snicoll committed Aug 20, 2024
2 parents d23a703 + 016e70c commit cf76724
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import org.gradle.api.attributes.DocsType;
import org.gradle.api.attributes.Usage;
import org.gradle.api.component.AdhocComponentWithVariants;
import org.gradle.api.component.ConfigurationVariantDetails;
import org.gradle.api.component.SoftwareComponent;
import org.gradle.api.file.CopySpec;
import org.gradle.api.file.DirectoryProperty;
Expand Down Expand Up @@ -132,7 +133,7 @@ private void publishOptionalDependenciesInPom(Project project) {
if (component instanceof AdhocComponentWithVariants componentWithVariants) {
componentWithVariants.addVariantsFromConfiguration(
project.getConfigurations().getByName(OptionalDependenciesPlugin.OPTIONAL_CONFIGURATION_NAME),
(variant) -> variant.mapToOptional());
ConfigurationVariantDetails::mapToOptional);
}
});
MavenPublication publication = (MavenPublication) project.getExtensions()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ private void applyConnectionDetails(FlywayConnectionDetails connectionDetails, D
*/
private void configureProperties(FluentConfiguration configuration, FlywayProperties properties) {
// 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();
String[] locations = new LocationResolver(configuration.getDataSource())
.resolveLocations(properties.getLocations())
Expand Down

0 comments on commit cf76724

Please sign in to comment.