diff --git a/.travis.yml b/.travis.yml index b7efdba04..ed8921074 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ env: - PROFILE=ci - PROFILE=spring43 - PROFILE=spring43-next - - PROFILE=spring5 - - PROFILE=spring5-next + - PROFILE=spring5,hibernate-43 + - PROFILE=spring5-next,hibernate-43 - PROFILE=hibernate-41 - PROFILE=hibernate-42 - PROFILE=hibernate-42-next diff --git a/pom.xml b/pom.xml index cf9bbf6ee..b4ac786a1 100644 --- a/pom.xml +++ b/pom.xml @@ -597,8 +597,8 @@ - spring-plugins-release - https://repo.spring.io/plugins-release + spring-plugins-snapshot + https://repo.spring.io/plugins-snapshot 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 b5ef95bd2..c4d008a55 100644 --- a/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java @@ -18,6 +18,7 @@ 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; @@ -138,15 +139,19 @@ public class ClasspathScanningPersistenceUnitPostProcessorUnitTests { return resources; } + /* + * (non-Javadoc) + * @see org.springframework.core.io.support.PathMatchingResourcePatternResolver#doFindPathMatchingJarResources(org.springframework.core.io.Resource, java.net.URL, java.lang.String) + */ @Override - protected Set doFindPathMatchingJarResources(Resource rootDirResource, String subPattern) - throws IOException { + protected Set doFindPathMatchingJarResources(Resource rootDirResource, URL rootDirURL, + String subPattern) throws IOException { - if (fileInJarUrl.equals(rootDirResource.getURI().toString())) { + if (fileInJarUrl.equals(rootDirURL.toString())) { return Collections.singleton(rootDirResource); } - return super.doFindPathMatchingJarResources(rootDirResource, subPattern); + return super.doFindPathMatchingJarResources(rootDirResource, rootDirURL, subPattern); } };