Skip to content
Browse files

Update tomcat/cargo plugin versions.

  • Loading branch information...
1 parent 2d595f5 commit a040310dcda346634aac50f74a18a5951a3a6139 @mdeinum committed
Showing with 33 additions and 33 deletions.
  1. +33 −33 build.gradle
View
66 build.gradle
@@ -1,33 +1,33 @@
apply plugin: 'base'
-ext.springVersion='3.1.4.RELEASE'
-ext.tilesVersion='2.2.2'
-ext.springSecurityVersion='3.1.3.RELEASE'
-ext.springSwfVersion='2.3.2.RELEASE'
-ext.hibernateVersion='4.1.9.Final'
-ext.hibernateValidatorVersion='4.3.0.Final'
-ext.ehCacheVersion='2.5.5'
-ext.aspectJVersion='1.7.1'
-
-ext.tomcatVersion = '7.0.35'
+ext.springVersion = '3.1.4.RELEASE'
+ext.tilesVersion = '2.2.2'
+ext.springSecurityVersion = '3.1.3.RELEASE'
+ext.springSwfVersion = '2.3.2.RELEASE'
+ext.hibernateVersion = '4.1.9.Final'
+ext.hibernateValidatorVersion = '4.3.0.Final'
+ext.ehCacheVersion = '2.5.5'
+ext.aspectJVersion = '1.7.1'
+
+ext.tomcatVersion = '7.0.37'
ext.cargoVersion = '1.3.2'
-ext.webProjects = subprojects.findAll { project -> project.name.endsWith('bookstore')}
+ext.webProjects = subprojects.findAll { project -> project.name.endsWith('bookstore') }
buildscript {
repositories {
mavenCentral()
}
- dependencies {
- classpath 'org.gradle.api.plugins:gradle-tomcat-plugin:0.9.6'
- classpath 'org.gradle.api.plugins:gradle-cargo-plugin:0.5.7'
- }
+ dependencies {
+ classpath 'org.gradle.api.plugins:gradle-tomcat-plugin:0.9.7'
+ classpath 'org.gradle.api.plugins:gradle-cargo-plugin:0.5.9'
+ }
}
allprojects {
- description='Bookstore Sample Application'
+ description = 'Bookstore Sample Application'
group = 'com.apress.prospringmvc'
@@ -35,7 +35,7 @@ allprojects {
repositories {
mavenRepo url: 'http://maven.springframework.org/release'
- mavenRepo url: 'http://maven.springframework.org/snapshot'
+ mavenRepo url: 'http://maven.springframework.org/snapshot'
mavenCentral()
mavenRepo url: 'http://maven.springframework.org/milestone'
mavenRepo url: 'https://repository.jboss.org/nexus/content/repositories/releases/'
@@ -70,8 +70,8 @@ configure(webProjects) {
tomcat("org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}") {
exclude group: 'org.eclipse.jdt.core.compiler', module: 'ecj'
- cargo "org.codehaus.cargo:cargo-core-uberjar:${cargoVersion}",
- "org.codehaus.cargo:cargo-ant:${cargoVersion}"
+ cargo "org.codehaus.cargo:cargo-core-uberjar:${cargoVersion}",
+ "org.codehaus.cargo:cargo-ant:${cargoVersion}"
}
}
@@ -85,17 +85,17 @@ configure(webProjects) {
}
}
- war {
+ war {
version = '' //We do this to make the wars versionless, when they are deployed with cargo, the context
- //root of the app is equal to the file name, which is equal to the sample directory name.
- }
+ //root of the app is equal to the file name, which is equal to the sample directory name.
+ }
task systemTest(type: Test) {
include '**/*FrontendTest.*'
- dependsOn(war)
+ dependsOn(war)
doFirst {
- cargoStartLocal.execute()
+ cargoStartLocal.execute()
}
}
@@ -111,15 +111,15 @@ subprojects() {
apply plugin: 'eclipse-wtp'
apply plugin: 'idea'
- sourceCompatibility=1.6
- targetCompatibility=1.6
-
+ sourceCompatibility = 1.6
+ targetCompatibility = 1.6
+
dependencies() {
compile "org.springframework:spring-orm:$springVersion"
compile "org.springframework:spring-aop:$springVersion"
compile "org.springframework:spring-webmvc:$springVersion"
compile "org.springframework:spring-oxm:$springVersion"
-
+
compile 'org.slf4j:jcl-over-slf4j:1.7.2'
compile 'ch.qos.logback:logback-classic:1.0.9'
compile 'org.apache.commons:commons-lang3:3.0.1'
@@ -137,16 +137,16 @@ subprojects() {
compile 'com.lowagie:itext:2.1.7'
compile 'net.sourceforge.jexcelapi:jxl:2.6.12'
- compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.11'
+ compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.11'
compile 'commons-codec:commons-codec:1.6'
compile 'joda-time:joda-time:2.1'
-
+
testCompile 'junit:junit:4.11'
testCompile "org.springframework:spring-test:$springVersion"
}
-
- eclipse {
- project.natures "org.springframework.ide.eclipse.core.springnature"
+
+ eclipse {
+ project.natures "org.springframework.ide.eclipse.core.springnature"
}
}

0 comments on commit a040310

Please sign in to comment.
Something went wrong with that request. Please try again.