Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
DirkMahler committed Apr 15, 2015
2 parents c137d93 + eba5dc7 commit 83095ee
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.buschmais.xo</groupId>
<artifactId>xo.parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.6.0-SNAPSHOT</version>
</parent>
<artifactId>xo.api</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion doc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.buschmais.xo</groupId>
<artifactId>xo.parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xo.doc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.buschmais.xo</groupId>
<artifactId>xo.parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.6.0-SNAPSHOT</version>
</parent>
<artifactId>xo.impl</artifactId>

Expand Down
6 changes: 3 additions & 3 deletions inject/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.buschmais.xo</groupId>
<artifactId>xo.parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.6.0-SNAPSHOT</version>
</parent>
<artifactId>xo.inject</artifactId>

Expand Down Expand Up @@ -65,14 +65,14 @@
<groupId>org.neo4j</groupId>
<artifactId>neo4j-kernel</artifactId>
<classifier>tests</classifier>
<version>2.2.0</version>
<version>2.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-io</artifactId>
<classifier>tests</classifier>
<version>2.2.0</version>
<version>2.2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.buschmais.xo</groupId>
<artifactId>xo.parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.6.0-SNAPSHOT</version>
</parent>
<artifactId>xo.json</artifactId>

Expand Down
7 changes: 3 additions & 4 deletions neo4j/pom.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.buschmais.xo</groupId>
<artifactId>xo.parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.6.0-SNAPSHOT</version>
</parent>
<artifactId>xo.neo4j</artifactId>

<name>eXtended Objects - Neo4j Binding</name>

<properties>
<org.neo4j_version>2.2.0</org.neo4j_version>
<org.neo4j_version>2.2.1</org.neo4j_version>
</properties>

<repositories>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</parent>
<groupId>com.buschmais.xo</groupId>
<artifactId>xo.parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>eXtended Objects</name>
Expand Down
2 changes: 1 addition & 1 deletion spi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.buschmais.xo</groupId>
<artifactId>xo.parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.6.0-SNAPSHOT</version>
</parent>
<artifactId>xo.spi</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.buschmais.xo</groupId>
<artifactId>xo.parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.6.0-SNAPSHOT</version>
</parent>
<artifactId>xo.test</artifactId>

Expand Down

0 comments on commit 83095ee

Please sign in to comment.