Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJPA-1022 - Move back to PathMatchingResourcePatternResolver signature of Spring 4.3.

Browse Source 
This reverts commit 911b9f70cd as the change broke compatibility with Spring 4.2, the version of Spring the Hopper maintenance branch runs on.

Also disabling Spring 5 related integration tests for Travis as we now run an incompatible implementation of PathMatchingResourcePatternResolver.

Related ticket: DATAJPA-1021.
This commit is contained in:
Oliver Gierke
2016-12-07 17:16:10 +01:00
parent 911b9f70cd
commit e51510a5b0
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -9,8 +9,6 @@ env:
- PROFILE=spring42-next
- PROFILE=spring43
- PROFILE=spring43-next
- PROFILE=spring5,hibernate-43
- PROFILE=spring5-next,hibernate-43
- PROFILE=hibernate-41
- PROFILE=hibernate-42
- PROFILE=hibernate-42-next

11
src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java
View File

@@ -18,7 +18,6 @@ package org.springframework.data.jpa.support;
import static org.mockito.Mockito.*;
import java.io.IOException;
import java.net.URL;
import java.util.Arrays;
import java.util.Collections;
import java.util.Set;
@@ -141,17 +140,17 @@ public class ClasspathScanningPersistenceUnitPostProcessorUnitTests {
/*
* (non-Javadoc)
* @see org.springframework.core.io.support.PathMatchingResourcePatternResolver#doFindPathMatchingJarResources(org.springframework.core.io.Resource, java.net.URL, java.lang.String)
* @see org.springframework.core.io.support.PathMatchingResourcePatternResolver#doFindPathMatchingJarResources(org.springframework.core.io.Resource, java.lang.String)
*/
@Override
protected Set<Resource> doFindPathMatchingJarResources(Resource rootDirResource, URL rootDirURL,
String subPattern) throws IOException {
protected Set<Resource> doFindPathMatchingJarResources(Resource rootDirResource, String subPattern)
throws IOException {
if (fileInJarUrl.equals(rootDirURL.toString())) {
if (fileInJarUrl.equals(rootDirResource.getURI().toString())) {
return Collections.singleton(rootDirResource);
}
return super.doFindPathMatchingJarResources(rootDirResource, rootDirURL, subPattern);
return super.doFindPathMatchingJarResources(rootDirResource, subPattern);
}
};