Skip to content

Commit fa327a7

Browse files
wilkinsonawilkinsona
committed
Merge branch '2.5.x' into 2.6.x
Closes gh-30850
2 parents b20a8bd + 111dfd8 commit fa327a7

File tree

50 files changed

+106
-107
lines changed

Some content is hidden

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

50 files changed

+106
-107
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -43,7 +43,7 @@ public class DynatraceProperties extends StepRegistryProperties {
4343
private String apiToken;
4444

4545
/**
46-
* URI to ship metrics to. Should be used for SaaS, self managed instances or to
46+
* URI to ship metrics to. Should be used for SaaS, self-managed instances or to
4747
* en-route through an internal proxy.
4848
*/
4949
private String uri;

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/availability/AvailabilityStateHealthIndicator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -50,7 +50,7 @@ public class AvailabilityStateHealthIndicator extends AbstractHealthIndicator {
5050
* @param <S> the availability state type
5151
* @param applicationAvailability the application availability
5252
* @param stateType the availability state type
53-
* @param statusMappings consumer used to setup the status mappings
53+
* @param statusMappings consumer used to set up the status mappings
5454
*/
5555
public <S extends AvailabilityState> AvailabilityStateHealthIndicator(
5656
ApplicationAvailability applicationAvailability, Class<S> stateType,

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -357,7 +357,7 @@ protected static final class OperationKey {
357357
/**
358358
* Create a new {@link OperationKey} instance.
359359
* @param key the underlying key for the operation
360-
* @param description a human readable description of the key
360+
* @param description a human-readable description of the key
361361
*/
362362
public OperationKey(Object key, Supplier<String> description) {
363363
Assert.notNull(key, "Key must not be null");

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -225,7 +225,7 @@ public List<AvailableTag> getAvailableTags() {
225225
}
226226

227227
/**
228-
* A set of tags for further dimensional drilldown and their potential values.
228+
* A set of tags for further dimensional drill-down and their potential values.
229229
*/
230230
public static final class AvailableTag {
231231

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusPushGatewayManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -115,7 +115,7 @@ private void delete() {
115115
this.pushGateway.delete(this.job, this.groupingKey);
116116
}
117117
catch (Throwable ex) {
118-
logger.warn("Unexpected exception thrown while deleting metrics from Promethues Pushgateway", ex);
118+
logger.warn("Unexpected exception thrown while deleting metrics from Prometheus Pushgateway", ex);
119119
}
120120
}
121121

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cassandra/CassandraDriverHealthIndicatorTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -133,7 +133,7 @@ void healthWithoutNodeVersionShouldNotAddVersionDetail() {
133133
}
134134

135135
@Test
136-
void healthWithcassandraDownShouldReturnDown() {
136+
void healthWithCassandraDownShouldReturnDown() {
137137
CqlSession session = mock(CqlSession.class);
138138
given(session.getMetadata()).willThrow(new DriverTimeoutException("Test Exception"));
139139
CassandraDriverHealthIndicator healthIndicator = new CassandraDriverHealthIndicator(session);

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/quartz/QuartzEndpointTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ void quartzJobWithSensitiveDataMap() throws SchedulerException {
659659
}
660660

661661
@Test
662-
void quartzJobWithSensitiveDataMapAndCustomSanitizier() throws SchedulerException {
662+
void quartzJobWithSensitiveDataMapAndCustomSanitizer() throws SchedulerException {
663663
JobDetail job = JobBuilder.newJob(Job.class).withIdentity("hello", "samples").usingJobData("test", "value")
664664
.usingJobData("secret", "value").build();
665665
mockJobs(job);

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -37,7 +37,7 @@
3737

3838
/**
3939
* {@link ApplicationListener} to trigger early initialization in a background thread of
40-
* time consuming tasks.
40+
* time-consuming tasks.
4141
* <p>
4242
* Set the {@link #IGNORE_BACKGROUNDPREINITIALIZER_PROPERTY_NAME} system property to
4343
* {@code true} to disable this mechanism and let such initialization happen in the

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -264,7 +264,7 @@ public static class Request {
264264
private DefaultConsistencyLevel serialConsistency;
265265

266266
/**
267-
* How many rows will be retrieved simultaneously in a single network roundtrip.
267+
* How many rows will be retrieved simultaneously in a single network round-trip.
268268
*/
269269
private int pageSize;
270270

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/ClusterEnvironmentBuilderCustomizer.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -22,8 +22,7 @@
2222
* Callback interface that can be implemented by beans wishing to customize the
2323
* {@link ClusterEnvironment} via a
2424
* {@link com.couchbase.client.java.env.ClusterEnvironment.Builder
25-
* ClusterEnvironment.Builder} whilst retaining default auto-configuration.whilst
26-
* retaining default auto-configuration.
25+
* ClusterEnvironment.Builder} whilst retaining default auto-configuration.
2726
*
2827
* @author Stephane Nicoll
2928
* @since 2.3.0

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2022 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
public class GsonProperties {
3333

3434
/**
35-
* Whether to generate non executable JSON by prefixing the output with some special
35+
* Whether to generate non-executable JSON by prefixing the output with some special
3636
* text.
3737
*/
3838
private Boolean generateNonExecutableJson;

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryOptionsBuilderCustomizer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -22,7 +22,7 @@
2222
/**
2323
* Callback interface that can be implemented by beans wishing to customize the
2424
* {@link ConnectionFactoryOptions} via a {@link Builder} whilst retaining default
25-
* auto-configuration.whilst retaining default auto-configuration.
25+
* auto-configuration.
2626
*
2727
* @author Mark Paluch
2828
* @since 2.3.0

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -35,7 +35,7 @@
3535
import org.springframework.web.servlet.DispatcherServlet;
3636

3737
/**
38-
* {@link EnableAutoConfiguration Auto-configuration} for multi-part uploads. Adds a
38+
* {@link EnableAutoConfiguration Auto-configuration} for multipart uploads. Adds a
3939
* {@link StandardServletMultipartResolver} if none is present, and adds a
4040
* {@link javax.servlet.MultipartConfigElement multipartConfigElement} if none is
4141
* otherwise defined. The {@link ServletWebServerApplicationContext} will associate the

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2022 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
import org.springframework.context.annotation.Configuration;
3333

3434
/**
35-
* Auto configuration for WebSocket reactive server in Tomcat, Jetty or Undertow. Requires
35+
* Auto-configuration for WebSocket reactive server in Tomcat, Jetty or Undertow. Requires
3636
* the appropriate WebSocket modules to be on the classpath.
3737
* <p>
3838
* If Tomcat's WebSocket support is detected on the classpath we add a customizer that

‎spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1554,7 +1554,7 @@
15541554
"description": "Check the change log location exists.",
15551555
"defaultValue": true,
15561556
"deprecation": {
1557-
"reason": "Liquibase has it's own check that checks if the change log location exists making this property redundant.",
1557+
"reason": "Liquibase has its own check that checks if the change log location exists making this property redundant.",
15581558
"level": "error"
15591559
}
15601560
},

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitStreamConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void whenNativeListenerIsEnabledThenContainerFactoryIsConfiguredToUseNativeListe
7575
}
7676

7777
@Test
78-
void whenCustomEnvironmenIsDefinedThenAutoConfiguredEnvironmentBacksOff() {
78+
void whenCustomEnvironmentIsDefinedThenAutoConfiguredEnvironmentBacksOff() {
7979
this.contextRunner.withUserConfiguration(CustomEnvironmentConfiguration.class).run((context) -> {
8080
assertThat(context).hasSingleBean(Environment.class);
8181
assertThat(context.getBean(Environment.class))

‎spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -191,7 +191,7 @@ void setPackageName(String packageName) {
191191
}
192192

193193
/**
194-
* The type of project to generate. Should match one of the advertized type that the
194+
* The type of project to generate. Should match one of the advertised type that the
195195
* service supports. If not set, the default is retrieved from the service metadata.
196196
* @return the project type
197197
*/

‎spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/CompilerAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -37,7 +37,7 @@ public abstract class CompilerAutoConfiguration {
3737
* Strategy method used to determine when compiler auto-configuration should be
3838
* applied. Defaults to always.
3939
* @param classNode the class node
40-
* @return {@code true} if the compiler should be auto configured using this class. If
40+
* @return {@code true} if the compiler should be auto-configured using this class. If
4141
* this method returns {@code false} no other strategy methods will be called.
4242
*/
4343
public boolean matches(ClassNode classNode) {

‎spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/actuator.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Sanitization can be customized in two different ways.
6262
The default patterns used by the `env` and `configprops` endpoints can be replaced using configprop:management.endpoint.env.keys-to-sanitize[] and configprop:management.endpoint.configprops.keys-to-sanitize[] respectively.
6363
Alternatively, additional patterns can be configured using configprop:management.endpoint.env.additional-keys-to-sanitize[] and configprop:management.endpoint.configprops.additional-keys-to-sanitize[].
6464

65-
To take more control over the santization, define a `SanitizingFunction` bean.
65+
To take more control over the sanitization, define a `SanitizingFunction` bean.
6666
The `SanitizableData` with which the function is called provides access to the key and value as well as the `PropertySource` from which they came.
6767
This allows you to, for example, sanitize every value that comes from a particular property source.
6868
Each `SanitizingFunction` is called before and in addition to the built-in key-based sanitization.

‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/EphemeralBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -27,7 +27,7 @@
2727
import org.springframework.boot.buildpack.platform.io.Owner;
2828

2929
/**
30-
* A short lived builder that is created for each {@link Lifecycle} run.
30+
* A short-lived builder that is created for each {@link Lifecycle} run.
3131
*
3232
* @author Phillip Webb
3333
* @author Scott Frederick

‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageReference.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -155,7 +155,7 @@ public ImageReference inTaggedForm() {
155155

156156
/**
157157
* Return an {@link ImageReference} containing either a tag or a digest. If neither
158-
* the digest or the tag has been defined then tag {@code latest} is used.
158+
* the digest nor the tag has been defined then tag {@code latest} is used.
159159
* @return the image reference in tagged or digest form
160160
*/
161161
public ImageReference inTaggedOrDigestForm() {

‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildpackReferenceTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -64,7 +64,7 @@ void hasPrefixWhenPrefixMatchReturnsTrue() {
6464
}
6565

6666
@Test
67-
void hasPrefixWhenPrifixMismatchReturnsFalse() {
67+
void hasPrefixWhenPrefixMismatchReturnsFalse() {
6868
BuildpackReference reference = BuildpackReference.of("test");
6969
assertThat(reference.hasPrefix("st")).isFalse();
7070
}

‎spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/Metadata.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -213,7 +213,7 @@ private ItemMetadata findItem(ConfigurationMetadata metadata, String name) {
213213
.filter((item) -> item.isOfItemType(this.itemType) && name.equals(item.getName()))
214214
.collect(Collectors.toList());
215215
if (candidates.size() > 1) {
216-
throw new IllegalStateException("More that one metadata item with name '" + name + "': " + candidates);
216+
throw new IllegalStateException("More than one metadata item with name '" + name + "': " + candidates);
217217
}
218218
return (candidates.size() == 1) ? candidates.get(0) : null;
219219
}

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/RunningDocumentationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -83,7 +83,7 @@ void bootRunSystemPropertyDefaultValue() {
8383
}
8484

8585
@TestTemplate
86-
void bootRunSystemPropetry() {
86+
void bootRunSystemProperty() {
8787
assertThat(this.gradleBuild.script("src/docs/gradle/running/boot-run-system-property")
8888
.build("-Pexample=custom", "configuredSystemProperties").getOutput())
8989
.contains("com.example.property = custom");

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleProjectBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
/**
3131
* Helper class to build Gradle {@link Project Projects} for test fixtures. Wraps
32-
* functionality of Gradle's own {@link ProjectBuilder} in order to workaround an issue on
33-
* JDK 17 and 18.
32+
* functionality of Gradle's own {@link ProjectBuilder} in order to work around an issue
33+
* on JDK 17 and 18.
3434
*
3535
* @author Christoph Dreis
3636
* @see <a href="https://github.com/gradle/gradle/issues/16857">Gradle Support JDK 17</a>

‎spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFileEntries.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -350,7 +350,7 @@ JarEntryCertification getCertification(JarEntry entry) throws IOException {
350350
JarEntryCertification[] certifications = this.certifications;
351351
if (certifications == null) {
352352
certifications = new JarEntryCertification[this.size];
353-
// We fallback to use JarInputStream to obtain the certs. This isn't that
353+
// We fall back to use JarInputStream to obtain the certs. This isn't that
354354
// fast, but hopefully doesn't happen too often.
355355
try (JarInputStream certifiedJarStream = new JarInputStream(this.jarFile.getData().getInputStream())) {
356356
java.util.jar.JarEntry certifiedEntry = null;

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -187,7 +187,7 @@ public class BuildImageMojo extends AbstractPackagerMojo {
187187
private LayoutFactory layoutFactory;
188188

189189
/**
190-
* Return the type of archive that should be used when buiding the image.
190+
* Return the type of archive that should be used when building the image.
191191
* @return the value of the {@code layout} parameter, or {@code null} if the parameter
192192
* is not provided
193193
*/

0 commit comments

Comments
 (0)