From e74163704ca70be42521abfa0c0ec41de421c3f8 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 22 Jun 2022 07:55:14 +0200 Subject: [PATCH 1/3] Upgrade to Dropwizard Metrics 4.2.10 Closes gh-31486 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 54ed33e554..8f454a062d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -255,7 +255,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.2.9") { + library("Dropwizard Metrics", "4.2.10") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From 72257ba302a0475a8cdd991b2ee48ebe2d105ccd Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 22 Jun 2022 07:55:16 +0200 Subject: [PATCH 2/3] Upgrade to Jetty 9.4.47.v20220610 Closes gh-31487 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 8f454a062d..86b1f0cadd 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -909,7 +909,7 @@ bom { ] } } - library("Jetty", "9.4.46.v20220331") { + library("Jetty", "9.4.47.v20220610") { prohibit("[10.0.0-alpha0,)") { because "it requires Java 11" } From 79d3e3080f6fb62405d6a92b10c8d1b5d430b984 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 22 Jun 2022 08:15:04 +0200 Subject: [PATCH 3/3] Polish --- .../inheritance/OverrideChildProperties.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/inheritance/OverrideChildProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/inheritance/OverrideChildProperties.java index 012cc9f264..f8656314bb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/inheritance/OverrideChildProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/inheritance/OverrideChildProperties.java @@ -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 { } -} \ No newline at end of file +}