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

Merge pull request #2288 from kdvolder/gh-2287 

* gh-2287:
  Don't fail build on merge failure
This commit is contained in:
Phillip Webb 2015-01-06 15:22:21 -08:00
parent 7c29c96da6 2dfa424246
commit 64217aa6c3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
View File

@ -16,7 +16,6 @@
package org.springframework.boot.configurationprocessor; package org.springframework.boot.configurationprocessor;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Collections; import java.util.Collections;
@ -107,10 +106,6 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
} }
} }
private void logWarning(String msg) {
this.processingEnv.getMessager().printMessage(Kind.WARNING, msg);
}
@Override @Override
public boolean process(Set<? extends TypeElement> annotations, public boolean process(Set<? extends TypeElement> annotations,
RoundEnvironment roundEnv) { RoundEnvironment roundEnv) {
@ -361,9 +356,14 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
inputStream.close(); inputStream.close();
} }
} }
catch (IOException ex) { catch (Exception ex) {
logWarning("Unable to merge additional-spring-configuration-metadata.json");
return metadata; return metadata;
} }
} }
private void logWarning(String msg) {
this.processingEnv.getMessager().printMessage(Kind.WARNING, msg);
}
} }