Merge branch '2.1.x' into 2.2.x

Closes gh-20501
This commit is contained in:
Andy Wilkinson
2020-03-11 13:04:44 +00:00
4 changed files with 44 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -143,7 +143,6 @@ public class DependencyCustomizer {
if (DependencyCustomizer.this.loader.getResource(path) == null) {
return false;
}
return true;
}
catch (Exception ex) {
// swallow exception and continue