Standardize Build

Fixes gh-769

samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle

@@ -1,37 +1,20 @@
-buildscript {
-	repositories {
-		mavenCentral()
-		maven { url "https://repo.spring.io/plugins-snapshot" }
-	}
-	dependencies {
-		classpath 'io.spring.gradle:dependency-management-plugin:1.0.2.RELEASE'
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
-	}
-}
-
-apply from: JAVA_GRADLE
-apply from: SAMPLE_GRADLE
-
+apply plugin: 'io.spring.convention.spring-sample-boot'
 apply plugin: "application"
-apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
-
-ext['spring-data-releasetrain.version'] = springDataReleaseTrainVersion
 
 dependencies {
-	compile project(':spring-session-data-gemfire'),
-		"org.springframework.boot:spring-boot-starter-thymeleaf",
-		"org.springframework.boot:spring-boot-starter-web",
-		"org.webjars:bootstrap:$bootstrapVersion",
-		"org.webjars:webjars-locator"
+	compile project(':spring-session-data-gemfire')
+	compile "org.springframework.boot:spring-boot-starter-thymeleaf"
+	compile "org.springframework.boot:spring-boot-starter-web"
+	compile "org.webjars:bootstrap"
+	compile "org.webjars:webjars-locator"
 
-	runtime "org.springframework.shell:spring-shell:1.1.0.RELEASE"
+	runtime "org.springframework.shell:spring-shell"
 
 	testCompile "org.springframework.boot:spring-boot-starter-test"
 
 	integrationTestCompile seleniumDependencies
 
-	integrationTestRuntime "org.springframework.shell:spring-shell:1.1.0.RELEASE"
+	integrationTestRuntime "org.springframework.shell:spring-shell"
 }
 
 run {
@@ -40,8 +23,8 @@ run {
 	}
 }
 
-springBoot {
-	mainClassName = 'sample.client.Application'
+bootJar {
+	mainClass = 'sample.client.Application'
 }
 
 task runGemFireServer() {

samples/boot/gemfire/src/integration-test/java/sample/pages/HomePage.java

@@ -53,7 +53,7 @@ public class HomePage {
 	}
 
 	private static void get(WebDriver driver, String get) {
-		String baseUrl = "http://localhost:" + System.getProperty("tomcat.port", "8080");
+		String baseUrl = "http://localhost:" + System.getProperty("app.port", "8080");
 		driver.get(baseUrl + get);
 	}
 

samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ import org.apache.geode.cache.Cache;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
@@ -51,7 +50,7 @@ public class GemFireServer {
 
 	public static void main(String[] args) {
 		SpringApplication springApplication = new SpringApplication(GemFireServer.class);
-		springApplication.setWebApplicationType(WebApplicationType.NONE);
+		springApplication.setWebEnvironment(false);
 		springApplication.run(args);
 	}