From e735bb2fcdcb6fe8713fbbbcc4375b9a94005f4b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 9 Apr 2022 09:35:48 +0200 Subject: [PATCH] Start building against Spring Framework 5.3.19 snapshots See gh-30517 --- .../boot/autoconfigure/flyway/FlywayPropertiesTests.java | 6 +++--- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java index 3290c1235a4..123b66f0279 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -111,8 +111,8 @@ class FlywayPropertiesTests { ignoreProperties(properties, "url", "driverClassName", "user", "password", "enabled", "checkLocation", "createDataSource"); // High level object we can't set with properties - ignoreProperties(configuration, "callbacks", "dataSource", "javaMigrations", "javaMigrationClassProvider", - "resourceProvider", "resolvers"); + ignoreProperties(configuration, "callbacks", "classLoader", "dataSource", "javaMigrations", + "javaMigrationClassProvider", "resourceProvider", "resolvers"); // Properties we don't want to expose ignoreProperties(configuration, "resolversAsClassNames", "callbacksAsClassNames", "loggers", "driver"); // Handled by the conversion service diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 968d708541a..3e375777400 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1699,7 +1699,7 @@ bom { ] } } - library("Spring Framework", "5.3.18") { + library("Spring Framework", "5.3.19-SNAPSHOT") { group("org.springframework") { imports = [ "spring-framework-bom"