Skip to content
This repository has been archived by the owner on Jan 13, 2021. It is now read-only.

Commit

Permalink
updating develop poms to master versions to avoid merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@jschneider
jschneider committed Oct 3, 2015
1 parent 84b74e5 commit d5a3a87
Show file tree
Hide file tree
Showing 21 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion jackson/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft</groupId>
<artifactId>serialization-parent</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion neo4j/neo4j-test-utils/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft.serialization</groupId>
<artifactId>neo4j-parent</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion neo4j/neo4j/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft.serialization</groupId>
<artifactId>neo4j-parent</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion neo4j/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft</groupId>
<artifactId>serialization-parent</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -8,7 +8,7 @@

<modelVersion>4.0.0</modelVersion>
<artifactId>serialization-parent</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
<name>Serialization</name>
<packaging>pom</packaging>
<url>http://serialization.cedarsoft.org</url>
Expand Down
2 changes: 1 addition & 1 deletion samples/demo1/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft.serialization</groupId>
<artifactId>samples</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/evolution/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft.serialization</groupId>
<artifactId>samples</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft</groupId>
<artifactId>serialization-parent</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/stax-mate/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft.serialization</groupId>
<artifactId>samples</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/stax/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft.serialization</groupId>
<artifactId>samples</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion serialization/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft</groupId>
<artifactId>serialization-parent</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion serializers/commons/jackson/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft.serialization</groupId>
<artifactId>commons-serializers</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion serializers/commons/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft.serialization</groupId>
<artifactId>serializers</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion serializers/commons/stax-mate/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft.serialization</groupId>
<artifactId>commons-serializers</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion serializers/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft</groupId>
<artifactId>serialization-parent</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion stax-mate/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft</groupId>
<artifactId>serialization-parent</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion stax/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft</groupId>
<artifactId>serialization-parent</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion test-utils/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft</groupId>
<artifactId>serialization-parent</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion test/performance/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft.serialization</groupId>
<artifactId>test</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion test/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft</groupId>
<artifactId>serialization-parent</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion test/xalan-bug/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.cedarsoft.serialization</groupId>
<artifactId>test</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down

0 comments on commit d5a3a87

Please sign in to comment.