Browse Source

Merge branch '2.6.x' into 2.7.x

pull/31518/head
Stephane Nicoll 4 years ago
parent
commit
e967d0383b
  1. 18
      spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/inheritance/OverrideChildProperties.java

18
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/inheritance/OverrideChildProperties.java

@ -1,3 +1,19 @@ @@ -1,3 +1,19 @@
/*
* Copyright 2012-2022 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.configurationsample.inheritance;
public class OverrideChildProperties extends BaseProperties {
@ -33,4 +49,4 @@ public class OverrideChildProperties extends BaseProperties { @@ -33,4 +49,4 @@ public class OverrideChildProperties extends BaseProperties {
}
}
}

Loading…
Cancel
Save