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

Merge branch '2.2.x' into 2.3.x 

Closes gh-22246
This commit is contained in:
Andy Wilkinson 2020-07-07 10:53:45 +01:00
parent 96e6b74894 1ad66cf92b
commit 24e1a1dddf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditions.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 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.
@ -26,7 +26,7 @@ import org.springframework.context.annotation.Condition;
* be used to create composite conditions, for example:
*
* <pre class="code">
* static class OnNeitherJndiNorProperty extends NoneOfNestedConditions {
* static class OnNeitherJndiNorProperty extends NoneNestedConditions {
*
* OnNeitherJndiNorProperty() {
* super(ConfigurationPhase.PARSE_CONFIGURATION);