Skip to content

Commit bdb61d7

Browse files
OlgaMaciaszekOlgaMaciaszek
committed
Merge changes from origin.
2 parents 305e39a + a700753 commit bdb61d7

File tree

299 files changed

+3836
-823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

299 files changed

+3836
-823
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
runs-on: ${{ matrix.os.id }}
1212
if: ${{ github.repository == 'spring-projects/spring-boot' }}
1313
strategy:
14+
fail-fast: false
1415
matrix:
1516
os:
1617
- id: ubuntu-latest

‎buildSrc/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
javaFormatVersion=0.0.41
1+
javaFormatVersion=0.0.43

‎buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import org.gradle.api.attributes.DocsType;
5656
import org.gradle.api.attributes.Usage;
5757
import org.gradle.api.component.AdhocComponentWithVariants;
58+
import org.gradle.api.component.ConfigurationVariantDetails;
5859
import org.gradle.api.component.SoftwareComponent;
5960
import org.gradle.api.file.CopySpec;
6061
import org.gradle.api.file.DirectoryProperty;
@@ -132,7 +133,7 @@ private void publishOptionalDependenciesInPom(Project project) {
132133
if (component instanceof AdhocComponentWithVariants componentWithVariants) {
133134
componentWithVariants.addVariantsFromConfiguration(
134135
project.getConfigurations().getByName(OptionalDependenciesPlugin.OPTIONAL_CONFIGURATION_NAME),
135-
(variant) -> variant.mapToOptional());
136+
ConfigurationVariantDetails::mapToOptional);
136137
}
137138
});
138139
MavenPublication publication = (MavenPublication) project.getExtensions()

‎buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/PrepareMavenBinaries.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,16 @@ public abstract class PrepareMavenBinaries extends DefaultTask {
4040

4141
@TaskAction
4242
public void prepareBinaries() {
43-
for (String version : getVersions().get()) {
44-
Configuration configuration = getProject().getConfigurations()
45-
.detachedConfiguration(
46-
getProject().getDependencies().create("org.apache.maven:apache-maven:" + version + ":bin@zip"));
47-
getProject()
48-
.copy((copy) -> copy.into(getOutputDir()).from(getProject().zipTree(configuration.getSingleFile())));
49-
}
43+
getProject().sync((sync) -> {
44+
sync.into(getOutputDir());
45+
for (String version : getVersions().get()) {
46+
Configuration configuration = getProject().getConfigurations()
47+
.detachedConfiguration(getProject().getDependencies()
48+
.create("org.apache.maven:apache-maven:" + version + ":bin@zip"));
49+
sync.from(getProject().zipTree(configuration.getSingleFile()));
50+
}
51+
});
52+
5053
}
5154

5255
}

