From e51510a5b09d10b1376570353862638afd03df12 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 7 Dec 2016 17:16:10 +0100 Subject: [PATCH] DATAJPA-1022 - Move back to PathMatchingResourcePatternResolver signature of Spring 4.3. This reverts commit 911b9f70cde1da1acf4f20a8b8fb413d7be98157 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. --- .travis.yml | 2 -- ...ScanningPersistenceUnitPostProcessorUnitTests.java | 11 +++++------ 2 files changed, 5 insertions(+), 8 deletions(-) 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); } };