Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

DATAGRAPH-161 Upgrade to Spring 3.0.7.GA Neo4j 1.6.M02 Spring Data Co…

…mmons 1.2.0.GA
  • Loading branch information...
commit 5a85df94b15d5327c5bd932e7cdb05a2b359ac6f 1 parent 0628fe1
Michael Hunger jexp authored
6 build/ivy/settings/ivy.xml
View
@@ -6,9 +6,9 @@
<exclude module="jmxtools"/>
<exclude module="jmxri"/>
</dependency>
- <dependency org="org.aspectj" name="aspectjrt" rev="1.6.11.RELEASE"/>
- <dependency org="org.aspectj" name="aspectjtools" rev="1.6.11.RELEASE"/>
- <dependency org="org.neo4j" name="neo4j-community" rev="1.5"/>
+ <dependency org="org.aspectj" name="aspectjrt" rev="1.6.12"/>
+ <dependency org="org.aspectj" name="aspectjtools" rev="1.6.12"/>
+ <dependency org="org.neo4j" name="neo4j-community" rev="1.6.M02"/>
<dependency org="junit" name="junit" rev="4.8.1"/>
</dependencies>
</ivy-module>
6 spring-data-neo4j-examples/hello-worlds-aspects/build.gradle
View
@@ -5,9 +5,9 @@ apply plugin: 'idea'
apply plugin: 'eclipse'
-springVersion = "3.0.5.RELEASE"
-springDataNeo4jVersion = "1.1.0.RELEASE"
-aspectjVersion = "1.6.11.RELEASE"
+springVersion = "3.0.7.RELEASE"
+springDataNeo4jVersion = "2.0.0.RELEASE"
+aspectjVersion = "1.6.12"
apply from:'https://github.com/SpringSource/spring-data-neo4j/raw/master/build/gradle/springdataneo4j.gradle'
8 spring-data-neo4j-examples/hello-worlds-aspects/settings/ivy.xml
View
@@ -1,14 +1,14 @@
<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="org.springframework.data.neo4j.examples" module="hello-worlds"/>
<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="2.0.0.RELEASE">
<exclude module="jms"/>
<exclude module="jmxtools"/>
<exclude module="jmxri"/>
</dependency>
- <dependency org="org.aspectj" name="aspectjrt" rev="1.6.11.RELEASE"/>
- <dependency org="org.aspectj" name="aspectjtools" rev="1.6.11.RELEASE"/>
- <dependency org="org.neo4j" name="neo4j-community" rev="1.3"/>
+ <dependency org="org.aspectj" name="aspectjrt" rev="1.6.12"/>
+ <dependency org="org.aspectj" name="aspectjtools" rev="1.6.12"/>
+ <dependency org="org.neo4j" name="neo4j-community" rev="1.6.M02"/>
<dependency org="junit" name="junit" rev="4.8.1"/>
</dependencies>
</ivy-module>
7 spring-data-neo4j-examples/hello-worlds/build.gradle
View
@@ -5,11 +5,8 @@ apply plugin: 'idea'
apply plugin: 'eclipse'
-springVersion = "3.0.5.RELEASE"
-springDataNeo4jVersion = "1.1.0.RELEASE"
-aspectjVersion = "1.6.11.RELEASE"
-
-apply from:'https://github.com/SpringSource/spring-data-neo4j/raw/master/build/gradle/springdataneo4j.gradle'
+springVersion = "3.0.7.RELEASE"
+springDataNeo4jVersion = "2.0.0.RELEASE"
configurations {
runtime
22 spring-data-neo4j-examples/hello-worlds/build.xml
View
@@ -7,8 +7,6 @@
<import file="${settings.dir}/install-ivy.xml" />
<import file="${settings.dir}/path.xml" />
- <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpath="${lib.dir}/aspectjtools.jar"/>
-
<target name="lib.retrieve" depends="install-ivy">
<mkdir dir="${lib.dir}" />
<ivy:settings file="${settings.dir}/ivysettings.xml" />
@@ -29,14 +27,8 @@
<target name="compile" description="Compile production classes" depends="lib.retrieve">
<mkdir dir="${main.target}" />
- <iajc sourceroots="${main.src}" destDir="${main.target}" classpathref="path.libs" source="1.6">
- <aspectpath>
- <pathelement location="${lib.dir}/spring-aspects.jar"/>
- </aspectpath>
- <aspectpath>
- <pathelement location="${lib.dir}/spring-data-neo4j.jar"/>
- </aspectpath>
- </iajc>
+ <javac sourcepath="${main.src}" destDir="${main.target}" classpathref="path.libs" source="1.6">
+ </javac>
</target>
<target name="compile-tests" description="Compile unit test classes" depends="compile">
@@ -44,14 +36,8 @@
<copy todir="${main.target}" failonerror="false">
<fileset dir="${main.resources}"/>
</copy>
- <iajc sourceroots="${test.src}" destDir="${test.target}" classpathref="path.testing" source="1.6">
- <aspectpath>
- <pathelement location="${lib.dir}/spring-aspects.jar"/>
- </aspectpath>
- <aspectpath>
- <pathelement location="${lib.dir}/spring-data-neo4j.jar"/>
- </aspectpath>
- </iajc>
+ <javac sourcepath="${test.src}" destDir="${test.target}" classpathref="path.testing" source="1.6">
+ </javac>
</target>
<target name="test" depends="clean, compile, compile-tests">
6 spring-data-neo4j-examples/hello-worlds/settings/ivy.xml
View
@@ -1,14 +1,12 @@
<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="org.springframework.data.neo4j.examples" module="hello-worlds"/>
<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="2.0.0.RELEASE">
<exclude module="jms"/>
<exclude module="jmxtools"/>
<exclude module="jmxri"/>
</dependency>
- <dependency org="org.aspectj" name="aspectjrt" rev="1.6.11.RELEASE"/>
- <dependency org="org.aspectj" name="aspectjtools" rev="1.6.11.RELEASE"/>
- <dependency org="org.neo4j" name="neo4j-community" rev="1.3"/>
+ <dependency org="org.neo4j" name="neo4j-community" rev="1.6.M02"/>
<dependency org="junit" name="junit" rev="4.8.1"/>
</dependencies>
</ivy-module>
2  src/docbkx/tutorial/neo4j.xml
View
@@ -40,7 +40,7 @@
<programlisting language="xml" ><![CDATA[<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j</artifactId>
- <version>1.5</version>
+ <version>1.6.M02</version>
</dependency>
]]></programlisting>
</example>
2  src/docbkx/tutorial/setup.xml
View
@@ -32,7 +32,7 @@
<example>
<title>Project pom.xml</title>
<programlisting language="xml"><![CDATA[<properties>
- <spring.version>3.0.6.RELEASE</spring.version>
+ <spring.version>3.0.7.RELEASE</spring.version>
</properties>
<dependencies>
Please sign in to comment.
Something went wrong with that request. Please try again.