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

Revert "Updated liquibase dependency to 3.2." 

This reverts commit d6621e62ad. I think
the test failure might be a bug in Liquibase:
https://liquibase.jira.com/browse/CORE-2094
This commit is contained in:
Dave Syer 2014-10-27 14:14:25 +00:00
parent d6621e62ad
commit 4cd3bf18e0
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-dependencies/pom.xml
View File

@ -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.2.2</liquibase.version> <liquibase.version>3.0.8</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>

33
spring-boot/src/main/java/org/springframework/boot/liquibase/SpringPackageScanClassResolver.java
View File

@ -47,20 +47,25 @@ public class SpringPackageScanClassResolver extends DefaultPackageScanClassResol
this.logger = logger; this.logger = logger;
} }
@Override @Override
protected void findAllClasses(String packageName, ClassLoader loader) { protected void find(PackageScanFilter test, String packageName, ClassLoader loader,
MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory( Set<Class<?>> classes) {
loader); MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(
try { loader);
Resource[] resources = scan(loader, packageName); try {
for (Resource resource : resources) { Resource[] resources = scan(loader, packageName);
addFoundClass(loadClass(loader, metadataReaderFactory, resource)); for (Resource resource : resources) {
} Class<?> candidate = loadClass(loader, metadataReaderFactory, resource);
} if (candidate != null && test.matches(candidate)) {
catch (IOException ex) { classes.add(candidate);
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