From 60fdb927570e76d0ff4e97670e8c629945c214f5 Mon Sep 17 00:00:00 2001
From: Michael Hunger <github@jexp.de>
Date: Mon, 13 Jun 2011 01:08:10 +0200
Subject: [PATCH] version and dependency updates

---
 spring-data-graph-core/pom.xml   |  2 +-
 spring-data-graph-parent/pom.xml |  7 +++--
 spring-data-neo4j-rest/pom.xml   | 46 +++++++++++++++++++++++++++++++-
 spring-data-neo4j/pom.xml        |  4 +--
 4 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/spring-data-graph-core/pom.xml b/spring-data-graph-core/pom.xml
index 9152459a7..9f8b90cea 100644
--- a/spring-data-graph-core/pom.xml
+++ b/spring-data-graph-core/pom.xml
@@ -66,7 +66,7 @@
 			</exclusions>
 			<scope>runtime</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>jsr250-api</artifactId>
diff --git a/spring-data-graph-parent/pom.xml b/spring-data-graph-parent/pom.xml
index 96c265e50..5b014a449 100644
--- a/spring-data-graph-parent/pom.xml
+++ b/spring-data-graph-parent/pom.xml
@@ -16,8 +16,8 @@
 		<org.slf4j.version>1.5.10</org.slf4j.version>
 		<org.springframework.version>3.0.5.RELEASE</org.springframework.version>
 		<data.commons.version>1.0.0.RELEASE</data.commons.version>
-        <neo4j.version>1.3</neo4j.version>
-        <aspectj.version>1.6.12.BUILD-SNAPSHOT</aspectj.version>
+        <neo4j.version>1.4.M04</neo4j.version>
+        <aspectj.version>1.6.12.M1</aspectj.version>
 	</properties>
 	<profiles>
 		<profile>
@@ -162,7 +162,6 @@
 				<groupId>org.slf4j</groupId>
 				<artifactId>jcl-over-slf4j</artifactId>
 				<version>${org.slf4j.version}</version>
-				<scope>runtime</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
@@ -226,7 +225,7 @@
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-kernel</artifactId>
         <version>${neo4j.version}</version>
-        <classifier>tests</classifier>
+        <type>test-jar</type>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/spring-data-neo4j-rest/pom.xml b/spring-data-neo4j-rest/pom.xml
index 890c7e045..0506c9228 100644
--- a/spring-data-neo4j-rest/pom.xml
+++ b/spring-data-neo4j-rest/pom.xml
@@ -104,6 +104,10 @@
                   <groupId>org.neo4j</groupId>
                   <artifactId>neo4j-shell</artifactId>
               </exclusion>
+              <exclusion>
+                  <groupId>org.slf4j</groupId>
+                  <artifactId>slf4j-jdk14</artifactId>
+              </exclusion>
           </exclusions>
         </dependency>
         <dependency>
@@ -136,9 +140,49 @@
         <dependency>
           <groupId>org.neo4j</groupId>
           <artifactId>neo4j-kernel</artifactId>
-          <classifier>tests</classifier>
+          <type>test-jar</type>
           <scope>test</scope>
         </dependency>
+
+        <!-- Logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.mail</groupId>
+                    <artifactId>mail</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.jms</groupId>
+                    <artifactId>jms</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jdmk</groupId>
+                    <artifactId>jmxtools</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jmx</groupId>
+                    <artifactId>jmxri</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>runtime</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>
diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml
index 1375d06e4..5d341bbf3 100644
--- a/spring-data-neo4j/pom.xml
+++ b/spring-data-neo4j/pom.xml
@@ -88,7 +88,7 @@
 			</exclusions>
 			<scope>runtime</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>jsr250-api</artifactId>
@@ -126,7 +126,7 @@
 		<dependency>
 			<groupId>org.neo4j</groupId>
 			<artifactId>neo4j-kernel</artifactId>
-			<classifier>tests</classifier>
+            <type>test-jar</type>
 			<scope>test</scope>
 		</dependency>