Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade various dependency versions

Browse Source
This commit is contained in:
Phillip Webb
2013-07-10 15:58:23 -07:00
parent 7932456c5f
commit d8d8b7643b
5 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
}
}

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

@@ -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,18 +109,21 @@ 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) {
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);
}
}
}
}

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

@@ -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

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

@@ -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")