From d8d8b7643b6408495efd7a526650a5c604873681 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 10 Jul 2013 15:58:23 -0700 Subject: [PATCH] Upgrade various dependency versions --- pom.xml | 40 +++++++++---------- .../cli/command/CleanCommand.java | 8 ++-- .../cli/command/RunCommand.java | 29 ++++++++------ ...gIntegrationCompilerAutoConfiguration.java | 2 +- .../SpringMvcCompilerAutoConfiguration.java | 2 +- 5 files changed, 43 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index 3ae4b02caa..a0b2fafc06 100644 --- a/pom.xml +++ b/pom.xml @@ -17,11 +17,11 @@ 4.0.0.BUILD-SNAPSHOT 3.1.3.RELEASE 1.0.0.CI-SNAPSHOT - 2.2.3.RELEASE + 2.2.4.RELEASE 2.2.0.RELEASE - 7.0.39 + 7.0.42 8.1.9.v20130131 - 1.7.2 + 1.7.3 http://github.com/SpringSource/spring-bootstrap @@ -58,7 +58,7 @@ maven-compiler-plugin - 3.0 + 3.1 maven-deploy-plugin @@ -66,7 +66,7 @@ maven-dependency-plugin - 2.6 + 2.8 maven-eclipse-plugin @@ -74,7 +74,7 @@ maven-failsafe-plugin - 2.13 + 2.15 maven-install-plugin @@ -102,7 +102,7 @@ maven-shade-plugin - 2.0 + 2.1 maven-site-plugin @@ -114,7 +114,7 @@ maven-surefire-plugin - 2.13 + 2.15 maven-war-plugin @@ -210,22 +210,22 @@ ch.qos.logback logback-classic - 1.0.10 + 1.0.13 com.fasterxml.jackson.core jackson-databind - 2.2.0 + 2.2.2 com.fasterxml.jackson.core jackson-core - 2.2.0 + 2.2.2 com.fasterxml.jackson.datatype jackson-datatype-joda - 2.2.0 + 2.2.2 commons-dbcp @@ -260,7 +260,7 @@ net.sf.jopt-simple jopt-simple - 4.4 + 4.5 nz.net.ultraq.thymeleaf @@ -305,7 +305,7 @@ org.apache.maven.plugins maven-shade-plugin - 1.6 + 2.1 org.apache.maven.plugin-tools @@ -345,17 +345,17 @@ org.codehaus.groovy groovy - 2.1.3 + 2.1.6 org.codehaus.groovy groovy-templates - 2.1.3 + 2.1.6 org.codehaus.plexus plexus-archiver - 2.2 + 2.4.1 org.codehaus.plexus @@ -396,7 +396,7 @@ com.h2database h2 - 1.3.171 + 1.3.172 org.hibernate @@ -426,7 +426,7 @@ org.ow2.asm asm - 4.0 + 4.1 org.slf4j @@ -538,7 +538,7 @@ org.springframework.data spring-data-jpa - 1.3.0.RELEASE + 1.3.2.RELEASE org.springframework diff --git a/spring-cli/src/main/java/org/springframework/cli/command/CleanCommand.java b/spring-cli/src/main/java/org/springframework/cli/command/CleanCommand.java index 7cf9d517f2..cfcf859d10 100644 --- a/spring-cli/src/main/java/org/springframework/cli/command/CleanCommand.java +++ b/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 specs = new ArrayList(options.nonOptionArguments()); + ArrayList specs = new ArrayList(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); + } } } diff --git a/spring-cli/src/main/java/org/springframework/cli/command/RunCommand.java b/spring-cli/src/main/java/org/springframework/cli/command/RunCommand.java index c05d59461a..4947a200b6 100644 --- a/spring-cli/src/main/java/org/springframework/cli/command/RunCommand.java +++ b/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 nonOptionArguments = options.nonOptionArguments(); + List nonOptionArguments = options.nonOptionArguments(); File[] files = getFileArguments(nonOptionArguments); - List args = nonOptionArguments.subList(files.length, + List args = nonOptionArguments.subList(files.length, nonOptionArguments.size()); if (options.has(this.editOption)) { @@ -109,18 +109,21 @@ public class RunCommand extends OptionParsingCommand { this.runner.compileAndRun(); } - private File[] getFileArguments(List nonOptionArguments) { + private File[] getFileArguments(List nonOptionArguments) { List files = new ArrayList(); - for (String filename : nonOptionArguments) { - if ("--".equals(filename)) { - break; - } - // TODO: add support for strict Java compilation - // TODO: add support for recursive search in directory - if (filename.endsWith(".groovy") || filename.endsWith(".java")) { - File file = new File(filename); - if (file.isFile() && file.canRead()) { - files.add(file); + for (Object option : nonOptionArguments) { + if (option instanceof String) { + String filename = (String) option; + if ("--".equals(filename)) { + break; + } + // TODO: add support for strict Java compilation + // TODO: add support for recursive search in directory + if (filename.endsWith(".groovy") || filename.endsWith(".java")) { + File file = new File(filename); + if (file.isFile() && file.canRead()) { + files.add(file); + } } } } diff --git a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java index d621989e66..10ffec1bda 100644 --- a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java +++ b/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 diff --git a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java index 63dfb9e583..fc144bd2a6 100644 --- a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java +++ b/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")