Author: davsclaus
Date: Sat Oct 20 08:09:50 2012
New Revision: 1400386
URL: http://svn.apache.org/viewvc?rev=1400386&view=rev
Log:
Upgraded neo4j and spring security dependencies
Modified:
camel/trunk/components/camel-neo4j/ (props changed)
camel/trunk/components/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateRelationshipIntegrationTest.java
camel/trunk/parent/pom.xml
Propchange: camel/trunk/components/camel-neo4j/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Oct 20 08:09:50 2012
@@ -6,3 +6,4 @@ target
*.iml
*.ipr
*.iws
+*.idea
Modified:
camel/trunk/components/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateRelationshipIntegrationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateRelationshipIntegrationTest.java?rev=1400386&r1=1400385&r2=1400386&view=diff
==============================================================================
---
camel/trunk/components/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateRelationshipIntegrationTest.java
(original)
+++
camel/trunk/components/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateRelationshipIntegrationTest.java
Sat Oct 20 08:09:50 2012
@@ -28,6 +28,7 @@ import org.junit.Ignore;
import org.junit.Test;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Relationship;
+import org.springframework.data.neo4j.core.GraphDatabase;
import org.springframework.data.neo4j.rest.SpringRestGraphDatabase;
import org.springframework.data.neo4j.support.Neo4jTemplate;
@@ -39,7 +40,7 @@ public class RestNeo4jProducerCreateRela
private final String neo4jEndpoint =
"neo4j:http://localhost:7474/db/data/";;
- private final Neo4jTemplate neo = new Neo4jTemplate(new
SpringRestGraphDatabase("http://localhost:7474/db/data/";));
+ private final Neo4jTemplate neo = new Neo4jTemplate((GraphDatabase) new
SpringRestGraphDatabase("http://localhost:7474/db/data/";));
@EndpointInject(uri = "mock:end")
private MockEndpoint end;
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1400386&r1=1400385&r2=1400386&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Oct 20 08:09:50 2012
@@ -300,10 +300,10 @@
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<spring-integration-version>2.1.4.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
- <spring-neo4j-version>2.0.2.RELEASE</spring-neo4j-version>
+ <spring-neo4j-version>2.1.0.RELEASE</spring-neo4j-version>
<spring-version>3.0.7.RELEASE</spring-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
- <spring-security-version>3.1.2.RELEASE</spring-security-version>
+ <spring-security-version>3.1.3.RELEASE</spring-security-version>
<!-- spring WS 2.0.3 is the last release to support Spring 3.0.x -->
<spring-ws-version>2.0.3.RELEASE</spring-ws-version>
<spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!--
FIXME cmueller: not in sync! -->
