Merge branch '3.0.x' into 3.1.x

Author: philwebb

Diff for: buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForUnconstrainedDirectDependencies.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2023 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.

Diff for: buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/ArtifactVersionDependencyVersionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2023 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.

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/EndpointCloudFoundryExtension.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2023 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.

Diff for: spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/LoggersEndpoint.java

@@ -137,6 +137,13 @@ public static class LoggersDescriptor implements OperationResponseBody {
 
 		private final Map<String, GroupLoggerLevelsDescriptor> groups;
 
+		/**
+		 * Create a new {@link LoggersDescriptor} instance.
+		 * @param levels the levels
+		 * @param loggers the loggers
+		 * @param groups the groups
+		 */
+		@Deprecated(since = "3.2.0", forRemoval = true)
 		public LoggersDescriptor(NavigableSet<LogLevel> levels, Map<String, LoggerLevelsDescriptor> loggers,
 				Map<String, GroupLoggerLevelsDescriptor> groups) {
 			this.levels = levels;
@@ -165,6 +172,11 @@ public static class LoggerLevelsDescriptor implements OperationResponseBody {
 
 		private final String configuredLevel;
 
+		/**
+		 * Create a new {@link LoggerLevelsDescriptor} instance.
+		 * @param configuredLevel the configured level
+		 */
+		@Deprecated(since = "3.2.0", forRemoval = true)
 		public LoggerLevelsDescriptor(LogLevel configuredLevel) {
 			this.configuredLevel = (configuredLevel != null) ? configuredLevel.name() : null;
 		}
@@ -173,6 +185,11 @@ public LoggerLevelsDescriptor(LogLevel configuredLevel) {
 			this.configuredLevel = (directConfiguration != null) ? directConfiguration.getName() : null;
 		}
 
+		/**
+		 * @param level
+		 * @return
+		 */
+		@Deprecated(since = "3.2.0", forRemoval = true)
 		protected final String getName(LogLevel level) {
 			return (level != null) ? level.name() : null;
 		}
@@ -190,6 +207,11 @@ public static class GroupLoggerLevelsDescriptor extends LoggerLevelsDescriptor {
 
 		private final List<String> members;
 
+		/**
+		 * @param configuredLevel
+		 * @param members
+		 */
+		@Deprecated(since = "3.2.0", forRemoval = true)
 		public GroupLoggerLevelsDescriptor(LogLevel configuredLevel, List<String> members) {
 			super(configuredLevel);
 			this.members = members;
@@ -208,6 +230,10 @@ public static class SingleLoggerLevelsDescriptor extends LoggerLevelsDescriptor
 
 		private final String effectiveLevel;
 
+		/**
+		 * @param configuration
+		 */
+		@Deprecated(since = "3.2.0", forRemoval = true)
 		public SingleLoggerLevelsDescriptor(LoggerConfiguration configuration) {
 			super(configuration.getLevelConfiguration(ConfigurationScope.DIRECT));
 			this.effectiveLevel = configuration.getLevelConfiguration().getName();

Diff for: spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/InMemoryHttpExchangeRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.

Diff for: spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/oauth2/client/MyOAuthClientConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.

Diff for: spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoArgumentsException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.

Diff for: spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringProfileModel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.