Add initScripts and projectProperties to IncludeCheckRemotePlugin
Issue gh-10344
This commit is contained in:
parent
9f669c5e3c
commit
723648af00
|
@ -158,6 +158,10 @@ tasks.register('checkSamples') {
|
||||||
includeCheckRemote {
|
includeCheckRemote {
|
||||||
repository = 'spring-projects/spring-security-samples'
|
repository = 'spring-projects/spring-security-samples'
|
||||||
ref = samplesBranch
|
ref = samplesBranch
|
||||||
|
if (project.hasProperty("samplesInitScript")) {
|
||||||
|
initScripts = [samplesInitScript]
|
||||||
|
projectProperties = ["localRepositoryPath": localRepositoryPath, "springSecurityVersion": project.version]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
dependsOn checkRemote
|
dependsOn checkRemote
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2002-2021 the original author or authors.
|
* Copyright 2002-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
|
||||||
* use this file except in compliance with the License. You may obtain a copy of
|
* use this file except in compliance with the License. You may obtain a copy of
|
||||||
|
@ -19,7 +19,6 @@ package io.spring.gradle.convention
|
||||||
import io.spring.gradle.IncludeRepoTask
|
import io.spring.gradle.IncludeRepoTask
|
||||||
import org.gradle.api.Plugin
|
import org.gradle.api.Plugin
|
||||||
import org.gradle.api.Project
|
import org.gradle.api.Project
|
||||||
import org.gradle.api.provider.Property
|
|
||||||
import org.gradle.api.tasks.GradleBuild
|
import org.gradle.api.tasks.GradleBuild
|
||||||
import org.gradle.api.tasks.TaskProvider
|
import org.gradle.api.tasks.TaskProvider
|
||||||
|
|
||||||
|
@ -40,6 +39,12 @@ 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()
|
||||||
|
extension.getInitScripts().forEach {script ->
|
||||||
|
it.startParameter.addInitScript(new File(script))
|
||||||
|
}
|
||||||
|
extension.getProjectProperties().entrySet().forEach { entry ->
|
||||||
|
it.startParameter.projectProperties.put(entry.getKey(), entry.getValue())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -60,6 +65,16 @@ class IncludeCheckRemotePlugin implements Plugin<Project> {
|
||||||
*/
|
*/
|
||||||
List<String> tasks = ['check']
|
List<String> tasks = ['check']
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Init scripts for the build
|
||||||
|
*/
|
||||||
|
List<String> initScripts = []
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Map of properties for the build
|
||||||
|
*/
|
||||||
|
Map<String, String> projectProperties = [:]
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2002-2021 the original author or authors.
|
* Copyright 2002-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
|
||||||
* use this file except in compliance with the License. You may obtain a copy of
|
* use this file except in compliance with the License. You may obtain a copy of
|
||||||
|
@ -16,6 +16,11 @@
|
||||||
|
|
||||||
package io.spring.gradle.convention;
|
package io.spring.gradle.convention;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
import io.spring.gradle.IncludeRepoTask;
|
import io.spring.gradle.IncludeRepoTask;
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.io.FileUtils;
|
||||||
import org.gradle.api.Project;
|
import org.gradle.api.Project;
|
||||||
|
@ -24,8 +29,6 @@ import org.gradle.testfixtures.ProjectBuilder;
|
||||||
import org.junit.jupiter.api.AfterEach;
|
import org.junit.jupiter.api.AfterEach;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
class IncludeCheckRemotePluginTest {
|
class IncludeCheckRemotePluginTest {
|
||||||
|
@ -68,6 +71,40 @@ class IncludeCheckRemotePluginTest {
|
||||||
assertThat(checkRemote.getTasks()).containsExactly("clean", "build", "test");
|
assertThat(checkRemote.getTasks()).containsExactly("clean", "build", "test");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void applyWhenExtensionPropertiesInitScriptsThenCreateCheckRemoteWithProvidedTasks() {
|
||||||
|
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("initScripts", Arrays.asList("spring-security-ci.gradle"));
|
||||||
|
});
|
||||||
|
|
||||||
|
GradleBuild checkRemote = (GradleBuild) this.rootProject.getTasks().named("checkRemote").get();
|
||||||
|
assertThat(checkRemote.getStartParameter().getAllInitScripts()).extracting(File::getName).containsExactly("spring-security-ci.gradle");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void applyWhenExtensionPropertiesBuildPropertiesThenCreateCheckRemoteWithProvidedTasks() {
|
||||||
|
Map<String, String> projectProperties = new HashMap<>();
|
||||||
|
projectProperties.put("localRepositoryPath", "~/local/repository");
|
||||||
|
projectProperties.put("anotherProperty", "some_value");
|
||||||
|
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("projectProperties", projectProperties);
|
||||||
|
});
|
||||||
|
|
||||||
|
GradleBuild checkRemote = (GradleBuild) this.rootProject.getTasks().named("checkRemote").get();
|
||||||
|
assertThat(checkRemote.getStartParameter().getProjectProperties()).containsEntry("localRepositoryPath", "~/local/repository")
|
||||||
|
.containsEntry("anotherProperty", "some_value");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void applyWhenExtensionPropertiesThenRegisterIncludeRepoTaskWithExtensionProperties() {
|
void applyWhenExtensionPropertiesThenRegisterIncludeRepoTaskWithExtensionProperties() {
|
||||||
this.rootProject = ProjectBuilder.builder().build();
|
this.rootProject = ProjectBuilder.builder().build();
|
||||||
|
|
Loading…
Reference in New Issue