‎gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ commonsCodecVersion=1.17.1
1010
graalVersion=22.3
1111
hamcrestVersion=2.2
1212
jacksonVersion=2.17.2
13-
junitJupiterVersion=5.10.3
13+
junitJupiterVersion=5.11.0
1414
kotlinVersion=1.9.25
1515
mavenVersion=3.9.4
1616
nativeBuildToolsVersion=0.10.2
17-
springFrameworkVersion=6.2.0-SNAPSHOT
18-
springFramework60xVersion=6.0.21
17+
springFrameworkVersion=6.2.0-M7
18+
springFramework60xVersion=6.0.23
1919
tomcatVersion=10.1.28
2020
snakeYamlVersion=2.2
2121

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@
3434
* @since 2.0.0
3535
*/
3636
@AutoConfiguration(after = AuditAutoConfiguration.class)
37-
@ConditionalOnAvailableEndpoint(endpoint = AuditEventsEndpoint.class)
37+
@ConditionalOnAvailableEndpoint(AuditEventsEndpoint.class)
3838
public class AuditEventsEndpointAutoConfiguration {
3939

4040
@Bean

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/beans/BeansEndpointAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
3131
* @since 2.0.0
3232
*/
3333
@AutoConfiguration
34-
@ConditionalOnAvailableEndpoint(endpoint = BeansEndpoint.class)
34+
@ConditionalOnAvailableEndpoint(BeansEndpoint.class)
3535
public class BeansEndpointAutoConfiguration {
3636

3737
@Bean

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
4040
*/
4141
@AutoConfiguration(after = CacheAutoConfiguration.class)
4242
@ConditionalOnClass(CacheManager.class)
43-
@ConditionalOnAvailableEndpoint(endpoint = CachesEndpoint.class)
43+
@ConditionalOnAvailableEndpoint(CachesEndpoint.class)
4444
public class CachesEndpointAutoConfiguration {
4545

4646
@Bean
@@ -52,7 +52,7 @@ public CachesEndpoint cachesEndpoint(Map<String, CacheManager> cacheManagers) {
5252
@Bean
5353
@ConditionalOnMissingBean
5454
@ConditionalOnBean(CachesEndpoint.class)
55-
@ConditionalOnAvailableEndpoint(exposure = { EndpointExposure.WEB, EndpointExposure.CLOUD_FOUNDRY })
55+
@ConditionalOnAvailableEndpoint(exposure = EndpointExposure.WEB)
5656
public CachesEndpointWebExtension cachesEndpointWebExtension(CachesEndpoint cachesEndpoint) {
5757
return new CachesEndpointWebExtension(cachesEndpoint);
5858
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryEndpointExposureOutcomeContributor.java

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/*
2+
* Copyright 2012-2024 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.actuate.autoconfigure.cloudfoundry;
18+
19+
import java.util.Set;
20+
21+
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.EndpointExposureOutcomeContributor;
22+
import org.springframework.boot.actuate.autoconfigure.endpoint.expose.EndpointExposure;
23+
import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludeExcludeEndpointFilter;
24+
import org.springframework.boot.actuate.endpoint.EndpointId;
25+
import org.springframework.boot.actuate.endpoint.ExposableEndpoint;
26+
import org.springframework.boot.autoconfigure.condition.ConditionMessage.Builder;
27+
import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
28+
import org.springframework.boot.cloud.CloudPlatform;
29+
import org.springframework.core.env.Environment;
30+
31+
/**
32+
* {@link EndpointExposureOutcomeContributor} to expose {@link EndpointExposure#WEB web}
33+
* endpoints for Cloud Foundry.
34+
*
35+
* @author Phillip Webb
36+
*/
37+
class CloudFoundryEndpointExposureOutcomeContributor implements EndpointExposureOutcomeContributor {
38+
39+
private static final String PROPERTY = "management.endpoints.cloud-foundry.exposure";
40+
41+
private final IncludeExcludeEndpointFilter<?> filter;
42+
43+
CloudFoundryEndpointExposureOutcomeContributor(Environment environment) {
44+
this.filter = (!CloudPlatform.CLOUD_FOUNDRY.isActive(environment)) ? null
45+
: new IncludeExcludeEndpointFilter<>(ExposableEndpoint.class, environment, PROPERTY, "*");
46+
}
47+
48+
@Override
49+
public ConditionOutcome getExposureOutcome(EndpointId endpointId, Set<EndpointExposure> exposures,
50+
Builder message) {
51+
if (exposures.contains(EndpointExposure.WEB) && this.filter != null && this.filter.match(endpointId)) {
52+
return ConditionOutcome.match(message.because("marked as exposed by a '" + PROPERTY + "' property"));
53+
}
54+
return null;
55+
}
56+
57+
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
3232
* @since 2.0.0
3333
*/
3434
@AutoConfiguration
35-
@ConditionalOnAvailableEndpoint(endpoint = ConditionsReportEndpoint.class)
35+
@ConditionalOnAvailableEndpoint(ConditionsReportEndpoint.class)
3636
public class ConditionsReportEndpointAutoConfiguration {
3737

3838
@Bean

0 commit comments

Comments
 (0)