From 43cf95b84531ea873a4ee74d78b7b85cbed90b53 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 25 Jun 2014 13:33:26 +0100 Subject: [PATCH] Tidy up (remove unneeded property) RepackageTask --- .../boot/gradle/NoJarTests.java | 47 +++++++++++++++++++ .../src/test/resources/nojar.gradle | 30 ++++++++++++ .../boot/gradle/SpringBootPlugin.groovy | 8 ++-- .../boot/gradle/repackage/RepackageTask.java | 12 +---- 4 files changed, 81 insertions(+), 16 deletions(-) create mode 100644 spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/NoJarTests.java create mode 100644 spring-boot-integration-tests/src/test/resources/nojar.gradle diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/NoJarTests.java b/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/NoJarTests.java new file mode 100644 index 00000000000..53b27086b44 --- /dev/null +++ b/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/NoJarTests.java @@ -0,0 +1,47 @@ +/* + * 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()); + } + +} diff --git a/spring-boot-integration-tests/src/test/resources/nojar.gradle b/spring-boot-integration-tests/src/test/resources/nojar.gradle new file mode 100644 index 00000000000..045a589f752 --- /dev/null +++ b/spring-boot-integration-tests/src/test/resources/nojar.gradle @@ -0,0 +1,30 @@ +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' +} diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPlugin.groovy b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPlugin.groovy index 056c30bc82f..8c95630de66 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPlugin.groovy +++ b/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 { @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 { } } } - } diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java index f083a5f84f1..b1a7653274d 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java +++ b/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; }