Merge previously split strings
Merge some string lines that were previously split because of the 90 chars wide formatting.
This commit is contained in:
@@ -55,8 +55,8 @@ final class ApplicationPluginAction implements PluginApplicationAction {
|
||||
}
|
||||
CreateBootStartScripts bootStartScripts = project.getTasks().create("bootStartScripts",
|
||||
CreateBootStartScripts.class);
|
||||
bootStartScripts.setDescription(
|
||||
"Generates OS-specific start scripts to run the" + " project as a Spring Boot application.");
|
||||
bootStartScripts
|
||||
.setDescription("Generates OS-specific start scripts to run the project as a Spring Boot application.");
|
||||
((TemplateBasedScriptGenerator) bootStartScripts.getUnixStartScriptGenerator())
|
||||
.setTemplate(project.getResources().getText().fromString(loadResource("/unixStartScript.txt")));
|
||||
((TemplateBasedScriptGenerator) bootStartScripts.getWindowsStartScriptGenerator())
|
||||
|
||||
@@ -83,7 +83,7 @@ final class JavaPluginAction implements PluginApplicationAction {
|
||||
private BootJar configureBootJarTask(Project project) {
|
||||
BootJar bootJar = project.getTasks().create(SpringBootPlugin.BOOT_JAR_TASK_NAME, BootJar.class);
|
||||
bootJar.setDescription(
|
||||
"Assembles an executable jar archive containing the main" + " classes and their dependencies.");
|
||||
"Assembles an executable jar archive containing the main classes and their dependencies.");
|
||||
bootJar.setGroup(BasePlugin.BUILD_GROUP);
|
||||
bootJar.classpath((Callable<FileCollection>) () -> {
|
||||
JavaPluginConvention convention = project.getConvention().getPlugin(JavaPluginConvention.class);
|
||||
|
||||
@@ -86,7 +86,7 @@ public class SpringBootPlugin implements Plugin<Project> {
|
||||
|
||||
private void verifyGradleVersion() {
|
||||
if (GradleVersion.current().compareTo(GradleVersion.version("4.10")) < 0) {
|
||||
throw new GradleException("Spring Boot plugin requires Gradle 4.10 or later." + " The current version is "
|
||||
throw new GradleException("Spring Boot plugin requires Gradle 4.10 or later. The current version is "
|
||||
+ GradleVersion.current());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ class UnresolvedDependenciesAnalyzer {
|
||||
+ "declared without a version failed to resolve:\n");
|
||||
this.dependenciesWithNoVersion
|
||||
.forEach((dependency) -> message.append(" ").append(dependency).append("\n"));
|
||||
message.append("\nDid you forget to apply the " + "io.spring.dependency-management plugin to the ");
|
||||
message.append("\nDid you forget to apply the io.spring.dependency-management plugin to the ");
|
||||
message.append(project.getName()).append(" project?\n");
|
||||
logger.warn(message.toString());
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ public class DependencyManagementPluginActionIntegrationTests {
|
||||
assertThat(output).contains("During the build, one or more dependencies that "
|
||||
+ "were declared without a version failed to resolve:");
|
||||
assertThat(output).contains("org.springframework.boot:spring-boot-starter-web:");
|
||||
assertThat(output).contains("Did you forget to apply the " + "io.spring.dependency-management plugin to the "
|
||||
assertThat(output).contains("Did you forget to apply the io.spring.dependency-management plugin to the "
|
||||
+ this.gradleBuild.getProjectDir().getName() + " project?");
|
||||
}
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ class SpringBootPluginIntegrationTests {
|
||||
void failFastWithVersionOfGradleLowerThanRequired() {
|
||||
BuildResult result = this.gradleBuild.gradleVersion("4.9").buildAndFail();
|
||||
assertThat(result.getOutput())
|
||||
.contains("Spring Boot plugin requires Gradle 4.10" + " or later. The current version is Gradle 4.9");
|
||||
.contains("Spring Boot plugin requires Gradle 4.10 or later. The current version is Gradle 4.9");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user