diff --git a/spring-data-neo4j-aspects/pom.xml b/spring-data-neo4j-aspects/pom.xml index 309322378..10b6655eb 100644 --- a/spring-data-neo4j-aspects/pom.xml +++ b/spring-data-neo4j-aspects/pom.xml @@ -194,24 +194,6 @@ - - - neo4j-public-repository - Neo4J Public Repository - http://m2.neo4j.org - - true - - - - spring-maven-snapshot - - true - - Springframework Maven SNAPSHOT Repository - http://maven.springframework.org/snapshot - - diff --git a/spring-data-neo4j-cross-store/pom.xml b/spring-data-neo4j-cross-store/pom.xml index cc79e05c6..016afd36e 100644 --- a/spring-data-neo4j-cross-store/pom.xml +++ b/spring-data-neo4j-cross-store/pom.xml @@ -197,25 +197,7 @@ test - - - - neo4j-public-repository - Neo4J Public Repository - http://m2.neo4j.org - - true - - - - spring-maven-snapshot - - true - - Springframework Maven SNAPSHOT Repository - http://maven.springframework.org/snapshot - - + diff --git a/spring-data-neo4j-parent/pom.xml b/spring-data-neo4j-parent/pom.xml index 1ef02c008..017399ef0 100644 --- a/spring-data-neo4j-parent/pom.xml +++ b/spring-data-neo4j-parent/pom.xml @@ -123,8 +123,10 @@ 1.2.15 1.8.4 1.6.1 - 3.0.7.RELEASE - 1.2.0.RELEASE + 3.0.7.RELEASE + 4.0.0.RELEASE + [${org.springframework.version.30}, ${org.springframework.version.40}) + 1.2.1.RELEASE 1.6 0.7 1.6.12 @@ -531,6 +533,12 @@ ${log4j.version} test + + org.springframework + spring-test + test + + @@ -756,62 +764,32 @@ - - repository.springsource.maven.bundles.release - SpringSource Maven Repository - http://repository.springsource.com/maven/bundles/release - - - repository.springframework.maven.milestone - Spring Framework Maven Milestone Repository - http://maven.springframework.org/milestone - - - repository.springframework.maven.release - Spring Framework Maven Release Repository - http://maven.springframework.org/release + spring-plugins + http://repo.springsource.org/plugins-release + + spring-snapshots + http://repo.springsource.org/libs-snapshot + tinkerpop-repository - TinkerPop Maven2 Repository http://tinkerpop.com/maven2 jboss-repository - JBoss Public Repository http://repository.jboss.org/nexus/content/groups/public-jboss - - - repository.springframework.maven.release - Spring Framework Maven Release Repository - http://maven.springframework.org/release - - - repository.springframework.maven.milestone - Spring Framework Maven Milestone Repository - http://maven.springframework.org/milestone - - - repository.springframework.maven.snapshot - Spring Framework Maven Snapshot Repository - http://maven.springframework.org/snapshot - - - neo4j-public-snapshot-repository - Neo4J Public Snapshot Repository - http://m2.neo4j.org/snapshots - - true - neo4j-public-release-repository - Neo4J Public Release Repository http://m2.neo4j.org/releases + + + neo4j-public-snapshot-repository + http://m2.neo4j.org/snapshots - + diff --git a/spring-data-neo4j-rest/pom.xml b/spring-data-neo4j-rest/pom.xml index 515b2a801..42ef4ad6d 100644 --- a/spring-data-neo4j-rest/pom.xml +++ b/spring-data-neo4j-rest/pom.xml @@ -18,12 +18,6 @@ 1.4 - - - Sun - http://download.java.net/maven/2 - - diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml index 913e88ea7..759835b36 100644 --- a/spring-data-neo4j/pom.xml +++ b/spring-data-neo4j/pom.xml @@ -251,24 +251,6 @@ - - - neo4j-public-repository - Neo4J Public Repository - http://m2.neo4j.org - - true - - - - spring-maven-snapshot - - true - - Springframework Maven SNAPSHOT Repository - http://maven.springframework.org/snapshot - - diff --git a/spring-data-neo4j/src/test/java/org/springframework/test/context/CleanContextCacheTestExecutionListener.java b/spring-data-neo4j/src/test/java/org/springframework/test/context/CleanContextCacheTestExecutionListener.java index 55819c354..182aab9bc 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/test/context/CleanContextCacheTestExecutionListener.java +++ b/spring-data-neo4j/src/test/java/org/springframework/test/context/CleanContextCacheTestExecutionListener.java @@ -16,26 +16,28 @@ package org.springframework.test.context; -import org.springframework.context.ApplicationContext; -import org.springframework.test.context.support.AbstractTestExecutionListener; - import java.lang.reflect.Field; import java.util.Map; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.support.AbstractTestExecutionListener; + public class CleanContextCacheTestExecutionListener extends AbstractTestExecutionListener { - @Override - public void afterTestClass(TestContext testContext) throws Exception { - Field cacheField = TestContext.class.getDeclaredField("contextCache"); - cacheField.setAccessible(true); - ContextCache cache = (ContextCache) cacheField.get(testContext); - Field cacheMapField = ContextCache.class.getDeclaredField("contextKeyToContextMap"); - cacheMapField.setAccessible(true); - @SuppressWarnings("unchecked") Map cacheMap = (Map) cacheMapField.get(cache); - String[] keys = new String[cacheMap.size()]; - cacheMap.keySet().toArray(keys); - for (String key : keys) { - cache.setDirty(key); - } - } + @Override + public void afterTestClass(TestContext testContext) throws Exception { + + Field cacheField = TestContext.class.getDeclaredField("contextCache"); + cacheField.setAccessible(true); + ContextCache cache = (ContextCache) cacheField.get(testContext); + Field cacheMapField = ContextCache.class.getDeclaredField("contextMap"); + cacheMapField.setAccessible(true); + @SuppressWarnings("unchecked") + Map cacheMap = (Map) cacheMapField + .get(cache); + + for (MergedContextConfiguration key : cacheMap.keySet()) { + cache.setDirty(key); + } + } }