Permalink
Browse files

Merge branch 'master' of github.com:jimwebber/neo4j-tutorial

  • Loading branch information...
iansrobinson committed Mar 1, 2012
2 parents 6354943 + a01a280 commit c03cf8806ca5d724556782feaa7ed0b85c626426
Showing with 11 additions and 8 deletions.
  1. +6 −3 settings/download-neoclipse.xml
  2. +5 −5 settings/ivy.xml
@@ -2,17 +2,19 @@
<project xmlns:ivy="antlib:org.apache.ivy.ant" basedir="..">
- <property name="neoclipse.version" value="1.5"/>
+ <property name="neoclipse.version" value="1.6"/>
<property name="arch" value="${sun.arch.data.model}"/>
<property name="tools.dir" location="tools/"/>
- <property name="mac.installer" value="neoclipse-${neoclipse.version}-macosx.carbon.x86.tar.gz"/>
+ <!-- <property name="mac.installer" value="neoclipse-${neoclipse.version}-macosx.carbon.x86.tar.gz"/> -->
+ <!-- The mac installer is hardcoded because it's not properly released by the Neoclipse folks -->
+ <property name="mac.installer" value="neoclipse-1.6-20120229-.osx.zip"/>
<property name="win.32.installer" value="neoclipse-${neoclipse.version}-win32.win32.x86.zip"/>
<property name="win.64.installer" value="neoclipse-${neoclipse.version}-win32.win32.x86_64.zip"/>
<property name="linux.32.installer" value="neoclipse-${neoclipse.version}-linux.gtk.x86.tar.gz"/>
<property name="linux.64.installer" value="neoclipse-${neoclipse.version}-linux.gtk.x86_64.tar.gz"/>
- <property name="distribution.site" value="http://dist.neo4j.org/"/>
+ <property name="distribution.site" value="http://cloud.github.com/downloads/neo4j/neoclipse/"/>
<condition property="is.mac.intel.x86">
<and>
@@ -58,6 +60,7 @@
<target name="-get.mac.64" if="is.mac.intel.x86">
<echo message="... found Mac OS on Intel x86"/>
+ <echo message="[Warning] Mac OSX Neoclipse has a hard-coded snapshot dependency in the build. Update to a real release Neoclipse when possible."/>
<get dest="${tools.dir}/${mac.installer}" src="${distribution.site}${mac.installer}"/>
</target>
<target name="-get.win.32" if="is.win.32.bit">
View
@@ -2,19 +2,19 @@
<ivy-module xmlns:m="http://ant.apache.org/ivy/maven" version="2.0">
<info organisation="org.neo4j" module="neo4j-koans"/>
<dependencies>
- <dependency org="org.neo4j.app" name="neo4j-server" rev="1.6">
+ <dependency org="org.neo4j.app" name="neo4j-server" rev="1.6.1">
<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"/>
<exclude org="org.slf4j" />
</dependency>
- <dependency org="org.neo4j" name="server-api" rev="1.6"/>
- <dependency org="org.neo4j" name="neo4j-community" rev="1.6"/>
- <dependency org="org.neo4j" name="neo4j-kernel" rev="1.6">
+ <dependency org="org.neo4j" name="server-api" rev="1.6.1"/>
+ <dependency org="org.neo4j" name="neo4j-community" rev="1.6.1"/>
+ <dependency org="org.neo4j" name="neo4j-kernel" rev="1.6.1">
<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.6"/>
+ <dependency org="org.neo4j" name="neo4j-shell" rev="1.6.1"/>
<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"/>

0 comments on commit c03cf88

Please sign in to comment.