From 1705c5d796ace330cb17f217b7318ca7ae648281 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Thu, 20 Jun 2013 11:40:54 -0500 Subject: [PATCH] SEC-2207: Update Gradle to 1.6 --- aspects/aspects.gradle | 3 +- build.gradle | 35 ++-- buildSrc/build.gradle | 6 - .../main/groovy/aspectj/AspectJPlugin.groovy | 18 ++- .../main/groovy/bundlor/BundlorPlugin.groovy | 150 ------------------ .../gradle-plugins/bundlor.properties | 1 - config/config.gradle | 11 +- config/template.mf | 9 ++ gradle/javaprojects.gradle | 2 - gradle/wrapper/gradle-wrapper.jar | Bin 46670 -> 46707 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 4 +- web/template.mf | 1 + 13 files changed, 60 insertions(+), 184 deletions(-) delete mode 100644 buildSrc/src/main/groovy/bundlor/BundlorPlugin.groovy delete mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/bundlor.properties diff --git a/aspects/aspects.gradle b/aspects/aspects.gradle index 5c7837d043..0cd30dcc24 100644 --- a/aspects/aspects.gradle +++ b/aspects/aspects.gradle @@ -4,5 +4,6 @@ dependencies { "org.springframework:spring-beans:$springVersion", "org.springframework:spring-context:$springVersion" - testCompile 'aopalliance:aopalliance:1.0' + testCompile 'aopalliance:aopalliance:1.0', + "org.springframework:spring-aop:$springVersion" } \ No newline at end of file diff --git a/build.gradle b/build.gradle index dd91a30d76..5129726dd2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,14 @@ +import groovy.text.SimpleTemplateEngine + +buildscript { + repositories { + maven { url "http://repo.springsource.org/plugins-release" } + } + dependencies { + classpath("org.springframework.build.gradle:bundlor-plugin:0.1.2") + } +} + apply plugin: 'base' description = 'Spring Security' @@ -9,10 +20,9 @@ allprojects { group = 'org.springframework.security' repositories { - maven { url "http://repo.springsource.org/libs-release" } + maven { url "http://repo.springsource.org/libs-snapshot" } + maven { url "http://repo.springsource.org/plugins-release" } } - - } // Set up different subproject lists for individual configuration @@ -35,19 +45,26 @@ configure(coreModuleProjects) { // Gives better names in structure101 jar diagram sourceSets.main.output.classesDir = new File(buildDir, "classes/" + project.name.substring("spring-security".length() + 1)) apply plugin: 'bundlor' - bundlor.expansions = bundlorProperties apply from: "$rootDir/gradle/maven-deployment.gradle" apply plugin: 'emma' + + bundlor.doFirst { + def templateText = file("template.mf").text + bundlor.manifestTemplate = new SimpleTemplateEngine().createTemplate(templateText).make(bundlorProperties).toString() + } + + bundlor.dependsOn 'compileJava' +} + +configure (aspectjProjects) { + apply plugin: 'java' + apply plugin: 'aspectj' } task coreBuild { dependsOn coreModuleProjects*.tasks*.matching { task -> task.name == 'build' } } -configure (aspectjProjects) { - apply plugin: 'aspectj' -} - // Task for creating the distro zip task dist(type: Zip) { @@ -82,5 +99,5 @@ artifacts { apply from: "$rootDir/gradle/ide-integration.gradle" task wrapper(type: Wrapper) { - gradleVersion = '1.3' + gradleVersion = '1.6' } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index c6dedcda8a..7de8ea91a9 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -43,12 +43,6 @@ dependencies{ compile "emma:emma:2.0.5312" } -// Bundlor -dependencies { - compile 'com.springsource.bundlor:com.springsource.bundlor:1.0.0.RELEASE', - 'com.springsource.bundlor:com.springsource.bundlor.blint:1.0.0.RELEASE' -} - // Trang dependencies { compile 'com.thaiopensource:trang:20091111', diff --git a/buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy b/buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy index 33f2c8b821..1a4f3ae92f 100644 --- a/buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy +++ b/buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy @@ -9,6 +9,7 @@ import org.gradle.api.tasks.SourceSet import org.gradle.api.DefaultTask import org.gradle.api.GradleException +import org.gradle.api.plugins.JavaPlugin import org.gradle.plugins.ide.eclipse.GenerateEclipseProject import org.gradle.plugins.ide.eclipse.GenerateEclipseClasspath import org.gradle.plugins.ide.eclipse.EclipsePlugin @@ -22,6 +23,8 @@ import org.gradle.plugins.ide.eclipse.model.ProjectDependency class AspectJPlugin implements Plugin { void apply(Project project) { + project.plugins.apply(JavaPlugin) + if (!project.hasProperty('aspectjVersion')) { throw new GradleException("You must set the property 'aspectjVersion' before applying the aspectj plugin") } @@ -38,18 +41,24 @@ class AspectJPlugin implements Plugin { project.configurations.add('aspectpath') } + project.tasks.compileJava.deleteAllActions() + project.tasks.add(name: 'compileJava', overwrite: true, description: 'Compiles AspectJ Source', type: Ajc) { + dependsOn project.configurations*.getTaskDependencyFromProjectDependency(true, "compileJava") + dependsOn project.processResources sourceSet = project.sourceSets.main - inputs.files(sourceSet.java.srcDirs) + inputs.files(sourceSet.allSource) outputs.dir(sourceSet.output.classesDir) aspectPath = project.configurations.aspectpath } + project.tasks.compileTestJava.deleteAllActions() + project.tasks.add(name: 'compileTestJava', overwrite: true, description: 'Compiles AspectJ Test Source', type: Ajc) { dependsOn project.processTestResources, project.compileJava, project.jar sourceSet = project.sourceSets.test - inputs.files(sourceSet.java.srcDirs) + inputs.files(sourceSet.allSource) outputs.dir(sourceSet.output.classesDir) aspectPath = project.files(project.configurations.aspectpath, project.jar.archivePath) } @@ -90,7 +99,11 @@ class Ajc extends DefaultTask { @TaskAction def compile() { + logger.info("="*30) + logger.info("="*30) logger.info("Running ajc ...") + logger.info("classpath: ${sourceSet.compileClasspath.asPath}") + logger.info("srcDirs $sourceSet.java.srcDirs") ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties", classpath: project.configurations.ajtools.asPath) ant.iajc(classpath: sourceSet.compileClasspath.asPath, fork: 'true', destDir: sourceSet.output.classesDir.absolutePath, source: project.convention.plugins.java.sourceCompatibility, @@ -98,6 +111,7 @@ class Ajc extends DefaultTask { aspectPath: aspectPath.asPath, sourceRootCopyFilter: '**/*.java', showWeaveInfo: 'true') { sourceroots { sourceSet.java.srcDirs.each { + logger.info(" sourceRoot $it") pathelement(location: it.absolutePath) } } diff --git a/buildSrc/src/main/groovy/bundlor/BundlorPlugin.groovy b/buildSrc/src/main/groovy/bundlor/BundlorPlugin.groovy deleted file mode 100644 index a48e1248e9..0000000000 --- a/buildSrc/src/main/groovy/bundlor/BundlorPlugin.groovy +++ /dev/null @@ -1,150 +0,0 @@ -package bundlor - -import com.springsource.bundlor.ClassPath -import com.springsource.bundlor.ManifestGenerator -import com.springsource.bundlor.ManifestWriter -import com.springsource.bundlor.blint.ManifestValidator -import com.springsource.bundlor.blint.support.DefaultManifestValidatorContributorsFactory -import com.springsource.bundlor.blint.support.StandardManifestValidator -import com.springsource.bundlor.support.DefaultManifestGeneratorContributorsFactory -import com.springsource.bundlor.support.StandardManifestGenerator -import com.springsource.bundlor.support.classpath.FileSystemClassPath -import com.springsource.bundlor.support.manifestwriter.FileSystemManifestWriter -import com.springsource.bundlor.support.properties.EmptyPropertiesSource -import com.springsource.bundlor.support.properties.FileSystemPropertiesSource -import com.springsource.bundlor.support.properties.PropertiesPropertiesSource -import com.springsource.bundlor.support.properties.PropertiesSource -import com.springsource.bundlor.util.BundleManifestUtils -import com.springsource.util.parser.manifest.ManifestContents -import org.gradle.api.DefaultTask -import org.gradle.api.GradleException -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.Task -import org.gradle.api.file.FileCollection -import org.gradle.api.logging.LogLevel -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.InputFile -import org.gradle.api.tasks.InputFiles -import org.gradle.api.tasks.Optional -import org.gradle.api.tasks.OutputDirectory -import org.gradle.api.tasks.OutputFile -import org.gradle.api.tasks.TaskAction - -/** - * @author Luke Taylor - */ -class BundlorPlugin implements Plugin { - void apply(Project project) { - Task bundlor = project.tasks.add('bundlor', Bundlor.class) - bundlor.setDescription('Generates OSGi manifest using bundlor tool') - bundlor.dependsOn(project.classes) - project.jar.dependsOn bundlor - } -} - -public class Bundlor extends DefaultTask { - @InputFile - @Optional - File manifestTemplate - - @OutputDirectory - File bundlorDir = new File("${project.buildDir}/bundlor") - - @OutputFile - File manifest = project.file("${bundlorDir}/META-INF/MANIFEST.MF") - - @Input - Map expansions = [:] - - @InputFile - @Optional - File osgiProfile - - @InputFiles - @Optional - FileCollection inputPaths - - @Input - boolean failOnWarnings = false - - Bundlor() { - manifestTemplate = new File(project.projectDir, 'template.mf') - - if (!manifestTemplate.exists()) { - logger.info("No bundlor template for project " + project.name) - manifestTemplate = null - } - - inputPaths = project.files(project.sourceSets.main.output.classesDir) - - if (manifestTemplate != null) { - project.jar.manifest.from manifest - project.jar.inputs.files manifest - } - } - - @TaskAction - void createManifest() { - if (manifestTemplate == null) { - return; - } - - logging.captureStandardOutput(LogLevel.INFO) - - project.mkdir(bundlorDir) - - //String inputPath = project.sourceSets.main.classesDir - - List inputClassPath = [] as List; - - ManifestWriter manifestWriter = new FileSystemManifestWriter(project.file(bundlorDir.absolutePath)); - ManifestContents mfTemplate = BundleManifestUtils.getManifest(manifestTemplate); - - inputPaths.each {f -> - inputClassPath.add(new FileSystemClassPath(f)) - } - - // Must be a better way of doing this... - Properties p = new Properties() - expansions.each {entry -> - p.setProperty(entry.key, entry.value as String) - } - - PropertiesSource expansionProps = new PropertiesPropertiesSource(p) - PropertiesSource osgiProfileProps = osgiProfile == null ? new EmptyPropertiesSource() : - new FileSystemPropertiesSource(osgiProfile); - - ManifestGenerator manifestGenerator = new StandardManifestGenerator( - DefaultManifestGeneratorContributorsFactory.create(expansionProps, osgiProfileProps)); - - ManifestContents mf = manifestGenerator.generate(mfTemplate, inputClassPath.toArray(new ClassPath[inputClassPath.size()])); - - try { - manifestWriter.write(mf); - } finally { - manifestWriter.close(); - } - - ManifestValidator manifestValidator = new StandardManifestValidator(DefaultManifestValidatorContributorsFactory.create()); - - List warnings = manifestValidator.validate(mf); - - if (warnings.isEmpty()) { - return - } - - logger.warn("Bundlor Warnings:"); - for (String warning : warnings) { - logger.warn(" " + warning); - } - - if (failOnWarnings) { - throw new GradleException("Bundlor returned warnings. Please fix manifest template at " + manifestTemplate.absolutePath + " and try again.") - } - } - - def inputPath(FileCollection paths) { - inputPaths = project.files(inputPaths, paths) - } -} diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/bundlor.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/bundlor.properties deleted file mode 100644 index 483572f837..0000000000 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/bundlor.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=bundlor.BundlorPlugin diff --git a/config/config.gradle b/config/config.gradle index 6d8a34e0de..880a1b69bf 100644 --- a/config/config.gradle +++ b/config/config.gradle @@ -5,12 +5,6 @@ apply plugin: 'trang' compileTestJava.dependsOn(':spring-security-core:compileTestJava') -configurations { - // GRADLE-1124 - compile.extendsFrom = [] - testCompile.extendsFrom groovy -} - dependencies { // NB: Don't add other compile time dependencies to the config module as this breaks tooling compile project(':spring-security-core'), @@ -34,8 +28,6 @@ dependencies { provided "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion" - groovy 'org.codehaus.groovy:groovy:1.8.7' - testCompile project(':spring-security-ldap'), project(':spring-security-openid'), project(':spring-security-cas'), @@ -50,7 +42,8 @@ dependencies { "org.slf4j:jcl-over-slf4j:$slf4jVersion", "org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final", "org.hibernate:hibernate-entitymanager:4.1.0.Final", - powerMockDependencies + powerMockDependencies, + 'org.codehaus.groovy:groovy:1.8.7' testCompile('org.openid4java:openid4java-nodeps:0.9.6') { exclude group: 'com.google.code.guice', module: 'guice' } diff --git a/config/template.mf b/config/template.mf index d30bbf8f61..c5c764857b 100644 --- a/config/template.mf +++ b/config/template.mf @@ -9,16 +9,21 @@ Ignored-Existing-Headers: Import-Package, Export-Package Import-Template: + org.aopalliance.*;version="${aopAllianceRange}", org.apache.commons.logging.*;version="${cloggingRange}", org.aopalliance.*;version="${aopAllianceRange}";resolution:=optional, org.aspectj.*;version="${aspectjRange}";resolution:=optional, + org.openid4java.*;version="${openid4javaRange}", org.springframework.security.access.*;version="${secRange}", org.springframework.security.authentication.*;version="${secRange}", org.springframework.security.core.*;version="${secRange}", org.springframework.security.crypto.bcrypt.*;version="${secRange}", org.springframework.security.crypto.password.*;version="${secRange}", + org.springframework.security.crypto.*;version="${secRange}", org.springframework.security.util;version="${secRange}", org.springframework.security.provisioning;version="${secRange}", + org.springframework.security.ldap.*;version="${secRange}", + org.springframework.security.openid.*;version="${secRange}";resolution:=optional, org.springframework.security.web.*;version="${secRange}";resolution:=optional, org.springframework.security.ldap.*;version="${secRange}";resolution:=optional, org.springframework.security.openid.*;version="${secRange}";resolution:=optional, @@ -29,9 +34,13 @@ Import-Template: org.springframework.beans.*;version="${springRange}", org.springframework.context.*;version="${springRange}", org.springframework.core.*;version="${springRange}", + org.springframework.http.*;version="${springRange}", + org.springframework.ldap.*;version="${springLdapRange}", + org.springframework.jdbc.*;version="${springRange}", org.springframework.web.*;version="${springRange}", org.springframework.util.*;version="${springRange}", javax.servlet.*;version="0";resolution:=optional, org.openid4java.*;version="${openid4javaRange}", + javax.sql.*;version="0";resolution:=optional, javax.naming.directory;version="0";resolution:=optional, org.w3c.dom;version="0";resolution:=optional diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index 554d66e4f9..fffa67a6c7 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -87,7 +87,6 @@ task integrationTest(type: Test, dependsOn: jar) { logging.captureStandardOutput(LogLevel.INFO) classpath = sourceSets.integrationTest.runtimeClasspath maxParallelForks = 1 - testReport = false } dependencies { @@ -118,7 +117,6 @@ test { jvmArgs = ['-ea', '-Xmx500m'] maxParallelForks = guessMaxForks() logging.captureStandardOutput(LogLevel.INFO) - testReport = false } def guessMaxForks() { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7b359d719bf96879170b6887c0bbb2e02b00ac34..b6b646b0c00c16cb27a2cc712b241d9183bc9310 100644 GIT binary patch delta 2452 zcmZWq2~<kTc12${niF=mWxAmAYL!ZBN0SF_!&pvjMXbSpl{_}amfw%PaPZKjaL z7O*&tY@2%a`mOs8>dtwsn{|f~7wwW$Ync7k2^67XxLz3X!RV585dX~FAgduj$3F`0j?`CzseE4r> z|A2Nkp*4b(IsZ;|^h3Ak5Z{}(NJqI_@U{zc>-Zybxop4is!I3%|IRtz5C_ zp*XJP){V>va+o@>!+M*iftADOcZ60B#@rZq6jjUI*Wxt>5N!S(5_bIeIB3{&zI&jQT8Xg1$xo&Rj9Lf(lFt2*N->uxd?w zmM~z;BB#ZFoxfl`v9j!&#ZFdBzO()zW62dkwU&)p_|4L}$x$15{;82Mg-@)>@x;5- ztM7}CyUSdTy>m6XJHDoDvD?v;XSg5Fyg2$ZckMOxQS}@VnNAB62)sPalAQHEu)ZxB zPR%HEW0cAgirTFi)cpZ*FDfq5uTA~dSo$>nYKAsZ|44V_em^H=7$jzwvZjShlsl_#VL|hU5t%&hqLQ5huLKo?ydSe{GB*K4}3@g&0~3w{m6##z2eB| z5raqTY4Vx}>vrvByLLt|%{;_Q%KMFeK6Es-?K$;+gt8}y-7!4rd%0J%HPCwx$38e9 z-e*ntz9```0jq#{TH#{MC%K%qPn4cIZNKEo_3fty#^~9-;(fP;tUQMtc{Vtw+x3^n z7D-ymcOl|l3Zb&jp*d*#w5r2Xriy8Te<&d?)@`xR-5JK3p!q|*lp-v^ZEr_x;; z2Du+h^QErgqQGRLy6b9nYhVQD`(vJcgYH_~t zxtZMIL=cJRtY>u0BvoiRG)nFxe@c2+8MwcIlO(S6Is5JVj!I|aMJomrKMi!yj9*oc zN#*LN^2t2Lkajsw{%f$LN4ESH)rN1dJ$4g0+z(j1aUIS2%)Nx_e{0w-uf8_7`~)zM?@d>{F~?K|6DlsBaWqRx@H80jtJV^S*$%hJs`8!BCnx*vqGY?z#m~YMe||05p9v zI>YQ|NG-w38c!&7sHNZxd{F6fAn;iNa%vYqx(KDKd|}4HS}RED)KPH91Hr2r8rV{| z98!BxszC&!YU@@*>Jds!gu;Ad@&&-O9?Qq9r{L(}P(0;Jo~|%CFSYsYTm&&BAqaI= zg$?!VV8-83X^;fON$m7yogeUOpy1X@;r<7ts{pGO>$_xY!Ab?1@iCfmX4Vlf)PQ9* zYNX&=(@^O;5YdR$co?NFW}r1PL3^V<)(uJ(XMt;3_VihM&-#P-TzhF^6%eU-P+p{> z;Og^X*LU*`HC;nmr-_0qEr4f~S)}(xS0dDHc?xz_+++zAKcJMj2#AV!Uqst9Q*idh zFnVh-JXxs7MQK?HN?U>25(99#X@RNci<`c_Xu&3*i$=e=RZ2innt^|uC(TtVHJ<+h DDP@}- delta 2404 zcmZuy2{c?;8h*9KzAr(EEhLCWi6xp2MQDYx43bQWV=0l5=+0t`Wx5bUT7q!3B|$`& zrBJpiB$KphIwm7bR6^*sGsGT*bVL$8uWn_T%9%Rno$r6&{r>;E_kZvGwXuwSw2YPV za>L=p5kyoJd3Vw%M{1ua3S`gw-v#E_98;K{ou0)apCoTlNrg6!58e6@Hcj~e_G6~_ z$dSNCVdc<(Jhyy2vIaqr5%kgl$Xs9k1xDT&9OQM z6e17!L=sL7P0AAX;vDzZr(g`a4?H z(bk5I1 z=kCm}Ez2o7RC$q~BF}@aG?MUvS)&S(j&-#i(rL8$%a5-)J?C-#Wh|Z!994E1r5kgk z>#Z~s^65`(tyTN=HR7KhD`?J+Y?vW;N_pK++~MuFBbhXO^Olj9$&6|E%gulj0rEYA zfoGfIqawXS-rbthQz@|2ZpVCjOz7UhJjDoyB4@YjK^#8-RO$jGtUb1{FfjLC5(GNF zxfsZ_`HhOeAU{A4CUM$>tOda~-G%^{4u!uKh|SMf2*eQ=9t#-zs3t+d&6r}-hziM6P2lWIeZ)A3;my!1b5ob>hWJ$2qBT~e9(Q{msVU%fHRpV_hR za#YGz43#cqD4p{p-)es#T`0HJX|~w8Q7ay=*2yi>yzSrNKJ@ZJD6Q8rGi_CTq;61O zmtzz$HKeHPHcKV2{HmNf-bDv*SdkOb@2>uuZ__3t+g z7;L`%n47wue@Eji`^yze4lVaIePVYOb)k9RE2|2GLAX@$Vm8<17lV|`SE{agwgcEM^5>k4PdVl5c`>~l7?aZ6>*yjT!w$6u>CwT3}6?>eo56Zb( zxz3$;r(-1wm-TPOAMM0{>yu~Hq2)GSp|@oH=Y3HgvG}V0OjaKNGySYnIa$YMa;{rY z%otb4@#A{2ujtZoc@FJUqQs5v{yh(MdkV$q&v$S_9~bARAJzr0b5mi``>)};Js!UD zv86l#<67n=(3F(t;-vVmd>Dlo;e-w;CtzD?WB1vRQc(CmLy9IenlM;J+{aN3S}M&y z&T6n;`6YiK0^=$Zh(T4B5R0k~LmaO1fOw$#EX0y(D#VrQ;}Bg~G>DZfZ;0D0HvwNG zSpTuc2j0J~@q_4HONZE2>;BpNm90CX#Xl^Zo#QAAZba90h1l)Ie69B)?&x zq>hLg2Y2c;;N5T?5i8{i_Ha~zEPEfMtl31YBNd!)+zS{~5s<_dMGzj~Z82;zp08q$Y7pvX*C0ZH}taH|m~ELu}V5af+Kf_x>U zVf(@Q3x4WAvq4~M+(5)$4S*hx0%XBRlO(J$l~fuxfqHz4*0B?+!3}~n)`B!X)W~fl zV%O+^xJ6m2?*jWly4aY?OU5jFm17kh+T|9DIH+YEDx!}%|vWhI#l(Q6TqcrRY>1N z>AM*y&2Q!|uq06Da)_88fjY+(+6oWxPrl4#cJBL;t^$Qt-5Cu<=>BSUecs}XAE1R8 zR|mQpbBWmR3SnQ|1V}j8N18iSrg0T_zwh%vn`9QY|-)$#Sp|sNPN2dePh(XBv&B*_!*-@ WO(F3g6@Xl+4FXzacO_TySN;p&#mQU% diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 885f99760b..50d9345a08 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Nov 30 16:30:08 CST 2012 +#Thu Jun 20 11:39:57 CDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.3-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip diff --git a/gradlew b/gradlew index e7a5be4ba1..89380a06eb 100755 --- a/gradlew +++ b/gradlew @@ -61,9 +61,9 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" +cd "`dirname \"$PRG\"`/" >&- APP_HOME="`pwd -P`" -cd "$SAVED" +cd "$SAVED" >&- CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar diff --git a/web/template.mf b/web/template.mf index c47ceb6fa8..ff69859a6a 100644 --- a/web/template.mf +++ b/web/template.mf @@ -37,6 +37,7 @@ Import-Template: org.springframework.web.*;version="${springRange}";resolution:=optional, org.springframework.web.context.*;version="${springRange}";resolution:=optional, org.springframework.web.filter.*;version="${springRange}", + org.springframework.web.*;version="${springRange}", org.springframework.util;version="${springRange}";resolution:=optional, org.w3c.dom;version="0";resolution:=optional, org.xml.sax;version="0";resolution:=optional,