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

DATAGRAPH-204 - Improved Maven repository configuration.

Browse Source 
Consolidated repository declarations to be present in parent project only. Changed Spring dependency to version range of [3.0.7, 4.0.0) to align to other Spring Data modules. Updated implementation of custom test execution listener to be suitable for Spring versions >= 3.0.0.
This commit is contained in:
Oliver Gierke
2012-02-28 19:29:05 +01:00
parent 66bc7763c7
commit 807ec7b3eb
6 changed files with 41 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-data-neo4j-aspects/pom.xml
View File

@@ -194,24 +194,6 @@
</dependency>
</dependencies>
<repositories>
<repository>
<id>neo4j-public-repository</id>
<name>Neo4J Public Repository</name>
<url>http://m2.neo4j.org</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>spring-maven-snapshot</id>
<snapshots>
<enabled>true</enabled>
</snapshots>
<name>Springframework Maven SNAPSHOT Repository</name>
<url>http://maven.springframework.org/snapshot</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>

20
spring-data-neo4j-cross-store/pom.xml
View File

@@ -197,25 +197,7 @@
<scope>test</scope>
</dependency>
</dependencies>
<repositories>
<repository>
<id>neo4j-public-repository</id>
<name>Neo4J Public Repository</name>
<url>http://m2.neo4j.org</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>spring-maven-snapshot</id>
<snapshots>
<enabled>true</enabled>
</snapshots>
<name>Springframework Maven SNAPSHOT Repository</name>
<url>http://maven.springframework.org/snapshot</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>

64
spring-data-neo4j-parent/pom.xml
View File

@@ -123,8 +123,10 @@
<log4j.version>1.2.15</log4j.version>
<org.mockito.version>1.8.4</org.mockito.version>
<org.slf4j.version>1.6.1</org.slf4j.version>
<org.springframework.version>3.0.7.RELEASE</org.springframework.version>
<data.commons.version>1.2.0.RELEASE</data.commons.version>
<org.springframework.version.30>3.0.7.RELEASE</org.springframework.version.30>
<org.springframework.version.40>4.0.0.RELEASE</org.springframework.version.40>
<org.springframework.version>[${org.springframework.version.30}, ${org.springframework.version.40})</org.springframework.version>
<data.commons.version>1.2.1.RELEASE</data.commons.version>
<neo4j.version>1.6</neo4j.version>
<neo4j.spatial.version>0.7</neo4j.spatial.version>
<aspectj.version>1.6.12</aspectj.version>
@@ -531,6 +533,12 @@
<version>${log4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
@@ -756,62 +764,32 @@
</build>
<pluginRepositories>
<pluginRepository>
<!-- necessary for utils -->
<id>repository.springsource.maven.bundles.release</id>
<name>SpringSource Maven Repository</name>
<url>http://repository.springsource.com/maven/bundles/release</url>
</pluginRepository>
<pluginRepository>
<id>repository.springframework.maven.milestone</id>
<name>Spring Framework Maven Milestone Repository</name>
<url>http://maven.springframework.org/milestone</url>
</pluginRepository>
<pluginRepository>
<id>repository.springframework.maven.release</id>
<name>Spring Framework Maven Release Repository</name>
<url>http://maven.springframework.org/release</url>
<id>spring-plugins</id>
<url>http://repo.springsource.org/plugins-release</url>
</pluginRepository>
</pluginRepositories>
<repositories>
<repository>
<id>spring-snapshots</id>
<url>http://repo.springsource.org/libs-snapshot</url>
</repository>
<repository>
<id>tinkerpop-repository</id>
<name>TinkerPop Maven2 Repository</name>
<url>http://tinkerpop.com/maven2</url>
</repository>
<repository>
<id>jboss-repository</id>
<name>JBoss Public Repository</name>
<url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
</repository>
<repository>
<id>repository.springframework.maven.release</id>
<name>Spring Framework Maven Release Repository</name>
<url>http://maven.springframework.org/release</url>
</repository>
<repository>
<id>repository.springframework.maven.milestone</id>
<name>Spring Framework Maven Milestone Repository</name>
<url>http://maven.springframework.org/milestone</url>
</repository>
<repository>
<id>repository.springframework.maven.snapshot</id>
<name>Spring Framework Maven Snapshot Repository</name>
<url>http://maven.springframework.org/snapshot</url>
</repository>
<repository>
<id>neo4j-public-snapshot-repository</id>
<name>Neo4J Public Snapshot Repository</name>
<url>http://m2.neo4j.org/snapshots</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>neo4j-public-release-repository</id>
<name>Neo4J Public Release Repository</name>
<url>http://m2.neo4j.org/releases</url>
</repository>
<repository>
<id>neo4j-public-snapshot-repository</id>
<url>http://m2.neo4j.org/snapshots</url>
</repository>
</repositories>
<reporting>
<plugins>

6
spring-data-neo4j-rest/pom.xml
View File

@@ -18,12 +18,6 @@
<jersey.version>1.4</jersey.version>
</properties>
<repositories>
<repository>
<id>Sun</id>
<url>http://download.java.net/maven/2</url>
</repository>
</repositories>
<dependencies>
<dependency>

18
spring-data-neo4j/pom.xml
View File

@@ -251,24 +251,6 @@
</dependency>
</dependencies>
<repositories>
<repository>
<id>neo4j-public-repository</id>
<name>Neo4J Public Repository</name>
<url>http://m2.neo4j.org</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>spring-maven-snapshot</id>
<snapshots>
<enabled>true</enabled>
</snapshots>
<name>Springframework Maven SNAPSHOT Repository</name>
<url>http://maven.springframework.org/snapshot</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>

36
spring-data-neo4j/src/test/java/org/springframework/test/context/CleanContextCacheTestExecutionListener.java
View File

@@ -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<String, ApplicationContext> cacheMap = (Map<String, ApplicationContext>) 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<MergedContextConfiguration, ApplicationContext> cacheMap = (Map<MergedContextConfiguration, ApplicationContext>) cacheMapField
.get(cache);
for (MergedContextConfiguration key : cacheMap.keySet()) {
cache.setDirty(key);
}
}
}