From 4b0f8133599b12d7827c1f119704162fca4f3a2e Mon Sep 17 00:00:00 2001
From: jimwebber <jim@jimwebber.org>
Date: Sat, 12 Nov 2011 01:00:56 +0000
Subject: [PATCH] Fixed dependencies to allow Koan 11 to work

---
 build.xml        | 30 ++++++------------------
 settings/ivy.xml | 61 ++++++++----------------------------------------
 2 files changed, 17 insertions(+), 74 deletions(-)

diff --git a/build.xml b/build.xml
index 64d9faa..ffa3050 100644
--- a/build.xml
+++ b/build.xml
@@ -26,32 +26,16 @@
 		<delete dir="build"/>
 	</target>
 	<target name="compile" description="Compile production classes" depends="lib.retrieve">
-		
-<<<<<<< HEAD
-		<!-- <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpath="${lib.dir}/aspectjtools.jar"/> -->
-		<!-- <iajc sourceroots="${main.src}" destDir="${main.target}" classpathref="path.libs" source="1.6">
-=======
 		<taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpath="${lib.dir}/aspectjtools.jar"/>
 		<iajc sourceroots="${main.src}" destDir="${main.target}" classpathref="path.libs" source="1.6">
->>>>>>> sorted out the dependencies so that Koan 11 runs. Needed newer jetty to match the neo4j version
-            <aspectpath>
-                <pathelement location="${lib.dir}/spring-aspects.jar"/>
-            </aspectpath>
-            <aspectpath>
-                <pathelement location="${lib.dir}/spring-data-neo4j.jar"/>
-            </aspectpath>
-<<<<<<< HEAD
-        </iajc> -->
-
+			<aspectpath>
+				<pathelement location="${lib.dir}/spring-aspects.jar"/>
+			</aspectpath>
+			<aspectpath>
+				<pathelement location="${lib.dir}/spring-data-neo4j.jar"/>
+			</aspectpath>
+		</iajc>
 		<mkdir dir="${main.target}"/>
-		<javac srcdir="${main.src}" destdir="${main.target}" classpathref="path.libs" target="1.6" debug="true" includeAntRuntime="false"/>
-=======
-        </iajc>
-
-		<mkdir dir="${main.target}"/>
-		<!-- <javac srcdir="${main.src}" destdir="${main.target}" classpathref="path.libs" target="1.6" debug="true" includeAntRuntime="false"/> -->
->>>>>>> sorted out the dependencies so that Koan 11 runs. Needed newer jetty to match the neo4j version
-
 		<tstamp>
 			<format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss"/>
 		</tstamp>
diff --git a/settings/ivy.xml b/settings/ivy.xml
index e02933d..6bf2621 100644
--- a/settings/ivy.xml
+++ b/settings/ivy.xml
@@ -1,16 +1,15 @@
-<<<<<<< HEAD
 <?xml version="1.0"?>
 <ivy-module xmlns:m="http://ant.apache.org/ivy/maven" version="2.0">
 	<info organisation="org.jimwebber" module="neo4j-koans"/>
 	<dependencies>
-		<!-- <dependency org="org.springframework.data" name="spring-data-neo4j" rev="1.0.0.RELEASE">
+		<dependency org="org.springframework.data" name="spring-data-neo4j" rev="1.0.0.RELEASE">
 			<exclude module="jms"/>
 			<exclude module="jmxtools"/>
 			<exclude module="jmxri"/>
 			<exclude org="org.slf4j" name="slf4j-log4j12"/>
 		</dependency>
 		<dependency org="org.aspectj" name="aspectjrt" rev="1.6.11"/>
-		<dependency org="org.aspectj" name="aspectjtools" rev="1.6.11"/> -->
+		<dependency org="org.aspectj" name="aspectjtools" rev="1.6.11"/>
 		<dependency org="org.neo4j.app" name="neo4j-server" rev="1.5" transitive="true">
 			<artifact name="neo4j-server" ext="jar"/>
 			<artifact name="neo4j-server" m:classifier="static-web" ext="jar"/>
