Add version properties

Add version properties to dependencies POM so that users can easily
override. Also use consistent naming for all property keys.

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java

@@ -39,7 +39,7 @@ public class SpringBatchCompilerAutoConfiguration extends CompilerAutoConfigurat
 	public void applyDependencies(DependencyCustomizer dependencies) {
 		dependencies.ifAnyMissingClasses("org.springframework.batch.core.Job").add(
 				"org.springframework.batch", "spring-batch-core",
-				dependencies.getProperty("spring.batch.version", "2.2.0.RELEASE"));
+				dependencies.getProperty("spring-batch.version", "2.2.0.RELEASE"));
 		dependencies.ifAnyMissingClasses("org.springframework.jdbc.core.JdbcTemplate")
 				.add("org.springframework", "spring-jdbc",
 						dependencies.getProperty("spring.version"));

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java

@@ -40,7 +40,7 @@ public class SpringBootCompilerAutoConfiguration extends CompilerAutoConfigurati
 	public void applyDependencies(DependencyCustomizer dependencies) {
 		dependencies.ifAnyMissingClasses("org.springframework.boot.SpringApplication")
 				.add("org.springframework.boot", "spring-boot-starter",
-						dependencies.getProperty("spring.boot.version"));
+						dependencies.getProperty("spring-boot.version"));
 	}
 
 	@Override

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java

@@ -48,10 +48,10 @@ public class SpringIntegrationCompilerAutoConfiguration extends CompilerAutoConf
 		dependencies
 				.ifAnyMissingClasses("org.springframework.integration.Message")
 				.add("org.springframework.integration", "spring-integration-core",
-						dependencies.getProperty("spring.integration.version"))
+						dependencies.getProperty("spring-integration.version"))
 				.add("org.springframework.integration",
 						"spring-integration-dsl-groovy-core",
-						dependencies.getProperty("spring.integration.dsl.version"));
+						dependencies.getProperty("spring-integration-dsl.version"));
 		dependencies.ifAnyMissingClasses("groovy.util.XmlParser").add(
 				"org.codehaus.groovy", "groovy-xml",
 				dependencies.getProperty("groovy.version"));

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java

@@ -41,7 +41,7 @@ public class SpringMvcCompilerAutoConfiguration extends CompilerAutoConfiguratio
 		dependencies
 				.ifAnyMissingClasses("org.springframework.web.servlet.mvc.Controller")
 				.add("org.springframework.boot", "spring-boot-starter-web",
-						dependencies.getProperty("spring.boot.version"));
+						dependencies.getProperty("spring-boot.version"));
 
 		dependencies.add("org.codehaus.groovy", "groovy-templates",
 				dependencies.getProperty("groovy.version"));

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java

@@ -40,9 +40,9 @@ public class SpringSecurityCompilerAutoConfiguration extends CompilerAutoConfigu
 				.ifAnyMissingClasses(
 						"org.springframework.security.config.annotation.web.configuration.EnableWebSecurity")
 				.add("org.springframework.security", "spring-security-config",
-						dependencies.getProperty("spring.security.version"))
+						dependencies.getProperty("spring-security.version"))
 				.add("org.springframework.security", "spring-security-web",
-						dependencies.getProperty("spring.security.version"), false);
+						dependencies.getProperty("spring-security.version"), false);
 	}
 
 	@Override

spring-boot-cli/src/main/resources/META-INF/springcli.properties

-spring.boot.version: ${project.version}
-spring.version: ${spring.version}
-spring.batch.version: ${spring.batch.version}
-spring.security.version: ${spring.security.version}
-spring.integration.version: ${spring.integration.version}
-spring.integration.groovydsl.version: ${spring.integration.groovydsl.version}
 groovy.version: ${groovy.version}
 jetty.version: ${jetty.version}
-tomcat.version: ${tomcat.version}
 reactor.version: ${reactor.version}
+spring.version: ${spring.version}
+spring-batch.version: ${spring-batch.version}
+spring-boot.version: ${project.version}
+spring-security.version: ${spring-security.version}
+spring-integration.version: ${spring-integration.version}
+spring-integration-groovydsl.version: ${spring-integration-groovydsl.version}
+tomcat.version: ${tomcat.version}