Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-03-01 02:49:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.6.x' into 5.7.x

Browse Source 
Closes gh-11767
This commit is contained in:
Marcus Da Coregio 2022-08-30 10:54:50 -03:00
commit db95f6d5c5
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -204,6 +204,7 @@ tasks.register('checkSamples') {
includeCheckRemote { includeCheckRemote {
repository = 'spring-projects/spring-security-samples' repository = 'spring-projects/spring-security-samples'
ref = samplesBranch ref = samplesBranch
buildScan = true
if (project.hasProperty("samplesInitScript")) { if (project.hasProperty("samplesInitScript")) {
initScripts = [samplesInitScript] initScripts = [samplesInitScript]
projectProperties = ["localRepositoryPath": localRepositoryPath, "springSecurityVersion": project.version] projectProperties = ["localRepositoryPath": localRepositoryPath, "springSecurityVersion": project.version]

6
buildSrc/src/main/groovy/io/spring/gradle/convention/IncludeCheckRemotePlugin.groovy
View File

@ -39,6 +39,7 @@ class IncludeCheckRemotePlugin implements Plugin<Project> {
it.dependsOn 'includeRepo' it.dependsOn 'includeRepo'
it.dir = includeRepoTask.get().outputDirectory it.dir = includeRepoTask.get().outputDirectory
it.tasks = extension.getTasks() it.tasks = extension.getTasks()
it.startParameter.buildScan = extension.getBuildScan()
extension.getInitScripts().forEach {script -> extension.getInitScripts().forEach {script ->
it.startParameter.addInitScript(new File(script)) it.startParameter.addInitScript(new File(script))
} }
@ -75,6 +76,11 @@ class IncludeCheckRemotePlugin implements Plugin<Project> {
*/ */
Map<String, String> projectProperties = [:] Map<String, String> projectProperties = [:]
/**
* Whether the Build Scan should be published
*/
boolean buildScan = false
} }
} }

31
buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTest.java
View File

@ -145,4 +145,35 @@ class IncludeCheckRemotePluginTest {
assertThat(checkRemote).isNotNull(); assertThat(checkRemote).isNotNull();
} }
@Test
void applyWhenNoBuildScanSpecifiedThenRegisterCheckRemoteTaskWithBuildScanFalse() {
this.rootProject = ProjectBuilder.builder().build();
this.rootProject.getPluginManager().apply(IncludeCheckRemotePlugin.class);
this.rootProject.getExtensions().configure(IncludeCheckRemotePlugin.IncludeCheckRemoteExtension.class,
(includeCheckRemoteExtension) -> {
includeCheckRemoteExtension.setProperty("repository", "my-project/my-repository");
includeCheckRemoteExtension.setProperty("ref", "main");
});
GradleBuild checkRemote = (GradleBuild) this.rootProject.getTasks().named("checkRemote").get();
assertThat(checkRemote).isNotNull();
assertThat(checkRemote.getStartParameter().isBuildScan()).isFalse();
}
@Test
void applyWhenBuildScanTrueThenRegisterCheckRemoteTaskWithBuildScanTrue() {
this.rootProject = ProjectBuilder.builder().build();
this.rootProject.getPluginManager().apply(IncludeCheckRemotePlugin.class);
this.rootProject.getExtensions().configure(IncludeCheckRemotePlugin.IncludeCheckRemoteExtension.class,
(includeCheckRemoteExtension) -> {
includeCheckRemoteExtension.setProperty("repository", "my-project/my-repository");
includeCheckRemoteExtension.setProperty("ref", "main");
includeCheckRemoteExtension.setProperty("buildScan", true);
});
GradleBuild checkRemote = (GradleBuild) this.rootProject.getTasks().named("checkRemote").get();
assertThat(checkRemote).isNotNull();
assertThat(checkRemote.getStartParameter().isBuildScan()).isTrue();
}
} }