@@ -22,54 +21,14 @@
 			<artifact name="neo4j-kernel" m:classifier="tests" ext="jar"/>
 		</dependency>
 		<dependency org="org.neo4j" name="neo4j-shell" rev="1.5"/>
-		<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.9.2">
-			<artifact name="jackson-core-asl" ext="jar"/>
-		</dependency>
-		<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.9.2">
-			<artifact name="jackson-mapper-asl" ext="jar"/>
-		</dependency>
-		<!-- <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.25"/> -->
+		<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.7.5"/>
+		<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.7.5"/>
+		<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.25"/>
 		<dependency org="org.rrd4j" name="rrd4j" rev="2.0.7" transitive="false"/>
-		<dependency org="com.sun.jersey" name="jersey-client" rev="1.6"/>
-		<!-- <dependency org="com.sun.jersey" name="jersey-core" rev="1.6"/>
-        <dependency org="com.sun.jersey" name="jersey-server" rev="1.6"/> -->
-		<dependency org="org.mockito" name="mockito-all" rev="1.8.5">
-			<artifact name="mockito-all" ext="jar"/>
-		</dependency>
-		<dependency org="junit" name="junit" rev="4.9"/>
+		<dependency org="com.sun.jersey" name="jersey-client" rev="1.9"/>
+		<dependency org="com.sun.jersey" name="jersey-core" rev="1.9"/>
+		<dependency org="com.sun.jersey" name="jersey-server" rev="1.9"/>
+		<dependency org="org.mockito" name="mockito-all" rev="1.8.5"/>
+		<dependency org="junit" name="junit" rev="4.7"/>
 	</dependencies>
-=======
-<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
-    <info organisation="org.jimwebber" module="neo4j-koans"/>
-    <dependencies>
-        <dependency org="org.springframework.data" name="spring-data-neo4j" rev="1.0.0.RELEASE">
-            <exclude module="jms"/>
-            <exclude module="jmxtools"/>
-            <exclude module="jmxri"/>
-            <exclude org="org.slf4j" name="slf4j-log4j12"/>
-        </dependency>
-        <dependency org="org.aspectj" name="aspectjrt" rev="1.6.11"/>
-        <dependency org="org.aspectj" name="aspectjtools" rev="1.6.11"/>
-        <dependency org="org.neo4j.app" name="neo4j-server" rev="1.5" transitive="true">
-            <artifact name="neo4j-server" ext="jar"/>
-            <artifact name="neo4j-server" m:classifier="static-web" ext="jar"/>
-            <artifact name="neo4j-server" m:classifier="tests" ext="jar"/>
-        </dependency>
-        <dependency org="org.neo4j" name="neo4j-community" rev="1.5"/>
-        <dependency org="org.neo4j" name="neo4j-kernel" rev="1.5">
-            <artifact name="neo4j-kernel" ext="jar"/>
-            <artifact name="neo4j-kernel" m:classifier="tests" ext="jar"/>
-        </dependency>
-        <dependency org="org.neo4j" name="neo4j-shell" rev="1.5"/>
-        <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.7.5"/>
-        <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.7.5"/>
-        <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.25"/>
-        <dependency org="org.rrd4j" name="rrd4j" rev="2.0.7" transitive="false"/>
-        <dependency org="com.sun.jersey" name="jersey-client" rev="1.9"/>
-        <dependency org="com.sun.jersey" name="jersey-core" rev="1.9"/>
-        <dependency org="com.sun.jersey" name="jersey-server" rev="1.9"/>
-        <dependency org="org.mockito" name="mockito-all" rev="1.8.5"/>
-        <dependency org="junit" name="junit" rev="4.7"/>
-    </dependencies>
->>>>>>> sorted out the dependencies so that Koan 11 runs. Needed newer jetty to match the neo4j version
 </ivy-module>