Merge pull request #44 from BancVue/spring-boot-fix

Spring boot fix
accolasia · Jun 25, 2014 · 19dfbaa · 19dfbaa
2 parents 288df0b + 6bc28e3
commit 19dfbaa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,9 @@ repositories {
 dependencies {
 	compile localGroovy()
 	compile gradleApi()
-	compile "nl.javadude.gradle.plugins:license-gradle-plugin:0.7.0"
+	compile ("nl.javadude.gradle.plugins:license-gradle-plugin:0.7.0") {
+		exclude group: 'com.google.guava'
+	}
 
 	mainTestCompile('org.spockframework:spock-core:0.7-groovy-1.8') {
 		exclude group: 'org.codehaus.groovy'

diff --git a/src/main/groovy/com/bancvue/gradle/maven/publish/ExtendedPublication.groovy b/src/main/groovy/com/bancvue/gradle/maven/publish/ExtendedPublication.groovy
@@ -20,6 +20,7 @@ import groovy.util.logging.Slf4j
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.PublishArtifact
+import org.gradle.api.plugins.BasePlugin
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.bundling.AbstractArchiveTask
 import org.gradle.api.tasks.bundling.Jar
@@ -149,6 +150,7 @@ class ExtendedPublication {
 			}
 			from isSourceJar ? getSourceSet().allSource : getSourceSet().output
 		}
+		project.getTasks().getByName(BasePlugin.ASSEMBLE_TASK_NAME).dependsOn(jarTask)
 		jarTask
 	}