Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0' of github.com:spring-projects/spring-data-neo4j into 4.0

Browse Source 
Conflicts:
	.gitignore
	pom.xml
	spring-data-neo4j/pom.xml
This commit is contained in:
Vince Bickers
2015-02-18 15:19:12 +00:00
parent a5e666ce68 4352a05587
commit 615f256ce1
2 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitignore vendored
View File

@@ -2,3 +2,15 @@
*/target/
*.iml
spring-data-neo4j-examples/sdn-boot/bower_components/
.buildpath
.project
.settings
target/
.idea/
*.class
*.iml
*.iws
*.ipr
*.db
.DS_Store
.classpath

33
pom.xml
View File

@@ -82,6 +82,14 @@
</roles>
<timezone>GMT</timezone>
</developer>
<developer>
<id>mangrish</id>
<name>Mark Angrish</name>
<roles>
<role>Developer</role>
</roles>
<timezone>+11</timezone>
</developer>
<developer>
<id>mhunger</id>
<name>Michael Hunger</name>
@@ -158,31 +166,6 @@
<version>${springdata.commons}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.6</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j</artifactId>
<version>${neo4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-kernel</artifactId>