# HG changeset patch # User ymh # Date 1404900893 -7200 # Node ID c4788613fa133257dfc7789c8d863a1334b75b0d # Parent f9f7092bc63cb7905e128cd6ecae23487fb89630 correct shadow jar version diff -r f9f7092bc63c -r c4788613fa13 server/build.gradle --- a/server/build.gradle Tue Jul 08 18:44:01 2014 +0200 +++ b/server/build.gradle Wed Jul 09 12:14:53 2014 +0200 @@ -3,8 +3,8 @@ group = 'org.iri_research.renkan' version = '0.7.11' - - + + gradle.projectsEvaluated { tasks.withType(JavaCompile) { options.compilerArgs << "-Xlint" @@ -37,11 +37,11 @@ sourceCompatibility = 1.7 targetCompatibility = 1.7 - + repositories { mavenLocal() mavenCentral() - + maven { url "http://repo.maven.apache.org/maven2" } maven { url "http://maven.springframework.org/release" } maven { url "http://maven.springframework.org/milestone" } @@ -54,10 +54,10 @@ events "passed", "skipped", "failed"//, "standardOut", "standardError" } } - + dependencies { testCompile group: 'junit', name: 'junit', version:junit_version runtime group: 'org.slf4j', name: 'slf4j-log4j12', version:slf4j_log4j12_version } - + } diff -r f9f7092bc63c -r c4788613fa13 server/renkan-core/pom.xml --- a/server/renkan-core/pom.xml Tue Jul 08 18:44:01 2014 +0200 +++ b/server/renkan-core/pom.xml Wed Jul 09 12:14:53 2014 +0200 @@ -150,7 +150,7 @@ org.springframework.security spring-security-core ${spring-security-version} - + javax.persistence persistence-api @@ -192,7 +192,7 @@ mongo-java-driver ${mongo-driver-version} - + org.slf4j slf4j-log4j12 ${slf4j-log4j12-version} diff -r f9f7092bc63c -r c4788613fa13 server/renkan-management/build.gradle --- a/server/renkan-management/build.gradle Tue Jul 08 18:44:01 2014 +0200 +++ b/server/renkan-management/build.gradle Wed Jul 09 12:14:53 2014 +0200 @@ -15,7 +15,7 @@ buildscript { repositories { jcenter() } dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:1.0.1' + classpath 'com.github.jengelman.gradle.plugins:shadow:1.0.2' } } @@ -37,3 +37,6 @@ } +configure(shadowJar) { + group = BasePlugin.BUILD_GROUP +} diff -r f9f7092bc63c -r c4788613fa13 server/renkan-management/pom.xml --- a/server/renkan-management/pom.xml Tue Jul 08 18:44:01 2014 +0200 +++ b/server/renkan-management/pom.xml Wed Jul 09 12:14:53 2014 +0200 @@ -103,10 +103,10 @@