Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x' into 3.1.x

Browse Source
This commit is contained in:
Phillip Webb 2023-06-16 14:35:11 -07:00
commit 5d6a507142
9 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForUnconstrainedDirectDependencies.java
View File

@ -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.

2
buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/ArtifactVersionDependencyVersionTests.java
View File

@ -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.

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/EndpointCloudFoundryExtension.java
View File

@ -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.

26
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/LoggersEndpoint.java
View File

@ -137,6 +137,13 @@ public class LoggersEndpoint {
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 class LoggersEndpoint {
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 class LoggersEndpoint {
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 class LoggersEndpoint {
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 class LoggersEndpoint {
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();

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/InMemoryHttpExchangeRepository.java
View File

@ -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.

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java
View File

@ -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.

2
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/oauth2/client/MyOAuthClientConfiguration.java
View File

@ -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.

2
spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoArgumentsException.java
View File

@ -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.

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringProfileModel.java
View File

@ -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.