Standardize Build

Fixes gh-769

samples/javaconfig/rest/build.gradle

@@ -1,23 +0,0 @@
-apply from: JAVA_GRADLE
-apply from: TOMCAT_7_GRADLE
-apply from: SAMPLE_GRADLE
-
-dependencies {
-	compile(project(':spring-session-data-redis')) {
-		exclude module: 'jedis'
-	}
-	compile "io.lettuce:lettuce-core:$lettuceVersion",
-			"org.springframework:spring-webmvc:$springVersion",
-			"org.springframework.security:spring-security-config:$springSecurityVersion",
-			"org.springframework.security:spring-security-web:$springSecurityVersion",
-			"com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
-			jstlDependencies
-
-	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
-
-	testCompile "junit:junit:$junitVersion",
-			"org.springframework.security:spring-security-test:$springSecurityVersion",
-			"org.assertj:assertj-core:$assertjVersion",
-			"org.springframework:spring-test:$springVersion",
-			"commons-codec:commons-codec:1.6"
-}

samples/javaconfig/rest/spring-session-sample-javaconfig-rest.gradle

@@ -0,0 +1,22 @@
+apply plugin: 'io.spring.convention.spring-sample-war'
+
+dependencies {
+	compile(project(':spring-session-data-redis')) {
+		exclude module: 'jedis'
+	}
+	compile "io.lettuce:lettuce-core"
+	compile "org.springframework:spring-webmvc"
+	compile "org.springframework.security:spring-security-config"
+	compile "org.springframework.security:spring-security-web"
+	compile "com.fasterxml.jackson.core:jackson-databind"
+	compile jstlDependencies
+	compile slf4jDependencies
+
+	providedCompile "javax.servlet:javax.servlet-api"
+
+	testCompile "junit:junit"
+	testCompile "org.springframework.security:spring-security-test"
+	testCompile "org.assertj:assertj-core"
+	testCompile "org.springframework:spring-test"
+	testCompile "commons-codec:commons-codec"
+}

samples/javaconfig/rest/src/integration-test/java/sample/RestTests.java

@@ -48,7 +48,7 @@ public class RestTests {
 
 	@Before
 	public void setUp() {
-		this.baseUrl = "http://localhost:" + System.getProperty("tomcat.port");
+		this.baseUrl = "http://localhost:" + System.getProperty("app.port");
 		this.restTemplate = new RestTemplate();
 	}