diff --git a/.travis.yml b/.travis.yml index 32f71fa12..d6e91b233 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java b/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java index c4d008a55..761167bb7 100644 --- a/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java @@ -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 doFindPathMatchingJarResources(Resource rootDirResource, URL rootDirURL, - String subPattern) throws IOException { + protected Set 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); } };