mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.5.x' into 2.6.x
Closes gh-30213
This commit is contained in:
commit
464fce621d
@ -133,7 +133,7 @@ final class JavaPluginAction implements PluginApplicationAction {
|
||||
|
||||
private void configureArtifactPublication(TaskProvider<BootJar> bootJar) {
|
||||
LazyPublishArtifact artifact = new LazyPublishArtifact(bootJar);
|
||||
this.singlePublishedArtifact.addCandidate(artifact);
|
||||
this.singlePublishedArtifact.addJarCandidate(artifact);
|
||||
}
|
||||
|
||||
private void configureBootRunTask(Project project) {
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2020 the original author or authors.
|
||||
* Copyright 2012-2022 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.
|
||||
@ -38,14 +38,22 @@ final class SinglePublishedArtifact implements Buildable {
|
||||
this.artifacts = artifacts;
|
||||
}
|
||||
|
||||
void addCandidate(PublishArtifact candidate) {
|
||||
if (this.currentArtifact == null || "war".equals(candidate.getExtension())) {
|
||||
this.artifacts.remove(this.currentArtifact);
|
||||
this.artifacts.add(candidate);
|
||||
this.currentArtifact = candidate;
|
||||
void addWarCandidate(PublishArtifact candidate) {
|
||||
add(candidate);
|
||||
}
|
||||
|
||||
void addJarCandidate(PublishArtifact candidate) {
|
||||
if (this.currentArtifact == null) {
|
||||
add(candidate);
|
||||
}
|
||||
}
|
||||
|
||||
private void add(PublishArtifact artifact) {
|
||||
this.artifacts.remove(this.currentArtifact);
|
||||
this.artifacts.add(artifact);
|
||||
this.currentArtifact = artifact;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TaskDependency getBuildDependencies() {
|
||||
return this.artifacts.getBuildDependencies();
|
||||
|
@ -108,7 +108,7 @@ class WarPluginAction implements PluginApplicationAction {
|
||||
|
||||
private void configureArtifactPublication(TaskProvider<BootWar> bootWar) {
|
||||
LazyPublishArtifact artifact = new LazyPublishArtifact(bootWar);
|
||||
this.singlePublishedArtifact.addCandidate(artifact);
|
||||
this.singlePublishedArtifact.addWarCandidate(artifact);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2021 the original author or authors.
|
||||
* Copyright 2012-2022 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.
|
||||
@ -16,19 +16,25 @@
|
||||
|
||||
package org.springframework.boot.gradle.plugin;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.StringReader;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Enumeration;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipFile;
|
||||
|
||||
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
|
||||
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
|
||||
import org.gradle.testkit.runner.BuildResult;
|
||||
import org.gradle.testkit.runner.TaskOutcome;
|
||||
import org.gradle.util.GradleVersion;
|
||||
import org.junit.jupiter.api.TestTemplate;
|
||||
|
||||
import org.springframework.boot.gradle.junit.GradleCompatibility;
|
||||
@ -154,6 +160,26 @@ class ApplicationPluginActionIntegrationTests {
|
||||
});
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
void taskConfigurationIsAvoided() throws IOException {
|
||||
BuildResult result = this.gradleBuild.build("help");
|
||||
String output = result.getOutput();
|
||||
BufferedReader reader = new BufferedReader(new StringReader(output));
|
||||
String line;
|
||||
Set<String> configured = new HashSet<>();
|
||||
while ((line = reader.readLine()) != null) {
|
||||
if (line.startsWith("Configuring :")) {
|
||||
configured.add(line.substring("Configuring :".length()));
|
||||
}
|
||||
}
|
||||
if (GradleVersion.version(this.gradleBuild.getGradleVersion()).compareTo(GradleVersion.version("7.3.3")) < 0) {
|
||||
assertThat(configured).containsExactly("help");
|
||||
}
|
||||
else {
|
||||
assertThat(configured).containsExactlyInAnyOrder("help", "clean");
|
||||
}
|
||||
}
|
||||
|
||||
private List<String> zipEntryNames(File distribution) throws IOException {
|
||||
List<String> entryNames = new ArrayList<>();
|
||||
try (ZipFile zipFile = new ZipFile(distribution)) {
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2021 the original author or authors.
|
||||
* Copyright 2012-2022 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.
|
||||
@ -16,13 +16,18 @@
|
||||
|
||||
package org.springframework.boot.gradle.plugin;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.StringReader;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.jar.JarOutputStream;
|
||||
|
||||
import org.gradle.testkit.runner.BuildResult;
|
||||
import org.gradle.testkit.runner.TaskOutcome;
|
||||
import org.gradle.util.GradleVersion;
|
||||
import org.junit.jupiter.api.TestTemplate;
|
||||
|
||||
import org.springframework.boot.gradle.junit.GradleCompatibility;
|
||||
@ -159,6 +164,27 @@ class JavaPluginActionIntegrationTests {
|
||||
assertThat(productionRuntime).contains("canBeConsumed: false");
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
void taskConfigurationIsAvoided() throws IOException {
|
||||
BuildResult result = this.gradleBuild.build("help");
|
||||
String output = result.getOutput();
|
||||
BufferedReader reader = new BufferedReader(new StringReader(output));
|
||||
String line;
|
||||
Set<String> configured = new HashSet<>();
|
||||
while ((line = reader.readLine()) != null) {
|
||||
if (line.startsWith("Configuring :")) {
|
||||
configured.add(line.substring("Configuring :".length()));
|
||||
}
|
||||
}
|
||||
if (!this.gradleBuild.isConfigurationCache() && GradleVersion.version(this.gradleBuild.getGradleVersion())
|
||||
.compareTo(GradleVersion.version("7.3.3")) < 0) {
|
||||
assertThat(configured).containsExactly("help");
|
||||
}
|
||||
else {
|
||||
assertThat(configured).containsExactlyInAnyOrder("help", "clean");
|
||||
}
|
||||
}
|
||||
|
||||
private void createMinimalMainSource() throws IOException {
|
||||
File examplePackage = new File(this.gradleBuild.getProjectDir(), "src/main/java/com/example");
|
||||
examplePackage.mkdirs();
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2021 the original author or authors.
|
||||
* Copyright 2012-2022 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.
|
||||
@ -16,6 +16,14 @@
|
||||
|
||||
package org.springframework.boot.gradle.plugin;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.StringReader;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import org.gradle.testkit.runner.BuildResult;
|
||||
import org.gradle.util.GradleVersion;
|
||||
import org.junit.jupiter.api.TestTemplate;
|
||||
|
||||
import org.springframework.boot.gradle.junit.GradleCompatibility;
|
||||
@ -57,4 +65,24 @@ class KotlinPluginActionIntegrationTests {
|
||||
.contains("compileKotlin java parameters: false").contains("compileTestKotlin java parameters: false");
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
void taskConfigurationIsAvoided() throws IOException {
|
||||
BuildResult result = this.gradleBuild.build("help");
|
||||
String output = result.getOutput();
|
||||
BufferedReader reader = new BufferedReader(new StringReader(output));
|
||||
String line;
|
||||
Set<String> configured = new HashSet<>();
|
||||
while ((line = reader.readLine()) != null) {
|
||||
if (line.startsWith("Configuring :")) {
|
||||
configured.add(line.substring("Configuring :".length()));
|
||||
}
|
||||
}
|
||||
if (GradleVersion.version(this.gradleBuild.getGradleVersion()).compareTo(GradleVersion.version("7.3.3")) < 0) {
|
||||
assertThat(configured).containsExactly("help");
|
||||
}
|
||||
else {
|
||||
assertThat(configured).containsExactlyInAnyOrder("help", "clean", "compileKotlin", "compileTestKotlin");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2021 the original author or authors.
|
||||
* Copyright 2012-2022 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.
|
||||
@ -16,10 +16,16 @@
|
||||
|
||||
package org.springframework.boot.gradle.plugin;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.StringReader;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import org.gradle.testkit.runner.BuildResult;
|
||||
import org.gradle.testkit.runner.TaskOutcome;
|
||||
import org.gradle.util.GradleVersion;
|
||||
import org.junit.jupiter.api.TestTemplate;
|
||||
|
||||
import org.springframework.boot.gradle.junit.GradleCompatibility;
|
||||
@ -67,4 +73,24 @@ class WarPluginActionIntegrationTests {
|
||||
assertThat(result.getOutput()).contains("Main class name has not been configured and it could not be resolved");
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
void taskConfigurationIsAvoided() throws IOException {
|
||||
BuildResult result = this.gradleBuild.build("help");
|
||||
String output = result.getOutput();
|
||||
BufferedReader reader = new BufferedReader(new StringReader(output));
|
||||
String line;
|
||||
Set<String> configured = new HashSet<>();
|
||||
while ((line = reader.readLine()) != null) {
|
||||
if (line.startsWith("Configuring :")) {
|
||||
configured.add(line.substring("Configuring :".length()));
|
||||
}
|
||||
}
|
||||
if (GradleVersion.version(this.gradleBuild.getGradleVersion()).compareTo(GradleVersion.version("7.3.3")) < 0) {
|
||||
assertThat(configured).containsExactly("help");
|
||||
}
|
||||
else {
|
||||
assertThat(configured).containsExactlyInAnyOrder("help", "clean");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -0,0 +1,9 @@
|
||||
plugins {
|
||||
id 'org.springframework.boot' version '{version}'
|
||||
id 'java'
|
||||
id 'application'
|
||||
}
|
||||
|
||||
tasks.configureEach {
|
||||
println "Configuring ${it.path}"
|
||||
}
|
@ -0,0 +1,8 @@
|
||||
plugins {
|
||||
id 'org.springframework.boot' version '{version}'
|
||||
id 'java'
|
||||
}
|
||||
|
||||
tasks.configureEach {
|
||||
println "Configuring ${it.path}"
|
||||
}
|
@ -0,0 +1,9 @@
|
||||
plugins {
|
||||
id 'org.springframework.boot' version '{version}'
|
||||
}
|
||||
|
||||
apply plugin: 'org.jetbrains.kotlin.jvm'
|
||||
|
||||
tasks.configureEach {
|
||||
println "Configuring ${it.path}"
|
||||
}
|
@ -0,0 +1,8 @@
|
||||
plugins {
|
||||
id 'org.springframework.boot' version '{version}'
|
||||
id 'war'
|
||||
}
|
||||
|
||||
tasks.configureEach {
|
||||
println "Configuring ${it.path}"
|
||||
}
|
@ -164,6 +164,10 @@ public class GradleBuild {
|
||||
return this;
|
||||
}
|
||||
|
||||
public boolean isConfigurationCache() {
|
||||
return this.configurationCache;
|
||||
}
|
||||
|
||||
public GradleBuild scriptProperty(String key, String value) {
|
||||
this.scriptProperties.put(key, value);
|
||||
return this;
|
||||
|
Loading…
Reference in New Issue
Block a user