Commit d6621e62 authored by Nathan Voxland's avatar Nathan Voxland Committed by Dave Syer

Updated liquibase dependency to 3.2.

Fixes gh-1382
parent 576f5cfb
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<json-path.version>0.9.1</json-path.version> <json-path.version>0.9.1</json-path.version>
<jstl.version>1.2</jstl.version> <jstl.version>1.2</jstl.version>
<junit.version>4.11</junit.version> <junit.version>4.11</junit.version>
<liquibase.version>3.0.8</liquibase.version> <liquibase.version>3.2.2</liquibase.version>
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
<log4j2.version>2.0.2</log4j2.version> <log4j2.version>2.0.2</log4j2.version>
<logback.version>1.1.2</logback.version> <logback.version>1.1.2</logback.version>
......
...@@ -47,25 +47,20 @@ public class SpringPackageScanClassResolver extends DefaultPackageScanClassResol ...@@ -47,25 +47,20 @@ public class SpringPackageScanClassResolver extends DefaultPackageScanClassResol
this.logger = logger; this.logger = logger;
} }
@Override @Override
protected void find(PackageScanFilter test, String packageName, ClassLoader loader, protected void findAllClasses(String packageName, ClassLoader loader) {
Set<Class<?>> classes) { MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(
MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory( loader);
loader); try {
try { Resource[] resources = scan(loader, packageName);
Resource[] resources = scan(loader, packageName); for (Resource resource : resources) {
for (Resource resource : resources) { addFoundClass(loadClass(loader, metadataReaderFactory, resource));
Class<?> candidate = loadClass(loader, metadataReaderFactory, resource); }
if (candidate != null && test.matches(candidate)) { }
classes.add(candidate); catch (IOException ex) {
} throw new IllegalStateException(ex);
} }
} }
catch (IOException ex) {
throw new IllegalStateException(ex);
}
}
private Resource[] scan(ClassLoader loader, String packageName) throws IOException { private Resource[] scan(ClassLoader loader, String packageName) throws IOException {
ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(loader); ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(loader);
String pattern = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX String pattern = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment