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

Support Structure101 License ID

Browse Source 
Closes gh-10443
This commit is contained in:
Josh Cummings
2021-10-26 15:10:28 -06:00
parent 7a99542662
commit d779cd1d48
4 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
buildSrc/src/main/java/s101/S101Plugin.java
View File

@@ -57,7 +57,6 @@ public class S101Plugin implements Plugin<Project> {
.workingDir(extension.getInstallationDirectory())
.classpath(new File(extension.getInstallationDirectory().get(), "structure101-java-build.jar"))
.args(new File(new File(project.getBuildDir(), "s101"), "config.xml"))
.args("-licensedirectory=" + extension.getLicenseDirectory().get())
.systemProperty("s101.label", computeLabel(extension).get())
.doFirst((task) -> {
installAndConfigureIfNeeded(project);
@@ -80,6 +79,10 @@ public class S101Plugin implements Plugin<Project> {
private void installAndConfigureIfNeeded(Project project) {
S101Configurer configurer = new S101Configurer(project);
S101PluginExtension extension = project.getExtensions().getByType(S101PluginExtension.class);
String licenseId = extension.getLicenseId().getOrNull();
if (licenseId != null) {
configurer.license(licenseId);
}
File installationDirectory = extension.getInstallationDirectory().get();
File configurationDirectory = extension.getConfigurationDirectory().get();
if (!installationDirectory.exists()) {