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

Allow custom repackage task to be used without a global main class

Browse Source 
Closes gh-5956
This commit is contained in:
Andy Wilkinson
2016-06-15 17:24:00 +01:00
parent 76cd45e76e
commit c808de0021
3 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/RepackagingTests.java
View File

@@ -159,6 +159,17 @@ public class RepackagingTests {
assertFalse(isDevToolsJarIncluded(repackageFile));
}
@Test
public void customRepackagingTaskWithOwnMainClassNameAnNoGlobalMainClassName() {
project.newBuild().forTasks("clean", "customRepackagedJarWithOwnMainClass")
.withArguments("-PbootVersion=" + BOOT_VERSION, "-Prepackage=true",
"-PexcludeDevtools=false", "-PnoMainClass=true")
.run();
File buildLibs = new File("target/repackage/build/libs");
assertTrue(new File(buildLibs, "custom.jar").exists());
assertTrue(new File(buildLibs, "custom.jar.original").exists());
}
private boolean isDevToolsJarIncluded(File repackageFile) throws IOException {
JarFile jarFile = new JarFile(repackageFile);
try {

9
spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/repackage.gradle
View File

@@ -23,7 +23,9 @@ dependencies {
}
springBoot {
mainClass = 'foo.bar.Baz'
if (!project.hasProperty("noMainClass")) {
mainClass = 'foo.bar.Baz'
}
excludeDevtools = Boolean.valueOf(project.excludeDevtools)
}
@@ -50,3 +52,8 @@ task customRepackagedJar(type: BootRepackage, dependsOn: customJar) {
task customRepackagedJarWithStringReference(type: BootRepackage, dependsOn: customJar) {
withJarTask = 'customJar'
}
task customRepackagedJarWithOwnMainClass(type: BootRepackage, dependsOn: customJar) {
withJarTask = customJar
mainClass = 'foo.bar.Baz'
}

15
spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/RepackageTask.java
View File

@@ -240,14 +240,16 @@ public class RepackageTask extends DefaultTask {
}
private void setMainClass(Repackager repackager) {
String mainClass;
String mainClass = null;
if (getProject().hasProperty("mainClassName")) {
mainClass = (String) getProject().property("mainClassName");
}
else {
ExtraPropertiesExtension extraProperties = (ExtraPropertiesExtension) getProject()
.getExtensions().getByName("ext");
mainClass = (String) extraProperties.get("mainClassName");
if (extraProperties.has("mainClassName")) {
mainClass = (String) extraProperties.get("mainClassName");
}
}
if (RepackageTask.this.mainClass != null) {
mainClass = RepackageTask.this.mainClass;
@@ -262,8 +264,13 @@ public class RepackageTask extends DefaultTask {
.property("main");
}
}
getLogger().info("Setting mainClass: " + mainClass);
repackager.setMainClass(mainClass);
if (mainClass != null) {
getLogger().info("Setting mainClass: " + mainClass);
repackager.setMainClass(mainClass);
}
else {
getLogger().info("No mainClass configured");
}
}
private LaunchScript getLaunchScript() throws IOException {