From 20e977331f54dbf39b0472efda165405779aa8ea Mon Sep 17 00:00:00 2001 From: Michael Hunger Date: Tue, 18 Sep 2012 09:23:56 +0200 Subject: [PATCH] DATAGRAPH-296 version upgrades for SDN 2.1.RC4 release --- .../data/neo4j/aspects/support/IndexTest.java | 7 +++++++ spring-data-neo4j-parent/pom.xml | 6 +++--- spring-data-neo4j-rest/pom.xml | 10 +++++----- .../data/neo4j/rest/SpringRestGraphDatabase.java | 4 ++++ .../data/neo4j/rest/integration/RestIndexTest.java | 3 ++- spring-data-neo4j/pom.xml | 2 +- 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java index 7abdf0766..a421097ef 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java @@ -34,8 +34,13 @@ import org.springframework.data.neo4j.aspects.Person; import org.springframework.data.neo4j.aspects.SubGroup; import org.springframework.data.neo4j.repository.GraphRepository; import org.springframework.data.neo4j.support.index.IndexType; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; +import org.springframework.test.context.transaction.TransactionalTestExecutionListener; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; @@ -50,6 +55,8 @@ import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) +//@TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class IndexTest extends EntityTestBase { private static final String NAME = "name"; diff --git a/spring-data-neo4j-parent/pom.xml b/spring-data-neo4j-parent/pom.xml index c7047c8eb..04f95b51b 100644 --- a/spring-data-neo4j-parent/pom.xml +++ b/spring-data-neo4j-parent/pom.xml @@ -125,8 +125,8 @@ 3.0.7.RELEASE 3.1.2.RELEASE 1.4.0.RC1 - 1.8-SNAPSHOT - 0.9.M02 + 1.8.RC1 + 0.9.RC1 1.6.12 1.2 1.5 @@ -464,7 +464,7 @@ org.neo4j neo4j-cypher-dsl - 1.8.M07 + 1.8.RC1 diff --git a/spring-data-neo4j-rest/pom.xml b/spring-data-neo4j-rest/pom.xml index 9dd95f2a1..5525f2d7f 100644 --- a/spring-data-neo4j-rest/pom.xml +++ b/spring-data-neo4j-rest/pom.xml @@ -38,7 +38,7 @@ org.neo4j neo4j-rest-graphdb - 1.8.RC1 + 1.8.RC2 org.neo4j @@ -163,12 +163,12 @@ org.codehaus.jackson jackson-jaxrs - 1.8.5 + 1.9.7 org.codehaus.jackson jackson-mapper-asl - 1.8.5 + 1.9.7 com.sun.jersey @@ -233,7 +233,7 @@ org.springframework.data spring-data-neo4j - 2.1.0.BUILD-SNAPSHOT + ${project.version} test test-jar @@ -241,7 +241,7 @@ org.springframework.data spring-data-neo4j-aspects - 2.1.0.BUILD-SNAPSHOT + ${project.version} test test-jar diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/SpringRestGraphDatabase.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/SpringRestGraphDatabase.java index 54360dc39..3f419425d 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/SpringRestGraphDatabase.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/SpringRestGraphDatabase.java @@ -27,6 +27,7 @@ import org.neo4j.rest.graphdb.query.RestCypherQueryEngine; import org.neo4j.rest.graphdb.query.RestGremlinQueryEngine; import org.neo4j.rest.graphdb.transaction.NullTransaction; import org.neo4j.rest.graphdb.transaction.NullTransactionManager; +import org.neo4j.rest.graphdb.util.Config; import org.springframework.core.convert.ConversionService; import org.springframework.data.neo4j.annotation.QueryType; import org.springframework.data.neo4j.conversion.DefaultConverter; @@ -40,6 +41,9 @@ import javax.transaction.TransactionManager; import java.util.Map; public class SpringRestGraphDatabase extends org.neo4j.rest.graphdb.RestGraphDatabase implements GraphDatabase{ + static { + System.setProperty(Config.CONFIG_BATCH_TRANSACTION,"false"); + } private ConversionService conversionService; private ResultConverter resultConverter; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java index ca1735dcc..a7f8cdde0 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java @@ -22,6 +22,7 @@ import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.springframework.data.neo4j.aspects.support.IndexTest; import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -36,7 +37,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) -@TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) public class RestIndexTest extends IndexTest { @BeforeClass diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml index aabd0e5db..957ceef27 100644 --- a/spring-data-neo4j/pom.xml +++ b/spring-data-neo4j/pom.xml @@ -14,7 +14,7 @@ ]]> http://www.springsource.org/spring-data/neo4j - 2.5.0 + 2.7.3