Upgrade various dependency versions

pom.xml

@@ -17,11 +17,11 @@
 		<spring.version>4.0.0.BUILD-SNAPSHOT</spring.version>
 		<spring.security.version>3.1.3.RELEASE</spring.security.version>
 		<spring.security.javaconfig.version>1.0.0.CI-SNAPSHOT</spring.security.javaconfig.version>
-		<spring.integration.version>2.2.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.2.4.RELEASE</spring.integration.version>
 		<spring.batch.version>2.2.0.RELEASE</spring.batch.version>
-		<tomcat.version>7.0.39</tomcat.version>
+		<tomcat.version>7.0.42</tomcat.version>
 		<jetty.version>8.1.9.v20130131</jetty.version>
-		<aspectj.version>1.7.2</aspectj.version>
+		<aspectj.version>1.7.3</aspectj.version>
 	</properties>
 	<scm>
 		<url>http://github.com/SpringSource/spring-bootstrap</url>
@@ -58,7 +58,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.0</version>
+					<version>3.1</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-deploy-plugin</artifactId>
@@ -66,7 +66,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>2.6</version>
+					<version>2.8</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-eclipse-plugin</artifactId>
@@ -74,7 +74,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>2.13</version>
+					<version>2.15</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-install-plugin</artifactId>
@@ -102,7 +102,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-shade-plugin</artifactId>
-					<version>2.0</version>
+					<version>2.1</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
@@ -114,7 +114,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.13</version>
+					<version>2.15</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-war-plugin</artifactId>
@@ -210,22 +210,22 @@
 			<dependency>
 				<groupId>ch.qos.logback</groupId>
 				<artifactId>logback-classic</artifactId>
-				<version>1.0.10</version>
+				<version>1.0.13</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-databind</artifactId>
-				<version>2.2.0</version>
+				<version>2.2.2</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-core</artifactId>
-				<version>2.2.0</version>
+				<version>2.2.2</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.datatype</groupId>
 				<artifactId>jackson-datatype-joda</artifactId>
-				<version>2.2.0</version>
+				<version>2.2.2</version>
 			</dependency>
 			<dependency>
 				<groupId>commons-dbcp</groupId>
@@ -260,7 +260,7 @@
 			<dependency>
 				<groupId>net.sf.jopt-simple</groupId>
 				<artifactId>jopt-simple</artifactId>
-				<version>4.4</version>
+				<version>4.5</version>
 			</dependency>
 			<dependency>
                 <groupId>nz.net.ultraq.thymeleaf</groupId>
@@ -305,7 +305,7 @@
 			<dependency>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>1.6</version>
+				<version>2.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven.plugin-tools</groupId>
@@ -345,17 +345,17 @@
 			<dependency>
 				<groupId>org.codehaus.groovy</groupId>
 				<artifactId>groovy</artifactId>
-				<version>2.1.3</version>
+				<version>2.1.6</version>
 			</dependency>
 			<dependency>
 				<groupId>org.codehaus.groovy</groupId>
 				<artifactId>groovy-templates</artifactId>
-				<version>2.1.3</version>
+				<version>2.1.6</version>
 			</dependency>
 			<dependency>
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-archiver</artifactId>
-				<version>2.2</version>
+				<version>2.4.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.codehaus.plexus</groupId>
@@ -396,7 +396,7 @@
 			<dependency>
 				<groupId>com.h2database</groupId>
 				<artifactId>h2</artifactId>
-				<version>1.3.171</version>
+				<version>1.3.172</version>
 			</dependency>
 			<dependency>
 				<groupId>org.hibernate</groupId>
@@ -426,7 +426,7 @@
 			<dependency>
 				<groupId>org.ow2.asm</groupId>
 				<artifactId>asm</artifactId>
-				<version>4.0</version>
+				<version>4.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
@@ -538,7 +538,7 @@
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-jpa</artifactId>
-				<version>1.3.0.RELEASE</version>
+				<version>1.3.2.RELEASE</version>
 				<exclusions>
 					<exclusion>
 						<groupId>org.springframework</groupId>

spring-cli/src/main/java/org/springframework/cli/command/CleanCommand.java

@@ -79,12 +79,14 @@ public class CleanCommand extends OptionParsingCommand {
 			if (root == null || !root.exists()) {
 				return;
 			}
-			ArrayList<String> specs = new ArrayList<String>(options.nonOptionArguments());
+			ArrayList<Object> specs = new ArrayList<Object>(options.nonOptionArguments());
 			if (!specs.contains("org.springframework.zero") && layout == Layout.IVY) {
 				specs.add(0, "org.springframework.zero");
 			}
-			for (String spec : specs) {
-				clean(options, root, layout, spec);
+			for (Object spec : specs) {
+				if (spec instanceof String) {
+					clean(options, root, layout, (String) spec);
+				}
 			}
 		}
 

spring-cli/src/main/java/org/springframework/cli/command/RunCommand.java

@@ -90,9 +90,9 @@ public class RunCommand extends OptionParsingCommand {
 
 		@Override
 		protected void run(OptionSet options) throws Exception {
-			List<String> nonOptionArguments = options.nonOptionArguments();
+			List<?> nonOptionArguments = options.nonOptionArguments();
 			File[] files = getFileArguments(nonOptionArguments);
-			List<String> args = nonOptionArguments.subList(files.length,
+			List<?> args = nonOptionArguments.subList(files.length,
 					nonOptionArguments.size());
 
 			if (options.has(this.editOption)) {
@@ -109,9 +109,11 @@ public class RunCommand extends OptionParsingCommand {
 			this.runner.compileAndRun();
 		}
 
-		private File[] getFileArguments(List<String> nonOptionArguments) {
+		private File[] getFileArguments(List<?> nonOptionArguments) {
 			List<File> files = new ArrayList<File>();
-			for (String filename : nonOptionArguments) {
+			for (Object option : nonOptionArguments) {
+				if (option instanceof String) {
+					String filename = (String) option;
 					if ("--".equals(filename)) {
 						break;
 					}
@@ -124,6 +126,7 @@ public class RunCommand extends OptionParsingCommand {
 						}
 					}
 				}
+			}
 			if (files.size() == 0) {
 				throw new RuntimeException("Please specify a file to run");
 			}

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

@@ -52,7 +52,7 @@ public class SpringIntegrationCompilerAutoConfiguration extends CompilerAutoConf
 				.add("org.springframework.integration",
 						"spring-integration-dsl-groovy-core", "1.0.0.M1");
 		dependencies.ifAnyMissingClasses("groovy.util.XmlParser").add(
-				"org.codehaus.groovy", "groovy-xml", "2.1.3");
+				"org.codehaus.groovy", "groovy-xml", "2.1.6");
 	}
 
 	@Override

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

@@ -40,7 +40,7 @@ public class SpringMvcCompilerAutoConfiguration extends CompilerAutoConfiguratio
 				"org.eclipse.jetty.server.Server").add("org.eclipse.jetty",
 				"jetty-webapp", "8.1.10.v20130312");
 
-		dependencies.add("org.codehaus.groovy", "groovy-templates", "2.1.3");
+		dependencies.add("org.codehaus.groovy", "groovy-templates", "2.1.6");
 		// FIXME restore Tomcat when we can get reload to work
 		// dependencies.ifMissingClasses("org.apache.catalina.startup.Tomcat",
 		// "org.eclipse.jetty.server.Server")