mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Merge pull request #38983 from dreis2211
* pr/38983: Fix typos Closes gh-38983
This commit is contained in:
commit
5bd2ec44f6
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2012-2023 the original author or authors.
|
* Copyright 2012-2024 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -48,7 +48,7 @@ public interface DependencyVersion extends Comparable<DependencyVersion> {
|
||||||
* Returns whether the given {@code candidate} is an upgrade of this version.
|
* Returns whether the given {@code candidate} is an upgrade of this version.
|
||||||
* @param candidate the version to consider
|
* @param candidate the version to consider
|
||||||
* @param movingToSnapshots whether the upgrade is to be considered as part of moving
|
* @param movingToSnapshots whether the upgrade is to be considered as part of moving
|
||||||
* to snaphots
|
* to snapshots
|
||||||
* @return {@code true} if the candidate is an upgrade, otherwise false
|
* @return {@code true} if the candidate is an upgrade, otherwise false
|
||||||
*/
|
*/
|
||||||
boolean isUpgrade(DependencyVersion candidate, boolean movingToSnapshots);
|
boolean isUpgrade(DependencyVersion candidate, boolean movingToSnapshots);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2012-2023 the original author or authors.
|
* Copyright 2012-2024 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -778,7 +778,7 @@ public class PulsarProperties {
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Topis the reader subscribes to.
|
* Topics the reader subscribes to.
|
||||||
*/
|
*/
|
||||||
private List<String> topics;
|
private List<String> topics;
|
||||||
|
|
||||||
|
|
|
@ -355,7 +355,7 @@ See the https://www.freedesktop.org/software/systemd/man/systemd.service.html[se
|
||||||
|
|
||||||
|
|
||||||
[[deployment.installing.init-d.script-customization.when-running.conf-file]]
|
[[deployment.installing.init-d.script-customization.when-running.conf-file]]
|
||||||
====== Using a Conf Gile
|
====== Using a Conf File
|
||||||
With the exception of `JARFILE` and `APP_NAME`, the settings listed in the preceding section can be configured by using a `.conf` file.
|
With the exception of `JARFILE` and `APP_NAME`, the settings listed in the preceding section can be configured by using a `.conf` file.
|
||||||
The file is expected to be next to the jar file and have the same name but suffixed with `.conf` rather than `.jar`.
|
The file is expected to be next to the jar file and have the same name but suffixed with `.conf` rather than `.jar`.
|
||||||
For example, a jar named `/var/myapp/myapp.jar` uses the configuration file named `/var/myapp/myapp.conf`, as shown in the following example:
|
For example, a jar named `/var/myapp/myapp.jar` uses the configuration file named `/var/myapp/myapp.conf`, as shown in the following example:
|
||||||
|
|
|
@ -36,7 +36,7 @@ The `nativeCompile` task of the GraalVM Native Image plugin is automatically con
|
||||||
[[aot.processing-tests]]
|
[[aot.processing-tests]]
|
||||||
== Processing Tests
|
== Processing Tests
|
||||||
The AOT engine can be applied to JUnit 5 tests that use Spring's Test Context Framework.
|
The AOT engine can be applied to JUnit 5 tests that use Spring's Test Context Framework.
|
||||||
Suitable tests are processed by the `processTestAot` task to generate `ApplicationContextInitialzer` code.
|
Suitable tests are processed by the `processTestAot` task to generate `ApplicationContextInitializer` code.
|
||||||
As with application AOT processing, the `BeanFactory` is fully prepared at build-time.
|
As with application AOT processing, the `BeanFactory` is fully prepared at build-time.
|
||||||
As with `processAot`, the `processTestAot` task is `JavaExec` subclass and can be configured as needed to influence this processing.
|
As with `processAot`, the `processTestAot` task is `JavaExec` subclass and can be configured as needed to influence this processing.
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ When Gradle's {java-plugin}[`java` plugin] is applied to a project, the Spring B
|
||||||
6. Creates a {boot-run-javadoc}['BootRun`] task named `bootTestRun` that can be used to run your application using the `test` source set to find its main method and provide its runtime classpath.
|
6. Creates a {boot-run-javadoc}['BootRun`] task named `bootTestRun` that can be used to run your application using the `test` source set to find its main method and provide its runtime classpath.
|
||||||
7. Creates a configuration named `bootArchives` that contains the artifact produced by the `bootJar` task.
|
7. Creates a configuration named `bootArchives` that contains the artifact produced by the `bootJar` task.
|
||||||
8. Creates a configuration named `developmentOnly` for dependencies that are only required at development time, such as Spring Boot's Devtools, and should not be packaged in executable jars and wars.
|
8. Creates a configuration named `developmentOnly` for dependencies that are only required at development time, such as Spring Boot's Devtools, and should not be packaged in executable jars and wars.
|
||||||
9. Creats a configuration named `testAndDevelopmentOnly` for dependencies that are only required at development time and when writing and running tests and that should not be packaged in executable jars and wars.
|
9. Creates a configuration named `testAndDevelopmentOnly` for dependencies that are only required at development time and when writing and running tests and that should not be packaged in executable jars and wars.
|
||||||
10. Creates a configuration named `productionRuntimeClasspath`. It is equivalent to `runtimeClasspath` minus any dependencies that only appear in the `developmentOnly` or `testDevelopmentOnly` configurations.
|
10. Creates a configuration named `productionRuntimeClasspath`. It is equivalent to `runtimeClasspath` minus any dependencies that only appear in the `developmentOnly` or `testDevelopmentOnly` configurations.
|
||||||
11. Configures any `JavaCompile` tasks with no configured encoding to use `UTF-8`.
|
11. Configures any `JavaCompile` tasks with no configured encoding to use `UTF-8`.
|
||||||
12. Configures any `JavaCompile` tasks to use the `-parameters` compiler argument.
|
12. Configures any `JavaCompile` tasks to use the `-parameters` compiler argument.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2012-2023 the original author or authors.
|
* Copyright 2012-2024 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -195,7 +195,7 @@ class NestedFileSystem extends FileSystem {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public WatchService newWatchService() throws IOException {
|
public WatchService newWatchService() throws IOException {
|
||||||
throw new UnsupportedOperationException("Nested paths do not support the WacherService");
|
throw new UnsupportedOperationException("Nested paths do not support the WatchService");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2012-2023 the original author or authors.
|
* Copyright 2012-2024 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -657,7 +657,7 @@ public final class ZipContent implements Closeable {
|
||||||
|
|
||||||
private static ZipContent loadNestedDirectory(Source source, ZipContent zip, Entry directoryEntry)
|
private static ZipContent loadNestedDirectory(Source source, ZipContent zip, Entry directoryEntry)
|
||||||
throws IOException {
|
throws IOException {
|
||||||
debug.log("Loading nested directry entry '%s' from '%s'", source.nestedEntryName(), source.path());
|
debug.log("Loading nested directory entry '%s' from '%s'", source.nestedEntryName(), source.path());
|
||||||
if (!source.nestedEntryName().endsWith("/")) {
|
if (!source.nestedEntryName().endsWith("/")) {
|
||||||
throw new IllegalArgumentException("Nested entry name must end with '/'");
|
throw new IllegalArgumentException("Nested entry name must end with '/'");
|
||||||
}
|
}
|
||||||
|
|
|
@ -167,7 +167,7 @@ class NestedFileSystemTests {
|
||||||
void newWatchServiceThrowsException() {
|
void newWatchServiceThrowsException() {
|
||||||
assertThatExceptionOfType(UnsupportedOperationException.class)
|
assertThatExceptionOfType(UnsupportedOperationException.class)
|
||||||
.isThrownBy(() -> this.fileSystem.newWatchService())
|
.isThrownBy(() -> this.fileSystem.newWatchService())
|
||||||
.withMessage("Nested paths do not support the WacherService");
|
.withMessage("Nested paths do not support the WatchService");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
Loading…
Reference in New Issue
Block a user