Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

Browse Source 
Closes gh-31178
This commit is contained in:
Andy Wilkinson
2022-05-26 15:54:58 +01:00
parent e9673fd622 455ee0ce22
commit 5dfa5adb75
68 changed files with 137 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java
View File

@@ -16,7 +16,6 @@
package org.springframework.boot.build.classpath;
import java.io.IOException;
import java.util.TreeSet;
import java.util.stream.Collectors;
@@ -52,7 +51,7 @@ public class CheckClasspathForProhibitedDependencies extends DefaultTask {
}
@TaskAction
public void checkForProhibitedDependencies() throws IOException {
public void checkForProhibitedDependencies() {
TreeSet<String> prohibited = this.classpath.getResolvedConfiguration().getResolvedArtifacts().stream()
.map((artifact) -> artifact.getModuleVersion().getId()).filter(this::prohibited)
.map((id) -> id.getGroup() + ":" + id.getName()).collect(Collectors.toCollection(TreeSet::new));

2
buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenExec.java
View File

@@ -43,7 +43,7 @@ public class MavenExec extends JavaExec {
private File projectDir;
public MavenExec() throws IOException {
public MavenExec() {
setClasspath(mavenConfiguration(getProject()));
args("--batch-mode");
getMainClass().set("org.apache.maven.cli.MavenCli");

2
buildSrc/src/test/java/org/springframework/boot/build/bom/BomPluginIntegrationTests.java
View File

@@ -45,7 +45,7 @@ class BomPluginIntegrationTests {
private File buildFile;
@BeforeEach
void setup(@TempDir File projectDir) throws IOException {
void setup(@TempDir File projectDir) {
this.projectDir = projectDir;
this.buildFile = new File(this.projectDir, "build.gradle");
}

2
buildSrc/src/test/java/org/springframework/boot/build/optional/OptionalDependenciesPluginIntegrationTests.java
View File

@@ -41,7 +41,7 @@ class OptionalDependenciesPluginIntegrationTests {
private File buildFile;
@BeforeEach
void setup(@TempDir File projectDir) throws IOException {
void setup(@TempDir File projectDir) {
this.projectDir = projectDir;
this.buildFile = new File(this.projectDir, "build.gradle");
}

10
buildSrc/src/test/java/org/springframework/boot/build/testing/TestFailuresPluginIntegrationTests.java
View File

@@ -44,12 +44,12 @@ class TestFailuresPluginIntegrationTests {
private File projectDir;
@BeforeEach
void setup(@TempDir File projectDir) throws IOException {
void setup(@TempDir File projectDir) {
this.projectDir = projectDir;
}
@Test
void singleProject() throws IOException {
void singleProject() {
createProject(this.projectDir);
BuildResult result = GradleRunner.create().withDebug(true).withProjectDir(this.projectDir)
.withArguments("build").withPluginClasspath().buildAndFail();
@@ -59,7 +59,7 @@ class TestFailuresPluginIntegrationTests {
}
@Test
void multiProject() throws IOException {
void multiProject() {
createMultiProjectBuild();
BuildResult result = GradleRunner.create().withDebug(true).withProjectDir(this.projectDir)
.withArguments("build").withPluginClasspath().buildAndFail();
@@ -69,7 +69,7 @@ class TestFailuresPluginIntegrationTests {
}
@Test
void multiProjectContinue() throws IOException {
void multiProjectContinue() {
createMultiProjectBuild();
BuildResult result = GradleRunner.create().withDebug(true).withProjectDir(this.projectDir)
.withArguments("build", "--continue").withPluginClasspath().buildAndFail();
@@ -81,7 +81,7 @@ class TestFailuresPluginIntegrationTests {
}
@Test
void multiProjectParallel() throws IOException {
void multiProjectParallel() {
createMultiProjectBuild();
BuildResult result = GradleRunner.create().withDebug(true).withProjectDir(this.projectDir)
.withArguments("build", "--parallel", "--stacktrace").withPluginClasspath().buildAndFail();