root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x

This commit is contained in:
Andy Wilkinson 2022-05-30 19:22:37 +01:00
parent d1420b6abb 0b6c147a87
commit 430040415b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveTests.java
View File

@ -49,6 +49,7 @@ import org.gradle.api.DomainObjectSet;
import org.gradle.api.Project; import org.gradle.api.Project;
import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.Configuration;
import org.gradle.api.artifacts.DependencySet; import org.gradle.api.artifacts.DependencySet;
import org.gradle.api.artifacts.LenientConfiguration;
import org.gradle.api.artifacts.ModuleVersionIdentifier; import org.gradle.api.artifacts.ModuleVersionIdentifier;
import org.gradle.api.artifacts.ProjectDependency; import org.gradle.api.artifacts.ProjectDependency;
import org.gradle.api.artifacts.ResolvableDependencies; import org.gradle.api.artifacts.ResolvableDependencies;
@ -661,7 +662,9 @@ abstract class AbstractBootArchiveTests<T extends Jar & BootArchive> {
artifacts.add(mockProjectArtifact("second-project-library-SNAPSHOT.jar", "com.example", artifacts.add(mockProjectArtifact("second-project-library-SNAPSHOT.jar", "com.example",
"second-project-library", "1.0.0.SNAPSHOT")); "second-project-library", "1.0.0.SNAPSHOT"));
ResolvedConfiguration resolvedConfiguration = mock(ResolvedConfiguration.class); ResolvedConfiguration resolvedConfiguration = mock(ResolvedConfiguration.class);
given(resolvedConfiguration.getResolvedArtifacts()).willReturn(artifacts); LenientConfiguration lenientConfiguration = mock(LenientConfiguration.class);
given(resolvedConfiguration.getLenientConfiguration()).willReturn(lenientConfiguration);
given(lenientConfiguration.getArtifacts()).willReturn(artifacts);
Configuration configuration = mock(Configuration.class); Configuration configuration = mock(Configuration.class);
given(configuration.getResolvedConfiguration()).willReturn(resolvedConfiguration); given(configuration.getResolvedConfiguration()).willReturn(resolvedConfiguration);
ResolvableDependencies resolvableDependencies = mock(ResolvableDependencies.class); ResolvableDependencies resolvableDependencies = mock(ResolvableDependencies.class);