Merge branch '1.0.x'

Conflicts:
	spring-boot-dependencies/pom.xml

spring-boot-actuator/pom.xml

@@ -122,6 +122,11 @@
 			<artifactId>logback-classic</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.crashub</groupId>
+			<artifactId>crash.connectors.telnet</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java

@@ -29,7 +29,7 @@ import org.crsh.lang.groovy.GroovyRepl;
 import org.crsh.plugin.PluginContext;
 import org.crsh.plugin.PluginLifeCycle;
 import org.crsh.plugin.ResourceKind;
-import org.crsh.processor.term.ProcessorIOHandler;
+import org.crsh.telnet.term.processor.ProcessorIOHandler;
 import org.crsh.vfs.Resource;
 import org.junit.After;
 import org.junit.Test;

spring-boot-dependencies/pom.xml

@@ -51,7 +51,7 @@
 		<codahale-metrics.version>3.0.2</codahale-metrics.version>
 		<commons-dbcp.version>1.4</commons-dbcp.version>
 		<commons-pool.version>1.6</commons-pool.version>
-		<crashub.version>1.3.0-beta14</crashub.version>
+		<crashub.version>1.3.0-beta18</crashub.version>
 		<flyway.version>3.0</flyway.version>
 		<freemarker.version>2.3.20</freemarker.version>
 		<gemfire.version>7.0.2</gemfire.version>