Tidy up (remove unneeded property) RepackageTask

spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/NoJarTests.java

+/*
+ * Copyright 2012-2014 the original author or authors.
+ *
+ * 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 the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.gradle;
+
+import static org.junit.Assert.assertFalse;
+
+import java.io.File;
+
+import org.gradle.tooling.ProjectConnection;
+import org.junit.Test;
+import org.springframework.boot.dependency.tools.ManagedDependencies;
+
+/**
+ * Tests for using the Gradle plugin's support for flat directory repos
+ * 
+ * @author Dave Syer
+ */
+public class NoJarTests {
+
+	private ProjectConnection project;
+
+	private static final String BOOT_VERSION = ManagedDependencies.get()
+			.find("spring-boot").getVersion();
+
+	@Test
+	public void nojar() throws Exception {
+		this.project = new ProjectCreator().createProject("nojar");
+		this.project.newBuild().forTasks("build")
+				.withArguments("-PbootVersion=" + BOOT_VERSION, "--stacktrace").run();
+		assertFalse(new File("target/nojar/build/libs").exists());
+	}
+
+}

spring-boot-integration-tests/src/test/resources/nojar.gradle

+buildscript {
+	repositories {
+		mavenLocal()
+	}
+	dependencies {
+		classpath("org.springframework.boot:spring-boot-gradle-plugin:${project.bootVersion}")
+	}
+}
+
+apply plugin: 'spring-boot'
+
+group = 'nojar'
+version = '0.0.0'
+
+jar {
+	enabled = false
+}
+
+bootRepackage {
+	enabled = false
+}
+
+repositories {
+	mavenLocal()
+	mavenCentral()
+}
+
+dependencies {
+	compile 'org.springframework.boot:spring-boot-starter'
+}

spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPlugin.groovy

@@ -25,7 +25,6 @@ import org.springframework.boot.gradle.agent.AgentPluginFeatures
 import org.springframework.boot.gradle.exclude.ExcludePluginFeatures
 import org.springframework.boot.gradle.repackage.RepackagePluginFeatures
 import org.springframework.boot.gradle.resolve.ResolvePluginFeatures
-import org.springframework.boot.gradle.resolve.SpringBootResolutionStrategy
 import org.springframework.boot.gradle.run.RunPluginFeatures
 
 
@@ -40,16 +39,16 @@ class SpringBootPlugin implements Plugin<Project> {
 	@Override
 	void apply(Project project) {
 		project.getPlugins().apply(BasePlugin)
-		project.getPlugins().apply(JavaPlugin)
-		project.getPlugins().apply(ApplicationPlugin)
 
 		project.getExtensions().create("springBoot", SpringBootPluginExtension)
 		project.getConfigurations().create(VersionManagedDependencies.CONFIGURATION);
 
+		project.getPlugins().apply(JavaPlugin)
+		project.getPlugins().apply(ApplicationPlugin)
 		new AgentPluginFeatures().apply(project)
-		new ResolvePluginFeatures().apply(project)
 		new RepackagePluginFeatures().apply(project)
 		new RunPluginFeatures().apply(project)
+		new ResolvePluginFeatures().apply(project)
 		new ExcludePluginFeatures().apply(project)
 
 		useUtf8Encoding(project)
@@ -64,5 +63,4 @@ class SpringBootPlugin implements Plugin<Project> {
 			}
 		}
 	}
-
 }

spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java

@@ -50,8 +50,6 @@ public class RepackageTask extends DefaultTask {
 
 	private File outputFile;
 
-	private boolean enabled = true;
-
 	public void setCustomConfiguration(String customConfiguration) {
 		this.customConfiguration = customConfiguration;
 	}
@@ -80,14 +78,6 @@ public class RepackageTask extends DefaultTask {
 		this.classifier = classifier;
 	}
 
-	public boolean isEnabled() {
-		return enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 	@TaskAction
 	public void repackage() {
 		Project project = getProject();
@@ -130,7 +120,7 @@ public class RepackageTask extends DefaultTask {
 
 		@Override
 		public void execute(Jar jarTask) {
-			if (!RepackageTask.this.enabled) {
+			if (!RepackageTask.this.isEnabled()) {
 				getLogger().info("Repackage disabled");
 				return;
 			}