root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2015-01-14 16:55:45 +00:00
parent 0074e9de9d 376de01636
commit 16cb44f890
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/jar/JarCommand.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2014 the original author or authors. * Copyright 2012-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -308,18 +308,19 @@ public class JarCommand extends OptionParsingCommand {
// We only need to do it at most once // We only need to do it at most once
break; break;
} }
// Remove GrabReolvers because all the dependencies are local now // Disable the addition of a static initializer that calls Grape.addResolver
removeGrabResolver(module.getClasses()); // because all the dependencies are local now
removeGrabResolver(module.getImports()); disableGrabResolvers(module.getClasses());
disableGrabResolvers(module.getImports());
} }
private void removeGrabResolver(List<? extends AnnotatedNode> nodes) { private void disableGrabResolvers(List<? extends AnnotatedNode> nodes) {
for (AnnotatedNode classNode : nodes) { for (AnnotatedNode classNode : nodes) {
List<AnnotationNode> annotations = classNode.getAnnotations(); List<AnnotationNode> annotations = classNode.getAnnotations();
for (AnnotationNode node : new ArrayList<AnnotationNode>(annotations)) { for (AnnotationNode node : new ArrayList<AnnotationNode>(annotations)) {
if (node.getClassNode().getNameWithoutPackage() if (node.getClassNode().getNameWithoutPackage()
.equals("GrabResolver")) { .equals("GrabResolver")) {
annotations.remove(node); node.setMember("initClass", new ConstantExpression(false));
} }
} }
} }