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

Polish

This commit is contained in:
Phillip Webb 2018-09-11 14:27:10 -07:00
parent 0c00508b3c
commit 57ec09a55f
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@ -156,7 +156,7 @@
<slf4j.version>1.7.25</slf4j.version>
<snakeyaml.version>1.23</snakeyaml.version>
<solr.version>7.4.0</solr.version>
<!-- deprecated in favour of "spring-framework.version" -->
<!-- deprecated in favor of "spring-framework.version" -->
<spring.version>5.1.0.RC3</spring.version>
<spring-amqp.version>2.1.0.M3</spring-amqp.version>
<spring-batch.version>4.1.0.M3</spring-batch.version>

1
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebFluxTypeExcludeFilter.java
View File

@ -60,6 +60,7 @@ class WebFluxTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter {
includes.add(ClassUtils.forName(optionalInclude, null));
}
catch (Exception ex) {
// Ignore
}
}
DEFAULT_INCLUDES = Collections.unmodifiableSet(includes);

12
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientSecurityConfiguration.java
View File

@ -13,12 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.test.autoconfigure.web.reactive;
/** Configuration for Spring Security's {@link org.springframework.test.web.reactive.server.WebTestClient} integration.
*
* @author Madhura Bhave
*/
package org.springframework.boot.test.autoconfigure.web.reactive;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.context.annotation.Bean;
@ -26,6 +22,12 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers;
import org.springframework.test.web.reactive.server.MockServerConfigurer;
/**
* Configuration for Spring Security's
* {@link org.springframework.test.web.reactive.server.WebTestClient} integration.
*
* @author Madhura Bhave
*/
@Configuration
@ConditionalOnClass(SecurityMockServerConfigurers.class)
class WebTestClientSecurityConfiguration {